Auto merge of #13324 - epage:msrv, r=weihanglo

bors · bors · commit c061bfbc0843 · 2024-01-19T00:23:48.000Z
chore: Make MSRV=N-2 the workspace default ### What does this PR try to resolve? Since we update the MSRV every release, `cargo bump-check` forces the changed packages to be released (#13266). A caveat is that `cargo bump-check` only checks the directory and doesn't do a `.crate` diff, so it misses out of changes to `workspace.package`. Because of our current workspace default, this means every 6 weeks we ship our user-facing packages but not the internal ones. This shifts that so we ship our internal packages every 6 weeks and our internal only when changed. ### How should we test and review this PR? ### Additional information If `rust-version = "auto"` (rust-lang/rfcs#3537) gets approved, then we will only ship packages that actually change
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ exclude = [
 ]
 
 [workspace.package]
-rust-version = "1.75.0"  # MSRV:1
+rust-version = "1.73"  # MSRV:3
 edition = "2021"
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/rust-lang/cargo"
@@ -127,7 +127,7 @@ name = "cargo"
 version = "0.78.0"
 edition.workspace = true
 license.workspace = true
-rust-version.workspace = true
+rust-version = "1.75.0"  # MSRV:1
 homepage = "https://doc.rust-lang.org/cargo/index.html"
 repository.workspace = true
 documentation = "https://docs.rs/cargo"
diff --git a/benches/benchsuite/Cargo.toml b/benches/benchsuite/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "benchsuite"
 version = "0.0.0"
-rust-version.workspace = true
 edition.workspace = true
 license.workspace = true
 homepage = "https://github.com/rust-lang/cargo"
diff --git a/benches/capture/Cargo.toml b/benches/capture/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "capture"
 version = "0.1.0"
-rust-version.workspace = true
 edition.workspace = true
 license.workspace = true
 description = "Tool for capturing a real-world workspace for benchmarking."
diff --git a/crates/cargo-platform/Cargo.toml b/crates/cargo-platform/Cargo.toml
@@ -3,7 +3,7 @@ name = "cargo-platform"
 version = "0.1.8"
 edition.workspace = true
 license.workspace = true
-rust-version = "1.73"  # MSRV:3
+rust-version.workspace = true
 homepage.workspace = true
 repository.workspace = true
 documentation = "https://docs.rs/cargo-platform"
diff --git a/crates/cargo-test-macro/Cargo.toml b/crates/cargo-test-macro/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "cargo-test-macro"
 version = "0.1.0"
-rust-version.workspace = true
 edition.workspace = true
 license.workspace = true
 homepage.workspace = true
diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "cargo-test-support"
 version = "0.1.0"
-rust-version.workspace = true
 license.workspace = true
 edition.workspace = true
 publish = false
diff --git a/crates/cargo-util-schemas/Cargo.toml b/crates/cargo-util-schemas/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cargo-util-schemas"
 version = "0.2.0"
-rust-version.workspace = true
+rust-version = "1.75.0"  # MSRV:1
 edition.workspace = true
 license.workspace = true
 homepage.workspace = true
diff --git a/crates/cargo-util/Cargo.toml b/crates/cargo-util/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cargo-util"
 version = "0.2.10"
-rust-version.workspace = true
+rust-version = "1.75.0"  # MSRV:1
 edition.workspace = true
 license.workspace = true
 homepage.workspace = true
diff --git a/crates/crates-io/Cargo.toml b/crates/crates-io/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "crates-io"
 version = "0.40.0"
-rust-version.workspace = true
+rust-version = "1.75.0"  # MSRV:1
 edition.workspace = true
 license.workspace = true
 homepage.workspace = true
diff --git a/crates/home/Cargo.toml b/crates/home/Cargo.toml
@@ -2,7 +2,7 @@
 name = "home"
 version = "0.5.11"
 authors = ["Brian Anderson <andersrb@gmail.com>"]
