about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-11-24 18:32:19 +0000
committerbors <bors@rust-lang.org>2020-11-24 18:32:19 +0000
commit74459930a951db7a68b3ecd86f3b796339e59fe5 (patch)
tree8e66abf83608e24aa88229cbf961b5a0c64e6940
parent25a691003cf6676259ee7d4bed05b43cb6283cea (diff)
parentc46e8964ae36023554944b31e708f77c1bdb7d5e (diff)
Auto merge of #79384 - ehuss:update-cargo, r=ehuss
Update cargo

10 commits in 2af662e22177a839763ac8fb70d245a680b15214..bfca1cd22bf514d5f2b6c1089b0ded0ba7dfaa6e
2020-11-12 19:04:56 +0000 to 2020-11-24 16:33:21 +0000
- Shrink the progress bar, to give more space after it. (rust-lang/cargo#8892)
- Add some comments to the toml code (rust-lang/cargo#8887)
- Start searching git config at new path (rust-lang/cargo#8886)
- Fix documentation for CARGO_PRIMARY_PACKAGE. (rust-lang/cargo#8891)
- Bump to 0.51.0, update changelog (rust-lang/cargo#8894)
- Publish target's "doc" setting when emitting metadata (rust-lang/cargo#8869)
- Relaxes expectation of `cargo test` tests to accept test execution time (rust-lang/cargo#8884)
- Finish implementation of `-Zextra-link-arg`. (rust-lang/cargo#8441)
- Reproducible crate builds (rust-lang/cargo#8864)
- Allow resolver="1" to explicitly use the old resolver behavior. (rust-lang/cargo#8857)
-rw-r--r--Cargo.lock2
m---------src/tools/cargo0
2 files changed, 1 insertions, 1 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 1a0eb7d0bd4..b3e6e7bae7c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -295,7 +295,7 @@ checksum = "81a18687293a1546b67c246452202bbbf143d239cb43494cc163da14979082da"
 
 [[package]]
 name = "cargo"
-version = "0.50.0"
+version = "0.51.0"
 dependencies = [
  "anyhow",
  "atty",
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject 2af662e22177a839763ac8fb70d245a680b1521
+Subproject bfca1cd22bf514d5f2b6c1089b0ded0ba7dfaa6