Auto merge of rust-lang#109265 - weihanglo:update-beta-cargo, r=weiha…

…nglo [beta-1.69] cargo beta backports 3 commits in 9880b408a3af50c08fab3dbf4aa2a972df71e951..7b18c85808a6b45ec8364bf730617b6f13e0f9f8 2023-02-28 19:39:39 +0000 to 2023-03-17 12:29:33 +0000 - [beta-1.69] backport rust-lang/cargo#11824 (rust-lang/cargo#11863) - [beta-1.69] backport rust-lang/cargo#11820 (rust-lang/cargo#11823) - chore: Backport rust-lang/cargo#11630 to `1.69.0` (rust-lang/cargo#11806) r? `@ghost`
rust-lang-ci · Mar 19, 2023 · bdd077d · bdd077d
2 parents 2602aa8 + 5749c83
commit bdd077d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -997,7 +997,7 @@ dependencies = [
 
 [[package]]
 name = "crates-io"
-version = "0.35.1"
+version = "0.36.0"
 dependencies = [
  "anyhow",
  "curl",

diff --git a/src/tools/cargo b/src/tools/cargo
+1 −1		Cargo.toml
+1 −1		crates/crates-io/Cargo.toml
+10 −0		src/cargo/core/dependency.rs
+1 −1		src/cargo/util/config/de.rs
+184 −0		src/cargo/util/config/environment.rs
+21 −47		src/cargo/util/config/mod.rs
+319 −52		src/cargo/util/toml/mod.rs
+3 −11		src/cargo/util/toml_mut/manifest.rs
+1 −1		src/doc/src/reference/semver.md
+26 −0		tests/testsuite/cargo_command.rs
+60 −0		tests/testsuite/check.rs
+25 −0		tests/testsuite/config.rs
+119 −3		tests/testsuite/inheritable_workspace_fields.rs
+2 −2		tests/testsuite/metadata.rs