embedding: fix conflicts from rustup