about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Huss <eric@huss.org>2021-06-12 12:11:50 -0700
committerEric Huss <eric@huss.org>2021-06-12 12:11:50 -0700
commitd371bb4d59f9112d755eee933bb6c04398e058d9 (patch)
treefb2abd9dd37d5c01afc6d92829ea20041f24cdcb
parentda7ada584a3e5c3467b8b9f344b4a0f2a81ce32a (diff)
downloadrust-d371bb4d59f9112d755eee933bb6c04398e058d9.tar.gz
rust-d371bb4d59f9112d755eee933bb6c04398e058d9.zip
Update cargo
-rw-r--r--Cargo.lock18
m---------src/tools/cargo0
2 files changed, 15 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock
index de110c55a4b..2f06506eaa4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -293,7 +293,7 @@ dependencies = [
  "pretty_env_logger",
  "rand 0.8.3",
  "rustc-workspace-hack",
- "rustfix",
+ "rustfix 0.6.0",
  "semver 1.0.3",
  "serde",
  "serde_ignored",
@@ -672,7 +672,7 @@ dependencies = [
  "libc",
  "miow 0.3.6",
  "regex",
- "rustfix",
+ "rustfix 0.5.1",
  "serde",
  "serde_json",
  "tracing",
@@ -696,7 +696,7 @@ dependencies = [
  "log",
  "miow 0.3.6",
  "regex",
- "rustfix",
+ "rustfix 0.5.1",
  "serde",
  "serde_derive",
  "serde_json",
@@ -4555,6 +4555,18 @@ dependencies = [
 ]
 
 [[package]]
+name = "rustfix"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0be05fc0675ef4f47119dc39cfc46636bb77d4fc4ef1bd851b9c3f7697f32a"
+dependencies = [
+ "anyhow",
+ "log",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
 name = "rustfmt-config_proc_macro"
 version = "0.2.0"
 dependencies = [
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject aa8b09297bb3156b849e73db48af4cd050492fe
+Subproject 44456677b5d1d82fe981c955dc5c67734b31f34