From 9438f80042d11ed800bf2773400704263475216e Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 18 Jan 2024 15:24:25 -0600 Subject: [PATCH 1/3] chore: Remove rust-version from private packages I removed it from `cargo-test-support` and `cargo-test-macro`, despite people depending on those (via git) because my long term plan is resting on the `auto` value which won't affect git dependencies. --- benches/benchsuite/Cargo.toml | 1 - benches/capture/Cargo.toml | 1 - crates/cargo-test-macro/Cargo.toml | 1 - crates/cargo-test-support/Cargo.toml | 1 - crates/mdman/Cargo.toml | 1 - crates/resolver-tests/Cargo.toml | 1 - crates/semver-check/Cargo.toml | 1 - crates/xtask-build-man/Cargo.toml | 1 - crates/xtask-bump-check/Cargo.toml | 1 - crates/xtask-stale-label/Cargo.toml | 1 - 10 files changed, 10 deletions(-) diff --git a/benches/benchsuite/Cargo.toml b/benches/benchsuite/Cargo.toml index 25c1604385f..efda5ea9dc7 100644 --- 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 index 16f2c5071e4..cb3742d790e 100644 --- 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-test-macro/Cargo.toml b/crates/cargo-test-macro/Cargo.toml index 23a63e9a2cd..e216936ee2f 100644 --- 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 index 1098d598d60..a8b7b8f1dd1 100644 --- 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/mdman/Cargo.toml b/crates/mdman/Cargo.toml index 4e86b8e1a68..375d8ac750f 100644 --- 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 index 11d5b5d0d83..44f90690051 100644 --- 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/semver-check/Cargo.toml b/crates/semver-check/Cargo.toml index ab13b573051..62301104995 100644 --- 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 index 87ae8c670a0..8c694543adf 100644 --- 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 index 989ece4b70c..44ce34141bf 100644 --- 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 index aff6194b7cd..3e555f6c02e 100644 --- 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 From b291f42dce6584d685c413658ef330ae49c61d3f Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 18 Jan 2024 15:28:04 -0600 Subject: [PATCH 2/3] chore: Make N-0 MSRVs explicit This will require a version bump every release but over-releasing these packages is likely a lot better than over-releasing the N-3 packages, which we won't have to do anymore after this. My hope is the `auto` value will be approved and stabilized and then we won't have to over-release anymore. --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- crates/cargo-util-schemas/Cargo.toml | 2 +- crates/cargo-util/Cargo.toml | 2 +- crates/crates-io/Cargo.toml | 2 +- credential/cargo-credential-libsecret/Cargo.toml | 4 ++-- credential/cargo-credential-macos-keychain/Cargo.toml | 4 ++-- credential/cargo-credential-wincred/Cargo.toml | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 77ce3f62185..c0a7cc9b9d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -353,7 +353,7 @@ dependencies = [ [[package]] name = "cargo-credential-libsecret" -version = "0.4.2" +version = "0.4.3" dependencies = [ "anyhow", "cargo-credential", @@ -362,7 +362,7 @@ dependencies = [ [[package]] name = "cargo-credential-macos-keychain" -version = "0.4.2" +version = "0.4.3" dependencies = [ "cargo-credential", "security-framework", @@ -370,7 +370,7 @@ dependencies = [ [[package]] name = "cargo-credential-wincred" -version = "0.4.2" +version = "0.4.3" dependencies = [ "cargo-credential", "windows-sys 0.52.0", diff --git a/Cargo.toml b/Cargo.toml index 77b2d172e66..0a6ab5b56cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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/crates/cargo-util-schemas/Cargo.toml b/crates/cargo-util-schemas/Cargo.toml index 19170618e11..81ae48ffded 100644 --- 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 index fa554309da4..57424c59bbb 100644 --- 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 index af487b3598e..c720e4caf91 100644 --- 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/credential/cargo-credential-libsecret/Cargo.toml b/credential/cargo-credential-libsecret/Cargo.toml index c313f816034..cf2d5b2a061 100644 --- 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 index d1905f57d53..a1592ba9121 100644 --- 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 index 3e4bc86d778..be6dcfb0e4f 100644 --- 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 From c6c1df4758997618c037c208a77e301c9e15264b Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 18 Jan 2024 15:30:41 -0600 Subject: [PATCH 3/3] chore: Make N-2 the default MSRV We likely don't want to release these packages every 6 months just for an MSRV bump. By moving the MSRV out of the package, `cargo bump-check` will ignore the MSRV bump. Inspired by #13266 --- Cargo.toml | 2 +- crates/cargo-platform/Cargo.toml | 2 +- crates/home/Cargo.toml | 2 +- crates/rustfix/Cargo.toml | 2 +- credential/cargo-credential-1password/Cargo.toml | 2 +- credential/cargo-credential/Cargo.toml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0a6ab5b56cd..0a62314f057 100644 --- 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" diff --git a/crates/cargo-platform/Cargo.toml b/crates/cargo-platform/Cargo.toml index bf7c3a25dbc..a42e2829a61 100644 --- 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/home/Cargo.toml b/crates/home/Cargo.toml index b4648df8c08..91742e534b6 100644 --- a/crates/home/Cargo.toml +++ b/crates/home/Cargo.toml @@ -2,7 +2,7 @@ name = "home" version = "0.5.11" authors = ["Brian Anderson "] -rust-version = "1.73" # MSRV:3 +rust-version.workspace = true documentation = "https://docs.rs/home" edition.workspace = true include = [ diff --git a/crates/rustfix/Cargo.toml b/crates/rustfix/Cargo.toml index 2c97f65bf60..8468f10553b 100644 --- a/crates/rustfix/Cargo.toml +++ b/crates/rustfix/Cargo.toml @@ -5,7 +5,7 @@ authors = [ "Pascal Hertleif ", "Oliver Schneider ", ] -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-1password/Cargo.toml b/credential/cargo-credential-1password/Cargo.toml index 3a15c1fde0c..144b44070db 100644 --- 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/Cargo.toml b/credential/cargo-credential/Cargo.toml index 87f66b5448d..1b9ae5756f3 100644 --- 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