[beta] Update cargo

ehuss · Mar 3, 2022 · cace605 · cace605
1 parent 0a4f984
commit cace605
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -327,7 +327,7 @@ dependencies = [
  "cargo-test-macro",
  "cargo-test-support",
  "cargo-util",
- "clap 3.0.13",
+ "clap 3.1.5",
  "crates-io",
  "crossbeam-utils",
  "curl",
@@ -606,17 +606,17 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.0.13"
+version = "3.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08799f92c961c7a1cf0cc398a9073da99e21ce388b46372c37f3191f2f3eed3e"
+checksum = "ced1892c55c910c1219e98d6fc8d71f6bddba7905866ce740066d8bfea859312"
 dependencies = [
  "atty",
  "bitflags",
  "indexmap",
  "os_str_bytes",
  "strsim 0.10.0",
  "termcolor",
- "textwrap 0.14.2",
+ "textwrap 0.15.0",
 ]
 
 [[package]]
@@ -5032,9 +5032,9 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.14.2"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
+checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
 
 [[package]]
 name = "thiserror"

diff --git a/src/tools/cargo b/src/tools/cargo
+1 −1		Cargo.toml
+18 −12		src/bin/cargo/cli.rs
+1 −1		src/bin/cargo/commands/bench.rs
+2 −1		src/bin/cargo/commands/config.rs
+1 −1		src/bin/cargo/commands/git_checkout.rs
+2 −1		src/bin/cargo/commands/report.rs
+1 −1		src/bin/cargo/commands/run.rs
+1 −1		src/bin/cargo/commands/rustc.rs
+1 −1		src/bin/cargo/commands/rustdoc.rs
+1 −1		src/bin/cargo/commands/test.rs
+4 −2		src/cargo/util/command_prelude.rs
+2 −2		src/cargo/util/config/mod.rs
+38 −26		src/cargo/util/toml/mod.rs
+36 −0		tests/testsuite/profiles.rs
+41 −0		tests/testsuite/run.rs