about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-09-18 22:54:11 +0000
committerbors <bors@rust-lang.org>2021-09-18 22:54:11 +0000
commite20a4ec1340f538296b4c81c4b00ef8fa64b7350 (patch)
tree676b5f6aef7709850104bbb1850cf027a8a104a3
parentaa8f2d432b23575929a48f87b8746f41ba723318 (diff)
parentec64a7a3b6ce2d1f7c6df3bfec5b8db016c002aa (diff)
downloadrust-e20a4ec1340f538296b4c81c4b00ef8fa64b7350.tar.gz
rust-e20a4ec1340f538296b4c81c4b00ef8fa64b7350.zip
Auto merge of #89079 - ehuss:update-cargo, r=ehuss
Update cargo

1 commits in 33ee5f82edb50af87b952c5b28de0f5fb41ebf18..9a28ac83c9eb73e42ffafac552c0a55f00dbf40c
2021-09-17 13:51:54 +0000 to 2021-09-18 15:42:28 -0500
- Temporarily revert curl-sys update. (rust-lang/cargo#9920)
-rw-r--r--Cargo.lock4
m---------src/tools/cargo0
2 files changed, 2 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 35eac402190..7d7e44d1e5e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -882,9 +882,9 @@ dependencies = [
 
 [[package]]
 name = "curl-sys"
-version = "0.4.47+curl-7.79.0"
+version = "0.4.45+curl-7.78.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ab94a47d9b61f2d905beb7a3d46aba7704c9f1dfcf84e7d178998d9e95f7989"
+checksum = "de9e5a72b1c744eb5dd20b2be4d7eb84625070bb5c4ab9b347b70464ab1e62eb"
 dependencies = [
  "cc",
  "libc",
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject 33ee5f82edb50af87b952c5b28de0f5fb41ebf1
+Subproject 9a28ac83c9eb73e42ffafac552c0a55f00dbf40