summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-03-19 07:16:42 +0000
committerbors <bors@rust-lang.org>2023-03-19 07:16:42 +0000
commitbdd077d5d7861f77471a5fdddccb1144aa31506b (patch)
tree9d0933023c77cdc241fd744ce6a7d5556b164945
parent2602aa81a85905cb35878483dc013727baa7ebcb (diff)
parent5749c835f30185bf734ba5ae5dc4a4005729441f (diff)
downloadrust-bdd077d5d7861f77471a5fdddccb1144aa31506b.tar.gz
Auto merge of #109265 - weihanglo:update-beta-cargo, r=weihanglo
[beta-1.69] cargo beta backports 3 commits in 9880b408a3af50c08fab3dbf4aa2a972df71e951..7b18c85808a6b45ec8364bf730617b6f13e0f9f8 2023-02-28 19:39:39 +0000 to 2023-03-17 12:29:33 +0000 - [beta-1.69] backport rust-lang/cargo#11824 (rust-lang/cargo#11863) - [beta-1.69] backport rust-lang/cargo#11820 (rust-lang/cargo#11823) - chore: Backport rust-lang/cargo#11630 to `1.69.0` (rust-lang/cargo#11806) r? `@ghost`
-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 5530541cdd0..ece96826a55 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -997,7 +997,7 @@ dependencies = [
[[package]]
name = "crates-io"
-version = "0.35.1"
+version = "0.36.0"
dependencies = [
"anyhow",
"curl",
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject 9880b408a3af50c08fab3dbf4aa2a972df71e95
+Subproject 7b18c85808a6b45ec8364bf730617b6f13e0f9f