Skip to content

Commit

Permalink
Auto merge of #13324 - epage:msrv, r=weihanglo
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Jan 19, 2024
2 parents a8187e5 + c6c1df4 commit c061bfb
Show file tree
Hide file tree
Showing 23 changed files with 19 additions and 29 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion benches/benchsuite/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
1 change: 0 additions & 1 deletion benches/capture/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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."
Expand Down
2 changes: 1 addition & 1 deletion crates/cargo-platform/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion crates/cargo-test-macro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion crates/cargo-test-support/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion crates/cargo-util-schemas/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion crates/cargo-util/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion crates/crates-io/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion crates/home/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
1 change: 0 additions & 1 deletion crates/mdman/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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."
Expand Down
1 change: 0 additions & 1 deletion crates/resolver-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[package]
name = "resolver-tests"
version = "0.0.0"
rust-version.workspace = true
edition.workspace = true
publish = false

Expand Down
2 changes: 1 addition & 1 deletion crates/rustfix/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion crates/semver-check/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
name = "semver-check"
version = "0.0.0"
authors = ["Eric Huss"]
rust-version.workspace = true
edition.workspace = true
publish = false

Expand Down
1 change: 0 additions & 1 deletion crates/xtask-build-man/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[package]
name = "xtask-build-man"
version = "0.0.0"
rust-version.workspace = true
edition.workspace = true
publish = false

Expand Down
1 change: 0 additions & 1 deletion crates/xtask-bump-check/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[package]
name = "xtask-bump-check"
version = "0.0.0"
rust-version.workspace = true
edition.workspace = true
publish = false

Expand Down
1 change: 0 additions & 1 deletion crates/xtask-stale-label/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[package]
name = "xtask-stale-label"
version = "0.0.0"
rust-version.workspace = true
edition.workspace = true
publish = false

Expand Down
2 changes: 1 addition & 1 deletion credential/cargo-credential-1password/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions credential/cargo-credential-libsecret/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions credential/cargo-credential-macos-keychain/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions credential/cargo-credential-wincred/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion credential/cargo-credential/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit c061bfb

Please sign in to comment.