about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2021-10-26 06:14:09 +0200
committerGitHub <noreply@github.com>2021-10-26 06:14:09 +0200
commit897b5dfeee5152671cedd5471a58944e20d0af25 (patch)
tree4b965d44849509c4c120f51231a469150bc2e03e
parent02a06ad7f4897b8df5782337b20c666af2d897f8 (diff)
parent5001cd04a802675e4f26af7f3602d3141bdfba93 (diff)
downloadrust-897b5dfeee5152671cedd5471a58944e20d0af25.tar.gz
rust-897b5dfeee5152671cedd5471a58944e20d0af25.zip
Rollup merge of #90295 - ehuss:update-cargo, r=ehuss
Update cargo

4 commits in 7fbbf4e8f23e3c24b8afff541dcb17e53eb5ff88..6c1bc24b8b49d4bc965f67d7037906dc199c72b7
2021-10-19 02:16:48 +0000 to 2021-10-24 17:51:41 +0000
- Fix a clippy warning (rust-lang/cargo#10002)
- Upgrade Cargo to the 2021 edition (rust-lang/cargo#10000)
- Don't canonicalize executable path (rust-lang/cargo#9991)
- Bump to 0.59.0, update changelog (rust-lang/cargo#9998)
-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 41275accbe9..bf19f5e0ae3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -276,7 +276,7 @@ dependencies = [
 
 [[package]]
 name = "cargo"
-version = "0.58.0"
+version = "0.59.0"
 dependencies = [
  "anyhow",
  "atty",
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject 7fbbf4e8f23e3c24b8afff541dcb17e53eb5ff8
+Subproject 6c1bc24b8b49d4bc965f67d7037906dc199c72b