Skip to content
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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)
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

STABLE?=1.95
STABLE?=1.96

_FEATURES = minimal default wasm full debug release
_FEATURES_minimal = --no-default-features --features "std"
Expand Down
2 changes: 1 addition & 1 deletion tests/derive_ui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
10 changes: 5 additions & 5 deletions tests/derive_ui/skip_without_default.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
| ^^^^^^^^^
6 changes: 3 additions & 3 deletions tests/derive_ui/tuple_struct.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading