Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update MSRV to 1.74 #5343

Merged
merged 1 commit into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clippy.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
msrv = "1.70.0" # MSRV
msrv = "1.74" # MSRV
warn-on-all-wildcard-imports = true
allow-expect-in-tests = true
allow-unwrap-in-tests = true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
build: [msrv, wasm, wasm-wasi, debug, release]
include:
- build: msrv
rust: 1.70.0 # MSRV
rust: "1.74" # MSRV
target: x86_64-unknown-linux-gnu
features: full
- build: wasm
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: "1.70" # MSRV
toolchain: "1.74" # MSRV
- uses: Swatinem/rust-cache@v2
- name: UI Tests
run: make test-ui-${{ matrix.features }}
Expand All @@ -154,7 +154,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.70.0 # MSRV
toolchain: "1.74" # MSRV
- uses: Swatinem/rust-cache@v2
- name: Check documentation
env:
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: "1.70" # MSRV
toolchain: "1.74" # MSRV
components: clippy
- uses: Swatinem/rust-cache@v2
- name: Lint (ultra-minimal)
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ members = [
[workspace.package]
license = "MIT OR Apache-2.0"
edition = "2021"
rust-version = "1.70.0" # MSRV
rust-version = "1.74" # MSRV
include = [
"build.rs",
"src/**/*",
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ifneq (${TOOLCHAIN_TARGET},)
ARGS+=--target ${TOOLCHAIN_TARGET}
endif

MSRV?=1.70
MSRV?=1.74

_FEATURES = minimal default wasm full debug release
_FEATURES_minimal = --no-default-features --features "std"
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
//! - Leverage feature flags to keep to one active branch
//! - Being under [WG-CLI](https://github.com/rust-cli/team/) to increase the bus factor
//! - We follow semver and will wait about 6-9 months between major breaking changes
//! - We will support the last two minor Rust releases (MSRV, currently 1.70.0)
//! - We will support the last two minor Rust releases (MSRV, currently 1.74)
//!
//! While these aspirations can be at odds with fast build times and low binary
//! size, we will still strive to keep these reasonable for the flexibility you
Expand Down
2 changes: 1 addition & 1 deletion tests/derive_ui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// option. This file may not be copied, modified, or distributed

#[cfg(feature = "derive")]
#[rustversion::attr(any(not(stable), before(1.70), since(1.71)), ignore)] // MSRV
#[rustversion::attr(any(not(stable), before(1.74), since(1.75)), ignore)] // MSRV
#[test]
fn ui() {
let t = trybuild::TestCases::new();
Expand Down
8 changes: 4 additions & 4 deletions tests/derive_ui/flatten_enum_in_struct.stderr
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
error[E0277]: the trait bound `SubCmd: clap::Args` is not satisfied
--> tests/derive_ui/flatten_enum_in_struct.rs:3:15
--> tests/derive_ui/flatten_enum_in_struct.rs:4:10
|
3 | #[command(flatten)]
| ^^^^^^^ the trait `clap::Args` is not implemented for `SubCmd`
4 | sub: SubCmd,
| ^^^^^^ the trait `clap::Args` is not implemented for `SubCmd`
|
= help: the following other types implement trait `clap::Args`:
Box<T>
Opt
Box<T>
9 changes: 4 additions & 5 deletions tests/derive_ui/flatten_struct_in_enum.stderr
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
error[E0277]: the trait bound `SubCmd: Subcommand` is not satisfied
--> tests/derive_ui/flatten_struct_in_enum.rs:1:10
--> tests/derive_ui/flatten_struct_in_enum.rs:4:9
|
1 | #[derive(clap::Parser)]
| ^^^^^^^^^^^^ the trait `Subcommand` is not implemented for `SubCmd`
4 | Sub(SubCmd),
| ^^^^^^ the trait `Subcommand` is not implemented for `SubCmd`
|
= help: the following other types implement trait `Subcommand`:
Box<T>
Opt
= note: this error originates in the derive macro `clap::Parser` (in Nightly builds, run with -Z macro-backtrace for more info)
Box<T>
Loading