-rust-version = "1.73"  # MSRV:3
+rust-version.workspace = true
 documentation = "https://docs.rs/home"
 edition.workspace = true
 include = [
diff --git a/crates/mdman/Cargo.toml b/crates/mdman/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "mdman"
 version = "0.0.0"
-rust-version.workspace = true
 edition.workspace = true
 license.workspace = true
 description = "Creates a man page page from markdown."
diff --git a/crates/resolver-tests/Cargo.toml b/crates/resolver-tests/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "resolver-tests"
 version = "0.0.0"
-rust-version.workspace = true
 edition.workspace = true
 publish = false
 
diff --git a/crates/rustfix/Cargo.toml b/crates/rustfix/Cargo.toml
@@ -5,7 +5,7 @@ authors = [
     "Pascal Hertleif <killercup@gmail.com>",
     "Oliver Schneider <oli-obk@users.noreply.github.com>",
 ]
-rust-version = "1.73"  # MSRV:3
+rust-version.workspace = true
 edition.workspace = true
 license.workspace = true
 homepage.workspace = true
diff --git a/crates/semver-check/Cargo.toml b/crates/semver-check/Cargo.toml
@@ -2,7 +2,6 @@
 name = "semver-check"
 version = "0.0.0"
 authors = ["Eric Huss"]
-rust-version.workspace = true
 edition.workspace = true
 publish = false
 
diff --git a/crates/xtask-build-man/Cargo.toml b/crates/xtask-build-man/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "xtask-build-man"
 version = "0.0.0"
-rust-version.workspace = true
 edition.workspace = true
 publish = false
 
diff --git a/crates/xtask-bump-check/Cargo.toml b/crates/xtask-bump-check/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "xtask-bump-check"
 version = "0.0.0"
-rust-version.workspace = true
 edition.workspace = true
 publish = false
 
diff --git a/crates/xtask-stale-label/Cargo.toml b/crates/xtask-stale-label/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "xtask-stale-label"
 version = "0.0.0"
-rust-version.workspace = true
 edition.workspace = true
 publish = false
 
diff --git a/credential/cargo-credential-1password/Cargo.toml b/credential/cargo-credential-1password/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cargo-credential-1password"
 version = "0.4.4"
-rust-version = "1.73"  # MSRV:3
+rust-version.workspace = true
 edition.workspace = true
 license.workspace = true
 homepage.workspace = true
diff --git a/credential/cargo-credential-libsecret/Cargo.toml b/credential/cargo-credential-libsecret/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cargo-credential-libsecret"
-version = "0.4.2"
-rust-version.workspace = true
+version = "0.4.3"
+rust-version = "1.75.0"  # MSRV:1
 edition.workspace = true
 license.workspace = true
 homepage.workspace = true
diff --git a/credential/cargo-credential-macos-keychain/Cargo.toml b/credential/cargo-credential-macos-keychain/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cargo-credential-macos-keychain"
-version = "0.4.2"
-rust-version.workspace = true
+version = "0.4.3"
+rust-version = "1.75.0"  # MSRV:1
 edition.workspace = true
 license.workspace = true
 homepage.workspace = true
diff --git a/credential/cargo-credential-wincred/Cargo.toml b/credential/cargo-credential-wincred/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cargo-credential-wincred"
-version = "0.4.2"
-rust-version.workspace = true
+version = "0.4.3"
+rust-version = "1.75.0"  # MSRV:1
 edition.workspace = true
 license.workspace = true
 homepage.workspace = true
diff --git a/credential/cargo-credential/Cargo.toml b/credential/cargo-credential/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cargo-credential"
 version = "0.4.4"
-rust-version = "1.73"  # MSRV:3
+rust-version.workspace = true
 edition.workspace = true
 license.workspace = true
 homepage.workspace = true

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ authors = [`
`5`	`5`	`"Pascal Hertleif <[email protected]>",`
`6`	`6`	`"Oliver Schneider <[email protected]>",`
`7`	`7`	`]`
`8`		`-rust-version = "1.73" # MSRV:3`
	`8`	`+rust-version.workspace = true`
`9`	`9`	`edition.workspace = true`
`10`	`10`	`license.workspace = true`
`11`	`11`	`homepage.workspace = true`