Skip to content

Commit c4e0d67

Browse files
committed
test(derive): Update UI tests to stable
1 parent d18615d commit c4e0d67

6 files changed

+12
-7
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
- name: Install Rust
139139
uses: dtolnay/rust-toolchain@stable
140140
with:
141-
toolchain: "1.74" # MSRV
141+
toolchain: "1.80" # STABLE
142142
- uses: Swatinem/rust-cache@v2
143143
- name: UI Tests
144144
run: make test-ui-${{ matrix.features }}

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ifneq (${TOOLCHAIN_TARGET},)
1010
ARGS+=--target ${TOOLCHAIN_TARGET}
1111
endif
1212

13-
MSRV?=1.74
13+
STABLE?=1.80
1414

1515
_FEATURES = minimal default wasm full debug release
1616
_FEATURES_minimal = --no-default-features --features "std"
@@ -37,7 +37,7 @@ clippy-%:
3737
cargo clippy ${_FEATURES_${@:clippy-%=%}} ${ARGS} --all-targets -- -D warnings -A deprecated
3838

3939
test-ui-%:
40-
cargo +${MSRV} test --test derive_ui --features derive ${_FEATURES_${@:test-ui-%=%}}
40+
cargo +${STABLE} test --test derive_ui --features derive ${_FEATURES_${@:test-ui-%=%}}
4141

4242
doc:
4343
cargo doc --workspace --all-features --no-deps --document-private-items

tests/derive_ui.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// option. This file may not be copied, modified, or distributed
77

88
#[cfg(feature = "derive")]
9-
#[rustversion::attr(any(not(stable), before(1.74), since(1.75)), ignore)] // MSRV
9+
#[rustversion::attr(not(stable(1.80)), ignore)] // STABLE
1010
#[test]
1111
fn ui() {
1212
let t = trybuild::TestCases::new();

tests/derive_ui/flatten_enum_in_struct.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ error[E0277]: the trait bound `SubCmd: clap::Args` is not satisfied
55
| ^^^^^^ the trait `clap::Args` is not implemented for `SubCmd`
66
|
77
= help: the following other types implement trait `clap::Args`:
8-
Opt
98
Box<T>
9+
Opt

tests/derive_ui/flatten_struct_in_enum.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ error[E0277]: the trait bound `SubCmd: Subcommand` is not satisfied
55
| ^^^^^^ the trait `Subcommand` is not implemented for `SubCmd`
66
|
77
= help: the following other types implement trait `Subcommand`:
8-
Opt
98
Box<T>
9+
Opt

tests/derive_ui/group_name_attribute.stderr

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@ error[E0599]: no method named `name` found for struct `ArgGroup` in the current
22
--> tests/derive_ui/group_name_attribute.rs:11:26
33
|
44
11 | #[group(required = true, name = "src")]
5-
| ^^^^ method not found in `ArgGroup`
5+
| ^^^^
6+
|
7+
help: there is a method `ne` with a similar name
8+
|
9+
11 | #[group(required = true, ne = "src")]
10+
| ~~

0 commit comments

Comments
 (0)