Something's not right with cargo login/token migration to `~/.cargo/credentials` (regression in nightly)

[carols10cents]

I think this is related to the changes in #3978.

I'm currently using cargo 0.21.0-nightly (50b1c24 2017-06-17).

What happened:

• I logged in with my crates.io credentials (I change my token all the time because reasons):

cargo login [api-token]

• I then attempted to publish a new crate to crates.io, so I ran:

cargo publish

• I got an "unauthorized API access" error.

• I noticed I now have ~/.cargo/config and ~/.cargo/credentials.

~/.cargo/config:

[registry]
token = "[not-the-one-i-just-used-with-cargo-login]"

~/.cargo/credentials:

token = "[api-token]"

So it looks like cargo login is now only updating ~/.cargo/credentials but cargo publish is reading from ~/.cargo/config?

This has not made it to beta yet.

[alexcrichton]

cc @dethoter, mind taking a look?

[fa7ca7]

Sure, already looking into it.

[fa7ca7]

It's my fault. The problem is in src/cargo/util/config.rs

fn load_credentials(&self, cfg: &mut ConfigValue) -> CargoResult<()> {
    ...
    registry.merge(value).chain_err(|| {

merge does nothing if a key is present in registry and value. Fixing it now.

[carols10cents]

Just tested with cargo master (hasn't made it into the cargo shipped with nightly yet) and can confirm this is fixed! Thank you! ❤️