Auto merge of rust-lang#83732 - ehuss:update-cargo, r=ehuss

Update cargo 5 commits in 1e8703890f285befb5e32627ad4e0a0454dde1fb..3c44c3c4b7900b8b13c85ead25ccaa8abb7d8989 2021-03-26 16:59:39 +0000 to 2021-03-31 21:21:15 +0000 - Fix semver docs for 1.51. (rust-lang/cargo#9316) - Add `cargo config` subcommand. (rust-lang/cargo#9302) - Give one more example for the --featuers CLI (rust-lang/cargo#9313) - Bump to 0.54.0, update changelog (rust-lang/cargo#9308) - Make the URL to the tracking issue for `--out-dir` into a link (rust-lang/cargo#9309)
rust-lang-ci · Apr 1, 2021 · cbd6ec7 · cbd6ec7
2 parents 4896450 + cb969e8
commit cbd6ec7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -281,7 +281,7 @@ checksum = "81a18687293a1546b67c246452202bbbf143d239cb43494cc163da14979082da"
 
 [[package]]
 name = "cargo"
-version = "0.53.0"
+version = "0.54.0"
 dependencies = [
  "anyhow",
  "atty",
@@ -326,6 +326,7 @@ dependencies = [
  "serde",
  "serde_ignored",
  "serde_json",
+ "shell-escape",
  "strip-ansi-escapes",
  "tar",
  "tempfile",

diff --git a/src/tools/cargo b/src/tools/cargo
+113 −1		CHANGELOG.md
+2 −1		Cargo.toml
+20 −9		crates/cargo-test-support/src/lib.rs
+1 −1		crates/cargo-test-support/src/publish.rs
+48 −0		src/bin/cargo/commands/config.rs
+4 −25		src/bin/cargo/commands/logout.rs
+3 −0		src/bin/cargo/commands/mod.rs
+39 −3		src/cargo/core/features.rs
+308 −0		src/cargo/ops/cargo_config.rs
+1 −0		src/cargo/ops/mod.rs
+1 −57		src/cargo/util/config/de.rs
+21 −4		src/cargo/util/config/key.rs
+202 −40		src/cargo/util/config/mod.rs
+1 −1		src/doc/man/cargo-build.md
+2 −1		src/doc/man/generated_txt/cargo-build.txt
+1 −1		src/doc/src/commands/cargo-build.md
+3 −0		src/doc/src/reference/features.md
+2 −2		src/doc/src/reference/semver.md
+49 −32		src/doc/src/reference/unstable.md
+1 −1		src/etc/man/cargo-build.1
+4 −4		tests/testsuite/bad_config.rs
+522 −0		tests/testsuite/cargo_config.rs
+1 −0		tests/testsuite/main.rs
+1 −6		tests/testsuite/message_format.rs