Auto merge of #93314 - ehuss:update-cargo, r=ehuss

Update cargo 9 commits in 95bb3c92bf516017e812e7f1c14c2dea3845b30e..1c034752de0df744fcd7788fcbca158830b8bf85 2022-01-18 17:39:35 +0000 to 2022-01-25 22:36:53 +0000 - Sync toml_edit versions (rust-lang/cargo#10329) - Check --config for dotted keys only (rust-lang/cargo#10176) - Remove deprecated --host arg for search and publish cmds (rust-lang/cargo#10327) - doc: it's valid to use OUT_DIR for intermediate artifacts (rust-lang/cargo#10326) - Use local git info for version. (rust-lang/cargo#10323) - Fix documenting with undocumented dependencies. (rust-lang/cargo#10324) - do not compile test for bins flagged as `test = false` (rust-lang/cargo#10305) - Port cargo from toml-rs to toml_edit (rust-lang/cargo#10086) - Fix new::git_default_branch with different default (rust-lang/cargo#10306)
rust-lang · Jan 26, 2022 · d502eda · d502eda
2 parents c54dfee + af8048b
commit d502eda
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -379,7 +379,7 @@ dependencies = [
  "tar",
  "tempfile",
  "termcolor",
- "toml",
+ "toml_edit",
  "unicode-width",
  "unicode-xid",
  "url 2.2.2",
@@ -465,7 +465,7 @@ dependencies = [
  "serde_json",
  "tar",
  "termcolor",
- "toml",
+ "toml_edit",
  "url 2.2.2",
 ]
 
@@ -731,6 +731,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "combine"
+version = "4.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
 [[package]]
 name = "commoncrypto"
 version = "0.2.0"
@@ -1953,6 +1963,15 @@ dependencies = [
  "unicase",
 ]
 
+[[package]]
+name = "kstring"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b310ccceade8121d7d77fee406160e457c2f4e7c7982d589da3499bc7ea4526"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -5223,6 +5242,19 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b80ac5e1b91e3378c63dab121962472b5ca20cf9ab1975e3d588548717807a8"
+dependencies = [
+ "combine",
+ "indexmap",
+ "itertools 0.10.1",
+ "kstring",
+ "serde",
+]
+
 [[package]]
 name = "topological-sort"
 version = "0.1.0"

diff --git a/src/tools/cargo b/src/tools/cargo
+1 −1		Cargo.toml
+1 −1		benches/capture/Cargo.toml
+1 −0		benches/capture/src/main.rs
+24 −0		build.rs
+1 −1		crates/cargo-test-support/Cargo.toml
+1 −1		crates/cargo-test-support/src/registry.rs
+4 −6		src/bin/cargo/cli.rs
+4 −10		src/bin/cargo/commands/fix.rs
+2 −13		src/bin/cargo/commands/run.rs
+14 −28		src/bin/cargo/commands/test.rs
+15 −13		src/cargo/core/compiler/unit_dependencies.rs
+1 −2		src/cargo/core/features.rs
+1 −0		src/cargo/core/manifest.rs
+2 −1		src/cargo/core/package.rs
+1 −0		src/cargo/core/workspace.rs
+50 −4		src/cargo/ops/cargo_compile.rs
+9 −4		src/cargo/ops/cargo_config.rs
+1 −0		src/cargo/ops/cargo_new.rs
+1 −0		src/cargo/ops/cargo_output_metadata.rs
+1 −0		src/cargo/ops/common_for_install_and_uninstall.rs
+16 −6		src/cargo/ops/lockfile.rs
+1 −0		src/cargo/ops/vendor.rs
+0 −5		src/cargo/util/command_prelude.rs
+1 −1		src/cargo/util/config/key.rs
+74 −11		src/cargo/util/config/mod.rs
+1 −0		src/cargo/util/config/target.rs
+18 −2		src/cargo/util/toml/mod.rs
+21 −36		src/cargo/version.rs
+3 −3		src/doc/src/reference/build-scripts.md
+3 −3		src/doc/src/reference/environment-variables.md
+33 −3		tests/testsuite/bad_config.rs
+18 −3		tests/testsuite/build.rs
+24 −7		tests/testsuite/config.rs
+115 −9		tests/testsuite/config_cli.rs
+8 −2		tests/testsuite/config_include.rs
+46 −1		tests/testsuite/doc.rs
+2 −0		tests/testsuite/features_namespaced.rs
+7 −1		tests/testsuite/git.rs
+6 −1		tests/testsuite/install.rs
+1 −0		tests/testsuite/install_upgrade.rs
+1 −0		tests/testsuite/login.rs
+1 −0		tests/testsuite/logout.rs
+15 −2		tests/testsuite/new.rs
+1 −0		tests/testsuite/package.rs
+1 −0		tests/testsuite/patch.rs
+1 −2		tests/testsuite/publish.rs
+45 −7		tests/testsuite/test.rs
+1 −0		tests/testsuite/weak_dep_features.rs
+6 −1		tests/testsuite/workspaces.rs