Skip to content

Commit 8a1c447

Browse files
daxpeddadaxpedda
committed
Simplify UI tests
1 parent a2628df commit 8a1c447

File tree

16 files changed

+166
-178
lines changed

16 files changed

+166
-178
lines changed

‎non-msrv-tests/tests/ui/default.rs‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,44 @@ use std::marker::PhantomData;
33
use derive_where::DeriveWhere;
44

55
#[derive(DeriveWhere)]
6-
#[derive_where(Debug; T)]
7-
struct DefaultOnStruct<T, U>(#[derive_where(default)] T, PhantomData<U>);
6+
#[derive_where(Debug)]
7+
struct DefaultOnStruct<T>(#[derive_where(default)] PhantomData<T>);
88

99
#[derive(DeriveWhere)]
10-
#[derive_where(Clone; T)]
11-
enum DefaultWithoutTrait<T, U> {
10+
#[derive_where(Clone)]
11+
enum DefaultWithoutTrait<T> {
1212
#[derive_where(default)]
13-
A(T),
14-
B(PhantomData<U>),
13+
A(PhantomData<T>),
1514
}
1615

1716
#[derive(DeriveWhere)]
18-
#[derive_where(Default; T)]
19-
enum MissingDefault<T, U> {
20-
A(T),
21-
B(PhantomData<U>),
17+
#[derive_where(Default)]
18+
enum MissingDefault<T> {
19+
A(PhantomData<T>),
2220
}
2321

2422
#[derive(DeriveWhere)]
25-
#[derive_where(Default; T)]
26-
enum DuplicateDefaultSeparate<T, U> {
23+
#[derive_where(Default)]
24+
enum DuplicateDefaultSeparate<T> {
2725
#[derive_where(default)]
28-
A(T),
26+
A(PhantomData<T>),
2927
#[derive_where(default)]
30-
B(PhantomData<U>),
28+
B(PhantomData<T>),
3129
}
3230

3331
#[derive(DeriveWhere)]
34-
#[derive_where(Default; T)]
35-
enum DuplicateDefaultSame<T, U> {
32+
#[derive_where(Default)]
33+
enum DuplicateDefaultSame<T> {
3634
#[derive_where(default, default)]
37-
A(T),
38-
B(PhantomData<U>),
35+
A(PhantomData<T>),
3936
}
4037

4138
#[derive(DeriveWhere)]
42-
#[derive_where(Default; T)]
43-
enum DuplicateDefaultSameSeparate<T, U> {
39+
#[derive_where(Default)]
40+
enum DuplicateDefaultSameSeparate<T> {
4441
#[derive_where(default)]
4542
#[derive_where(default)]
46-
A(T),
47-
B(PhantomData<U>),
43+
A(PhantomData<T>),
4844
}
4945

5046
fn main() {}

‎non-msrv-tests/tests/ui/default.stderr‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: unknown option
2-
--> tests/ui/default.rs:7:45
2+
--> tests/ui/default.rs:7:42
33
|
4-
7 | struct DefaultOnStruct<T, U>(#[derive_where(default)] T, PhantomData<U>);
5-
| ^^^^^^^
4+
7 | struct DefaultOnStruct<T>(#[derive_where(default)] PhantomData<T>);
5+
| ^^^^^^^
66

77
error: `default` is only supported if `Default` is being implemented
88
--> tests/ui/default.rs:12:17
@@ -11,29 +11,28 @@ error: `default` is only supported if `Default` is being implemented
1111
| ^^^^^^^
1212

1313
error: required `default` option on a variant if `Default` is being implemented
14-
--> tests/ui/default.rs:18:1
14+
--> tests/ui/default.rs:17:1
1515
|
16-
18 | / #[derive_where(Default; T)]
17-
19 | | enum MissingDefault<T, U> {
18-
20 | | A(T),
19-
21 | | B(PhantomData<U>),
20-
22 | | }
16+
17 | / #[derive_where(Default)]
17+
18 | | enum MissingDefault<T> {
18+
19 | | A(PhantomData<T>),
19+
20 | | }
2120
| |_^
2221

2322
error: multiple `default` options in enum
24-
--> tests/ui/default.rs:29:17
23+
--> tests/ui/default.rs:27:17
2524
|
26-
29 | #[derive_where(default)]
25+
27 | #[derive_where(default)]
2726
| ^^^^^^^
2827

2928
error: duplicate `default` option
30-
--> tests/ui/default.rs:36:26
29+
--> tests/ui/default.rs:34:26
3130
|
32-
36 | #[derive_where(default, default)]
31+
34 | #[derive_where(default, default)]
3332
| ^^^^^^^
3433

3534
error: duplicate `default` option
36-
--> tests/ui/default.rs:45:17
35+
--> tests/ui/default.rs:42:17
3736
|
38-
45 | #[derive_where(default)]
37+
42 | #[derive_where(default)]
3938
| ^^^^^^^

‎non-msrv-tests/tests/ui/item.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ use std::marker::PhantomData;
33
use derive_where::DeriveWhere;
44

55
#[derive(DeriveWhere)]
6-
struct NoAttribute<T, U>(T, PhantomData<U>);
6+
struct NoAttribute<T>(PhantomData<T>);
77

88
#[derive(DeriveWhere)]
99
#[derive_where]
10-
struct NoOption<T, U>(T, PhantomData<U>);
10+
struct NoOption<T>(PhantomData<T>);
1111

1212
#[derive(DeriveWhere)]
1313
#[derive_where()]
14-
struct EmptyAttribute<T, U>(T, PhantomData<U>);
14+
struct EmptyAttribute<T>(PhantomData<T>);
1515

1616
#[derive(DeriveWhere)]
1717
#[derive_where(Clone; T;)]
@@ -23,18 +23,18 @@ struct DoubleColonAtTheEnd<T, U>(T, PhantomData<U>);
2323

2424
#[derive(derive_where::DeriveWhere)]
2525
#[derive_where(Clone; where)]
26-
struct InvalidGeneric<T, U>(T, PhantomData<U>);
26+
struct InvalidGeneric<T>(PhantomData<T>);
2727

2828
#[derive(derive_where::DeriveWhere)]
29-
#[derive_where(Clone Debug; T)]
30-
struct MissingCommaBetweenTraits<T, U>(T, PhantomData<U>);
29+
#[derive_where(Clone Debug)]
30+
struct MissingCommaBetweenTraits<T>(PhantomData<T>);
3131

3232
#[derive(derive_where::DeriveWhere)]
3333
#[derive_where(Clone; T U)]
3434
struct MissingCommaBetweenGenerics<T, U, V>(T, PhantomData<(U, V)>);
3535

3636
#[derive(DeriveWhere)]
3737
#[derive_where("Clone")]
38-
struct InvalidTrait<T, U>(T, PhantomData<U>);
38+
struct InvalidTrait<T>(PhantomData<T>);
3939

4040
fn main() {}

‎non-msrv-tests/tests/ui/item.stderr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: no traits found to implement, use `#[derive_where(..)` to specify some
22
--> tests/ui/item.rs:6:1
33
|
4-
6 | struct NoAttribute<T, U>(T, PhantomData<U>);
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
6 | struct NoAttribute<T>(PhantomData<T>);
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66

77
error: unexpected option syntax
88
--> tests/ui/item.rs:9:3
@@ -37,7 +37,7 @@ error: expected type to bind to, expected one of: `for`, parentheses, `fn`, `uns
3737
error: expected `;` or `,
3838
--> tests/ui/item.rs:29:22
3939
|
40-
29 | #[derive_where(Clone Debug; T)]
40+
29 | #[derive_where(Clone Debug)]
4141
| ^^^^^
4242

4343
error: expected `,`

‎non-msrv-tests/tests/ui/item_option_syntax.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@ use derive_where::DeriveWhere;
55
#[derive(DeriveWhere)]
66
// Rust itself already fails to parse this and will provide a separate error message.
77
#[derive_where = invalid]
8-
struct InvalidAttribute<T, U>(T, PhantomData<U>);
8+
struct InvalidAttribute<T>(PhantomData<T>);
99

1010
#[derive(DeriveWhere)]
1111
#[derive_where = "invalid"]
12-
struct WrongAttributeSyntax<T, U>(T, PhantomData<U>);
12+
struct WrongAttributeSyntax<T>(PhantomData<T>);
1313

1414
#[derive(DeriveWhere)]
1515
#[derive_where()]
16-
struct EmptyAttribute<T, U>(T, PhantomData<U>);
16+
struct EmptyAttribute<T>(PhantomData<T>);
1717

1818
#[derive(DeriveWhere)]
19-
#[derive_where(Debug = "option"; T)]
20-
struct WrongOptionSyntax<T, U>(T, PhantomData<U>);
19+
#[derive_where(Debug = "option")]
20+
struct WrongOptionSyntax<T>(PhantomData<T>);
2121

2222
#[derive(DeriveWhere)]
23-
#[derive_where(Debug(); T)]
24-
struct EmptyOption<T, U>(T, PhantomData<U>);
23+
#[derive_where(Debug())]
24+
struct EmptyOption<T>(PhantomData<T>);
2525

2626
#[derive(derive_where::DeriveWhere)]
27-
#[derive_where(Debug(option); T)]
28-
struct UnsupportedOption<T, U>(T, PhantomData<U>);
27+
#[derive_where(Debug(option))]
28+
struct UnsupportedOption<T>(PhantomData<T>);
2929

3030
fn main() {}

‎non-msrv-tests/tests/ui/item_option_syntax.stderr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ error: empty `derive_where` found
1919
error: unexpected option syntax
2020
--> tests/ui/item_option_syntax.rs:19:16
2121
|
22-
19 | #[derive_where(Debug = "option"; T)]
22+
19 | #[derive_where(Debug = "option")]
2323
| ^^^^^^^^^^^^^^^^
2424

2525
error: empty attribute option found
2626
--> tests/ui/item_option_syntax.rs:23:16
2727
|
28-
23 | #[derive_where(Debug(); T)]
28+
23 | #[derive_where(Debug())]
2929
| ^^^^^^^
3030

3131
error: `Debug` doesn't support any options
3232
--> tests/ui/item_option_syntax.rs:27:16
3333
|
34-
27 | #[derive_where(Debug(option); T)]
34+
27 | #[derive_where(Debug(option))]
3535
| ^^^^^^^^^^^^^
3636

3737
error: unexpected token: `invalid`

‎non-msrv-tests/tests/ui/item_skip.rs‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,54 +3,53 @@ use std::marker::PhantomData;
33
use derive_where::DeriveWhere;
44

55
#[derive(DeriveWhere)]
6-
#[derive_where(Debug; T)]
6+
#[derive_where(Debug)]
77
#[derive_where(skip_inner)]
8-
enum SkipInnerOnEnum<T, U> {
9-
A(T),
10-
B(PhantomData<U>),
8+
enum SkipInnerOnEnum<T> {
9+
A(PhantomData<T>),
1110
}
1211

1312
#[derive(DeriveWhere)]
14-
#[derive_where(Debug; T)]
13+
#[derive_where(Debug)]
1514
#[derive_where(skip_inner)]
1615
#[derive_where(skip_inner)]
17-
struct DuplicateSkipInner<T, U>(T, PhantomData<U>);
16+
struct DuplicateSkipInner<T>(PhantomData<T>);
1817

1918
#[derive(DeriveWhere)]
20-
#[derive_where(Debug; T)]
19+
#[derive_where(Debug)]
2120
#[derive_where(skip_inner())]
22-
struct EmptySkipInner<T, U>(T, PhantomData<U>);
21+
struct EmptySkipInner<T>(PhantomData<T>);
2322

2423
#[derive(DeriveWhere)]
25-
#[derive_where(Debug; T)]
24+
#[derive_where(Debug)]
2625
#[derive_where(skip_inner)]
2726
#[derive_where(skip_inner(Debug))]
28-
struct OverridingSkipInner<T, U>(T, PhantomData<U>);
27+
struct OverridingSkipInner<T>(PhantomData<T>);
2928

3029
#[derive(DeriveWhere)]
3130
#[derive_where(Clone; T)]
3231
#[derive_where(skip_inner)]
33-
struct NoSupportedTrait<T, U>(T, PhantomData<U>);
32+
struct NoSupportedTrait<T>(PhantomData<T>);
3433

3534
#[derive(DeriveWhere)]
3635
#[derive_where(Clone; T)]
3736
#[derive_where(skip_inner(Clone))]
38-
struct UnsupportedTrait<T, U>(T, PhantomData<U>);
37+
struct UnsupportedTrait<T>(PhantomData<T>);
3938

4039
#[derive(DeriveWhere)]
41-
#[derive_where(Debug; T)]
40+
#[derive_where(Debug)]
4241
#[derive_where(skip_inner(Debug, Debug))]
43-
struct DuplicateTraitSame<T, U>(T, PhantomData<U>);
42+
struct DuplicateTraitSame<T>(PhantomData<T>);
4443

4544
#[derive(DeriveWhere)]
46-
#[derive_where(Debug; T)]
45+
#[derive_where(Debug)]
4746
#[derive_where(skip_inner(Debug))]
4847
#[derive_where(skip_inner(Debug))]
49-
struct DuplicateTraitSeparate<T, U>(T, PhantomData<U>);
48+
struct DuplicateTraitSeparate<T>(PhantomData<T>);
5049

5150
#[derive(DeriveWhere)]
5251
#[derive_where(Clone; T)]
5352
#[derive_where(skip_inner(Debug))]
54-
struct MissingDeriveTrait<T, U>(T, PhantomData<U>);
53+
struct MissingDeriveTrait<T>(PhantomData<T>);
5554

5655
fn main() {}

‎non-msrv-tests/tests/ui/item_skip.stderr‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,49 +5,49 @@ error: enums don't support `skip_inner`, use it on a variant instead
55
| ^^^^^^^^^^
66

77
error: duplicate `skip_inner` option
8-
--> tests/ui/item_skip.rs:16:16
8+
--> tests/ui/item_skip.rs:15:16
99
|
10-
16 | #[derive_where(skip_inner)]
10+
15 | #[derive_where(skip_inner)]
1111
| ^^^^^^^^^^
1212

1313
error: empty attribute option found
14-
--> tests/ui/item_skip.rs:21:16
14+
--> tests/ui/item_skip.rs:20:16
1515
|
16-
21 | #[derive_where(skip_inner())]
16+
20 | #[derive_where(skip_inner())]
1717
| ^^^^^^^^^^^^
1818

1919
error: unexpected constraint on `skip` when unconstrained `skip` already used
20-
--> tests/ui/item_skip.rs:27:16
20+
--> tests/ui/item_skip.rs:26:16
2121
|
22-
27 | #[derive_where(skip_inner(Debug))]
22+
26 | #[derive_where(skip_inner(Debug))]
2323
| ^^^^^^^^^^^^^^^^^
2424

2525
error: no trait that can be skipped is being implemented
26-
--> tests/ui/item_skip.rs:32:16
26+
--> tests/ui/item_skip.rs:31:16
2727
|
28-
32 | #[derive_where(skip_inner)]
28+
31 | #[derive_where(skip_inner)]
2929
| ^^^^^^^^^^
3030

3131
error: unsupported `Clone` constraint on `skip`
32-
--> tests/ui/item_skip.rs:37:27
32+
--> tests/ui/item_skip.rs:36:27
3333
|
34-
37 | #[derive_where(skip_inner(Clone))]
34+
36 | #[derive_where(skip_inner(Clone))]
3535
| ^^^^^
3636

3737
error: duplicate `Debug` constraint on `skip`
38-
--> tests/ui/item_skip.rs:42:34
38+
--> tests/ui/item_skip.rs:41:34
3939
|
40-
42 | #[derive_where(skip_inner(Debug, Debug))]
40+
41 | #[derive_where(skip_inner(Debug, Debug))]
4141
| ^^^^^
4242

4343
error: duplicate `Debug` constraint on `skip`
44-
--> tests/ui/item_skip.rs:48:27
44+
--> tests/ui/item_skip.rs:47:27
4545
|
46-
48 | #[derive_where(skip_inner(Debug))]
46+
47 | #[derive_where(skip_inner(Debug))]
4747
| ^^^^^
4848

4949
error: trait to be skipped isn't being implemented
50-
--> tests/ui/item_skip.rs:53:27
50+
--> tests/ui/item_skip.rs:52:27
5151
|
52-
53 | #[derive_where(skip_inner(Debug))]
52+
52 | #[derive_where(skip_inner(Debug))]
5353
| ^^^^^

‎non-msrv-tests/tests/ui/not-zeroize/item.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ struct WrongOptionSyntax<T, U>(T, PhantomData<U>);
1212

1313
#[derive(DeriveWhere)]
1414
#[derive_where(,)]
15-
struct OnlyComma<T, U>(T, PhantomData<U>);
15+
struct OnlyComma<T>(PhantomData<T>);
1616

1717
#[derive(DeriveWhere)]
1818
#[derive_where(,Clone)]
19-
struct StartWithComma<T, U>(T, PhantomData<U>);
19+
struct StartWithComma<T>(PhantomData<T>);
2020

2121
#[derive(DeriveWhere)]
2222
#[derive_where(Clone,,)]
23-
struct DuplicateCommaAtEnd<T, U>(T, PhantomData<U>);
23+
struct DuplicateCommaAtEnd<T>(PhantomData<T>);
2424

2525
#[derive(DeriveWhere)]
2626
#[derive_where(T)]

0 commit comments

Comments
 (0)