diff options
| author | bors <bors@rust-lang.org> | 2021-04-01 03:13:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-01 03:13:39 +0000 |
| commit | cbd6ec760453b333e86aac106f47fe9132498924 (patch) | |
| tree | d5784c2c481ba032b3fbba90f0b0f6e77b34091a | |
| parent | 4896450e7e0a522486b4d3a8d360ac4e1d2072a0 (diff) | |
| parent | cb969e86a56f2440ef8be585e99477064c786d72 (diff) | |
| download | rust-cbd6ec760453b333e86aac106f47fe9132498924.tar.gz rust-cbd6ec760453b333e86aac106f47fe9132498924.zip | |
Auto merge of #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)
| -rw-r--r-- | Cargo.lock | 3 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Cargo.lock b/Cargo.lock index 284a1ba5482..0238b856cc2 100644 --- 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 -Subproject 1e8703890f285befb5e32627ad4e0a0454dde1f +Subproject 3c44c3c4b7900b8b13c85ead25ccaa8abb7d898 |