diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 05e03a9c22e..08b69e10590 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -167,7 +167,7 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@stable with: - toolchain: "1.95" # STABLE + toolchain: "1.96" # STABLE - uses: Swatinem/rust-cache@v2 - name: UI Tests run: make test-ui-${{ matrix.features }} @@ -213,7 +213,7 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@stable with: - toolchain: "1.95" # STABLE + toolchain: "1.96" # STABLE - uses: Swatinem/rust-cache@v2 - name: Check documentation env: @@ -228,7 +228,7 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@stable with: - toolchain: "1.95" # STABLE + toolchain: "1.96" # STABLE components: rustfmt - uses: Swatinem/rust-cache@v2 - name: Check formatting @@ -242,7 +242,7 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@stable with: - toolchain: "1.95" # STABLE + toolchain: "1.96" # STABLE components: clippy - uses: Swatinem/rust-cache@v2 - name: Lint (ultra-minimal) diff --git a/Makefile b/Makefile index 8eeb82b2eaf..7700fb6ce15 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ ifneq (${TOOLCHAIN_TARGET},) ARGS+=--target ${TOOLCHAIN_TARGET} endif -STABLE?=1.95 +STABLE?=1.96 _FEATURES = minimal default wasm full debug release _FEATURES_minimal = --no-default-features --features "std" diff --git a/tests/derive_ui.rs b/tests/derive_ui.rs index c0d5af20f83..fb2a4124c38 100644 --- a/tests/derive_ui.rs +++ b/tests/derive_ui.rs @@ -8,7 +8,7 @@ #![cfg(feature = "unstable-derive-ui-tests")] #[cfg(feature = "derive")] -#[rustversion::attr(not(stable(1.95)), ignore)] // STABLE +#[rustversion::attr(not(stable(1.96)), ignore)] // STABLE #[test] fn ui() { let t = trybuild::TestCases::new(); diff --git a/tests/derive_ui/skip_without_default.stderr b/tests/derive_ui/skip_without_default.stderr index 1b0d684fac8..8a0345c57cc 100644 --- a/tests/derive_ui/skip_without_default.stderr +++ b/tests/derive_ui/skip_without_default.stderr @@ -2,10 +2,10 @@ error[E0277]: the trait bound `Kind: Default` is not satisfied --> tests/derive_ui/skip_without_default.rs:22:11 | 22 | #[arg(skip)] - | ^^^^ unsatisfied trait bound + | ^^^^ the trait `Default` is not implemented for `Kind` | -help: the trait `Default` is not implemented for `Kind` - --> tests/derive_ui/skip_without_default.rs:12:1 +help: consider annotating `Kind` with `#[derive(Default)]` + | +12 + #[derive(Default)] +13 | enum Kind { | -12 | enum Kind { - | ^^^^^^^^^ diff --git a/tests/derive_ui/tuple_struct.stderr b/tests/derive_ui/tuple_struct.stderr index cd2f543d2ba..3e0c194cefc 100644 --- a/tests/derive_ui/tuple_struct.stderr +++ b/tests/derive_ui/tuple_struct.stderr @@ -6,14 +6,14 @@ error: `#[derive(Parser)]` only supports non-tuple structs and enums | = note: this error originates in the derive macro `Parser` (in Nightly builds, run with -Z macro-backtrace for more info) -error[E0599]: no function or associated item named `parse` found for struct `Opt` in the current scope +error[E0599]: no associated function or constant named `parse` found for struct `Opt` in the current scope --> tests/derive_ui/tuple_struct.rs:16:20 | 13 | struct Opt(u32); - | ---------- function or associated item `parse` not found for this struct + | ---------- associated function or constant `parse` not found for this struct ... 16 | let opt = Opt::parse(); - | ^^^^^ function or associated item not found in `Opt` + | ^^^^^ associated function or constant not found in `Opt` | = help: items from traits can only be used if the trait is implemented and in scope = note: the following traits define an item `parse`, perhaps you need to implement one of them: