Merge pull request #5343 from epage/msrv

chore: Update MSRV to 1.74
This commit is contained in:
Ed Page 2024-02-08 10:04:46 -06:00 committed by GitHub
commit 1d9a554cdf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 17 additions and 18 deletions

View file

@ -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

View file

@ -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
@ -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 }}
@ -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:
@ -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)

View file

@ -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/**/*",

View file

@ -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"

View file

@ -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

View file

@ -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();

View file

@ -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>

View file

@ -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>