Update cargo

rust-lang · Jun 12, 2021 · d371bb4 · d371bb4
1 parent da7ada5
commit d371bb4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git 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",
@@ -4554,6 +4554,18 @@ dependencies = [
  "serde_json",
 ]
 
+[[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"

diff --git a/src/tools/cargo b/src/tools/cargo
+1 −1		Cargo.toml
+110 −89		crates/cargo-test-support/src/lib.rs
+0 −22		crates/cargo-test-support/src/paths.rs
+40 −0		crates/cargo-test-support/src/tools.rs
+12 −1		src/bin/cargo/cli.rs
+2 −2		src/bin/cargo/commands/init.rs
+1 −1		src/cargo/core/mod.rs
+2 −0		src/cargo/core/package.rs
+56 −38		src/cargo/core/workspace.rs
+52 −0		src/cargo/ops/cargo_compile.rs
+56 −16		src/cargo/ops/cargo_new.rs
+12 −8		src/cargo/util/config/mod.rs
+2 −2		src/cargo/util/config/path.rs
+1 −1		src/doc/man/cargo-doc.md
+2 −0		src/doc/man/cargo-metadata.md
+2 −1		src/doc/man/generated_txt/cargo-doc.txt
+2 −0		src/doc/man/generated_txt/cargo-metadata.txt
+1 −1		src/doc/src/commands/cargo-doc.md
+2 −0		src/doc/src/commands/cargo-metadata.md
+1 −1		src/etc/man/cargo-doc.1
+2 −0		src/etc/man/cargo-metadata.1
+9 −0		tests/testsuite/alt_registry.rs
+52 −38		tests/testsuite/build.rs
+3 −4		tests/testsuite/cache_messages.rs
+18 −0		tests/testsuite/cargo_alias_config.rs
+29 −0		tests/testsuite/cargo_targets.rs
+5 −8		tests/testsuite/check.rs
+1 −0		tests/testsuite/features_namespaced.rs
+31 −25		tests/testsuite/fix.rs
+2 −0		tests/testsuite/git.rs
+71 −0		tests/testsuite/init.rs
+2 −5		tests/testsuite/metabuild.rs
+52 −0		tests/testsuite/metadata.rs
+1 −0		tests/testsuite/read_manifest.rs
+2 −0		tests/testsuite/update.rs