diff --git a/.clippy.toml b/.clippy.toml index 23bf4817..23fc604a 100644 --- a/.clippy.toml +++ b/.clippy.toml @@ -1 +1 @@ -msrv = "1.60.0" # MSRV +msrv = "1.64.0" # MSRV diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55461daa..63eec09e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,7 +78,7 @@ jobs: build: [msrv, wasm, wasm-wasi, debug, release] include: - build: msrv - rust: 1.60.0 # MSRV + rust: 1.64.0 # MSRV target: x86_64-unknown-linux-gnu features: full - build: wasm @@ -124,7 +124,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.60.0 # MSRV + toolchain: 1.64.0 # MSRV profile: minimal override: true - uses: Swatinem/rust-cache@v2 @@ -139,7 +139,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.60.0 # MSRV + toolchain: 1.64.0 # MSRV profile: minimal override: true - uses: Swatinem/rust-cache@v2 @@ -174,7 +174,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.60.0 # MSRV + toolchain: 1.64.0 # MSRV profile: minimal override: true components: clippy diff --git a/.github/workflows/rust-next.yml b/.github/workflows/rust-next.yml index 8000788b..669375bb 100644 --- a/.github/workflows/rust-next.yml +++ b/.github/workflows/rust-next.yml @@ -92,9 +92,9 @@ jobs: strategy: matrix: rust: - - 1.60.0 # MSRV + - 1.64.0 # MSRV - stable - continue-on-error: ${{ matrix.rust != '1.60.0' }} # MSRV + continue-on-error: ${{ matrix.rust != '1.64.0' }} # MSRV runs-on: ubuntu-latest steps: - name: Checkout repository diff --git a/Cargo.toml b/Cargo.toml index 750c26ee..56eac70b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ keywords = [ ] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60.0" # MSRV +rust-version = "1.64.0" # MSRV include = [ "build.rs", "src/**/*", diff --git a/Makefile b/Makefile index 538a1b25..a6edd91d 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ ifneq (${TOOLCHAIN_TARGET},) ARGS+=--target ${TOOLCHAIN_TARGET} endif -MSRV?=1.60.0 +MSRV?=1.64.0 _FEATURES = minimal default wasm full debug release _FEATURES_minimal = --no-default-features --features "std" diff --git a/clap_bench/Cargo.toml b/clap_bench/Cargo.toml index 5efa39c7..027885e6 100644 --- a/clap_bench/Cargo.toml +++ b/clap_bench/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "Benchmarks for clap" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60.0" # MSRV +rust-version = "1.64.0" # MSRV publish = false [package.metadata.release] diff --git a/clap_complete/Cargo.toml b/clap_complete/Cargo.toml index 5c5035ab..880d2f84 100644 --- a/clap_complete/Cargo.toml +++ b/clap_complete/Cargo.toml @@ -12,7 +12,7 @@ keywords = [ ] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60.0" # MSRV +rust-version = "1.64.0" # MSRV include = [ "build.rs", "src/**/*", diff --git a/clap_complete_fig/Cargo.toml b/clap_complete_fig/Cargo.toml index 53edc869..2a5886a4 100644 --- a/clap_complete_fig/Cargo.toml +++ b/clap_complete_fig/Cargo.toml @@ -12,7 +12,7 @@ keywords = [ ] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60.0" # MSRV +rust-version = "1.64.0" # MSRV include = [ "build.rs", "src/**/*", diff --git a/clap_derive/Cargo.toml b/clap_derive/Cargo.toml index 27bf1e57..0c7b1cf4 100644 --- a/clap_derive/Cargo.toml +++ b/clap_derive/Cargo.toml @@ -13,7 +13,7 @@ keywords = [ ] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60.0" # MSRV +rust-version = "1.64.0" # MSRV include = [ "build.rs", "src/**/*", diff --git a/clap_lex/Cargo.toml b/clap_lex/Cargo.toml index e3cc855f..0b324c53 100644 --- a/clap_lex/Cargo.toml +++ b/clap_lex/Cargo.toml @@ -13,7 +13,7 @@ keywords = [ ] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60.0" # MSRV +rust-version = "1.64.0" # MSRV include = [ "build.rs", "src/**/*", diff --git a/clap_mangen/Cargo.toml b/clap_mangen/Cargo.toml index 5961fcb8..4cd1df74 100644 --- a/clap_mangen/Cargo.toml +++ b/clap_mangen/Cargo.toml @@ -12,7 +12,7 @@ keywords = [ ] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60.0" # MSRV +rust-version = "1.64.0" # MSRV include = [ "build.rs", "src/**/*", diff --git a/src/lib.rs b/src/lib.rs index 393e1f0b..ab2d9d47 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -24,7 +24,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.60.0) +//! - We will support the last two minor Rust releases (MSRV, currently 1.64.0) //! //! 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 diff --git a/tests/derive_ui.rs b/tests/derive_ui.rs index c3a5648c..61d7b867 100644 --- a/tests/derive_ui.rs +++ b/tests/derive_ui.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed #[cfg(feature = "derive")] -#[rustversion::attr(any(not(stable), before(1.60), since(1.61)), ignore)] // MSRV +#[rustversion::attr(any(not(stable), before(1.64), since(1.65)), ignore)] // MSRV #[test] fn ui() { let t = trybuild::TestCases::new(); diff --git a/tests/derive_ui/bool_value_enum.stderr b/tests/derive_ui/bool_value_enum.stderr index 34a4ab93..900c82e6 100644 --- a/tests/derive_ui/bool_value_enum.stderr +++ b/tests/derive_ui/bool_value_enum.stderr @@ -3,3 +3,5 @@ error[E0277]: the trait bound `bool: ValueEnum` is not satisfied | 6 | #[arg(short, value_enum, default_value_t)] | ^^^^^^^^^^^^^^^ the trait `ValueEnum` is not implemented for `bool` + | + = help: the trait `ValueEnum` is implemented for `ColorChoice` diff --git a/tests/derive_ui/enum_variant_not_args.stderr b/tests/derive_ui/enum_variant_not_args.stderr index 61679f6c..6bf7cc03 100644 --- a/tests/derive_ui/enum_variant_not_args.stderr +++ b/tests/derive_ui/enum_variant_not_args.stderr @@ -3,3 +3,5 @@ error[E0277]: the trait bound `SubCmd: clap::Args` is not satisfied | 3 | Sub(SubCmd), | ^^^^^^ the trait `clap::Args` is not implemented for `SubCmd` + | + = help: the trait `clap::Args` is implemented for `Box` diff --git a/tests/derive_ui/flatten_enum_in_struct.stderr b/tests/derive_ui/flatten_enum_in_struct.stderr index 05e27a05..fd0e3954 100644 --- a/tests/derive_ui/flatten_enum_in_struct.stderr +++ b/tests/derive_ui/flatten_enum_in_struct.stderr @@ -3,3 +3,7 @@ error[E0277]: the trait bound `SubCmd: clap::Args` is not satisfied | 3 | #[command(flatten)] | ^^^^^^^ the trait `clap::Args` is not implemented for `SubCmd` + | + = help: the following other types implement trait `clap::Args`: + Box + Opt diff --git a/tests/derive_ui/flatten_struct_in_enum.stderr b/tests/derive_ui/flatten_struct_in_enum.stderr index c9644853..fb7f3222 100644 --- a/tests/derive_ui/flatten_struct_in_enum.stderr +++ b/tests/derive_ui/flatten_struct_in_enum.stderr @@ -4,4 +4,7 @@ error[E0277]: the trait bound `SubCmd: Subcommand` is not satisfied 1 | #[derive(clap::Parser)] | ^^^^^^^^^^^^ the trait `Subcommand` is not implemented for `SubCmd` | + = help: the following other types implement trait `Subcommand`: + Box + Opt = note: this error originates in the derive macro `clap::Parser` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/tests/derive_ui/tuple_struct.stderr b/tests/derive_ui/tuple_struct.stderr index ed835fac..cd2f543d 100644 --- a/tests/derive_ui/tuple_struct.stderr +++ b/tests/derive_ui/tuple_struct.stderr @@ -10,7 +10,7 @@ error[E0599]: no function or associated item named `parse` found for struct `Opt --> tests/derive_ui/tuple_struct.rs:16:20 | 13 | struct Opt(u32); - | ---------------- function or associated item `parse` not found for this + | ---------- function or associated item `parse` not found for this struct ... 16 | let opt = Opt::parse(); | ^^^^^ function or associated item not found in `Opt`