From: bors <bors@rust-lang.org>
Date: Tue, 9 Jan 2018 01:26:46 +0000 (+0000)
Subject: Auto merge of #4839 - sfackler:consistent-config, r=withoutboats
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~3^2~50
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4e618dd7f5acd987d3938b33e935a4e9709004db;p=cargo.git

Auto merge of #4839 - sfackler:consistent-config, r=withoutboats

Make .cargo/credentials a subset of .cargo/config

Previously, .cargo/credentials looked like

```toml
token = "..."

[my-registry]
token = "..."
```

And was simply merged into the `registry` block of .cargo/config. This
meant that custom registry tokens were under
`registry.my-registry.token` rather than `registries.my-registry.token`
which is where the index was located, and that you couldn't have a
custom registry named `token` or it'd conflict with the token for the
default registry.

This commit changes things such that .cargo/credentials has the same
layout as .cargo/config, but only contains token values. For backwards
compatibility, we move `token` to `registry.token` when parsing.
---

4e618dd7f5acd987d3938b33e935a4e9709004db