Skip to content

Commit 1a3cf4b

Browse files
dtolnaydtolnay
committed
Update PR 2562 ui tests
1 parent 7d96352 commit 1a3cf4b

File tree

4 files changed

+61
-70
lines changed

4 files changed

+61
-70
lines changed

‎test_suite/tests/ui/conflict/alias-enum.rs

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@ use serde_derive::Deserialize;
55
#[derive(Deserialize)]
66
enum E {
77
S1 {
8-
/// Expected error on "alias b", because this is a name of other field
9-
/// Error on "alias a" is not expected because this is a name of this field
10-
/// Error on "alias c" is not expected because field `c` is skipped
118
#[serde(alias = "a", alias = "b", alias = "c")]
129
a: (),
1310

14-
/// Expected error on "alias c", because it is already used as alias of `a`
11+
// Warning on "c" and "b"
1512
#[serde(alias = "c")]
1613
b: (),
1714

@@ -20,34 +17,31 @@ enum E {
2017
},
2118

2219
S2 {
23-
/// Expected error on "alias c", because this is a name of other field after
24-
/// applying rename rules
2520
#[serde(alias = "b", alias = "c")]
2621
a: (),
2722

23+
// Warning on "c"
2824
#[serde(rename = "c")]
2925
b: (),
3026
},
3127

3228
#[serde(rename_all = "UPPERCASE")]
3329
S3 {
34-
/// Expected error on "alias B", because this is a name of field after
35-
/// applying rename rules
3630
#[serde(alias = "B", alias = "c")]
3731
a: (),
32+
33+
// Warning on "b" because this collides with the "B" above after
34+
// applying rename rules
3835
b: (),
3936
},
4037
}
4138

4239
#[derive(Deserialize)]
4340
enum E1 {
44-
/// Expected error on "alias b", because this is a name of other variant
45-
/// Error on "alias a" is not expected because this is a name of this variant
46-
/// Error on "alias c" is not expected because variant `c` is skipped
4741
#[serde(alias = "a", alias = "b", alias = "c")]
4842
a,
4943

50-
/// Expected error on "alias c", because it is already used as alias of `a`
44+
// Warning on "c" and "b"
5145
#[serde(alias = "c")]
5246
b,
5347

@@ -57,22 +51,22 @@ enum E1 {
5751

5852
#[derive(Deserialize)]
5953
enum E2 {
60-
/// Expected error on "alias c", because this is a name of other variant after
61-
/// applying rename rules
6254
#[serde(alias = "b", alias = "c")]
6355
a,
6456

57+
// Warning on "c"
6558
#[serde(rename = "c")]
6659
b,
6760
}
6861

6962
#[derive(Deserialize)]
7063
#[serde(rename_all = "UPPERCASE")]
7164
enum E3 {
72-
/// Expected error on "alias B", because this is a name of variant after
73-
/// applying rename rules
7465
#[serde(alias = "B", alias = "c")]
7566
a,
67+
68+
// Warning on "b" because this collides with the "B" above after applying
69+
// rename rules
7670
b,
7771
}
7872

‎test_suite/tests/ui/conflict/alias-enum.stderr

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,79 @@
11
error: expected expression, found `@`
2-
--> tests/ui/conflict/alias-enum.rs:80:5
2+
--> tests/ui/conflict/alias-enum.rs:74:5
33
|
4-
80 | @//fail
4+
74 | @//fail
55
| ^ expected expression
66

77
warning: unreachable pattern
8-
--> tests/ui/conflict/alias-enum.rs:16:9
8+
--> tests/ui/conflict/alias-enum.rs:13:9
99
|
10-
11 | #[serde(alias = "a", alias = "b", alias = "c")]
10+
8 | #[serde(alias = "a", alias = "b", alias = "c")]
1111
| --- matches all the relevant values
1212
...
13-
16 | b: (),
13+
13 | b: (),
1414
| ^ no value can reach this
1515
|
1616
= note: `#[warn(unreachable_patterns)]` on by default
1717

1818
warning: unreachable pattern
19-
--> tests/ui/conflict/alias-enum.rs:15:25
19+
--> tests/ui/conflict/alias-enum.rs:12:25
2020
|
21-
11 | #[serde(alias = "a", alias = "b", alias = "c")]
21+
8 | #[serde(alias = "a", alias = "b", alias = "c")]
2222
| --- matches all the relevant values
2323
...
24-
15 | #[serde(alias = "c")]
24+
12 | #[serde(alias = "c")]
2525
| ^^^ no value can reach this
2626

2727
warning: unreachable pattern
28-
--> tests/ui/conflict/alias-enum.rs:28:26
28+
--> tests/ui/conflict/alias-enum.rs:24:26
2929
|
30-
25 | #[serde(alias = "b", alias = "c")]
30+
20 | #[serde(alias = "b", alias = "c")]
3131
| --- matches all the relevant values
3232
...
33-
28 | #[serde(rename = "c")]
33+
24 | #[serde(rename = "c")]
3434
| ^^^ no value can reach this
3535

3636
warning: unreachable pattern
37-
--> tests/ui/conflict/alias-enum.rs:38:9
37+
--> tests/ui/conflict/alias-enum.rs:35:9
3838
|
39-
36 | #[serde(alias = "B", alias = "c")]
39+
30 | #[serde(alias = "B", alias = "c")]
4040
| --- matches all the relevant values
41-
37 | a: (),
42-
38 | b: (),
41+
...
42+
35 | b: (),
4343
| ^ no value can reach this
4444

4545
warning: unreachable pattern
46-
--> tests/ui/conflict/alias-enum.rs:52:5
46+
--> tests/ui/conflict/alias-enum.rs:46:5
4747
|
48-
47 | #[serde(alias = "a", alias = "b", alias = "c")]
48+
41 | #[serde(alias = "a", alias = "b", alias = "c")]
4949
| --- matches all the relevant values
5050
...
51-
52 | b,
51+
46 | b,
5252
| ^ no value can reach this
5353

5454
warning: unreachable pattern
55-
--> tests/ui/conflict/alias-enum.rs:51:21
55+
--> tests/ui/conflict/alias-enum.rs:45:21
5656
|
57-
47 | #[serde(alias = "a", alias = "b", alias = "c")]
57+
41 | #[serde(alias = "a", alias = "b", alias = "c")]
5858
| --- matches all the relevant values
5959
...
60-
51 | #[serde(alias = "c")]
60+
45 | #[serde(alias = "c")]
6161
| ^^^ no value can reach this
6262

6363
warning: unreachable pattern
64-
--> tests/ui/conflict/alias-enum.rs:65:22
64+
--> tests/ui/conflict/alias-enum.rs:58:22
6565
|
66-
62 | #[serde(alias = "b", alias = "c")]
66+
54 | #[serde(alias = "b", alias = "c")]
6767
| --- matches all the relevant values
6868
...
69-
65 | #[serde(rename = "c")]
69+
58 | #[serde(rename = "c")]
7070
| ^^^ no value can reach this
7171

7272
warning: unreachable pattern
73-
--> tests/ui/conflict/alias-enum.rs:76:5
73+
--> tests/ui/conflict/alias-enum.rs:70:5
7474
|
75-
74 | #[serde(alias = "B", alias = "c")]
75+
65 | #[serde(alias = "B", alias = "c")]
7676
| --- matches all the relevant values
77-
75 | a,
78-
76 | b,
77+
...
78+
70 | b,
7979
| ^ no value can reach this

‎test_suite/tests/ui/conflict/alias.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@ use serde_derive::Deserialize;
22

33
#[derive(Deserialize)]
44
struct S1 {
5-
/// Expected error on "alias b", because this is a name of other field
6-
/// Error on "alias a" is not expected because this is a name of this field
7-
/// Error on "alias c" is not expected because field `c` is skipped
85
#[serde(alias = "a", alias = "b", alias = "c")]
96
a: (),
107

11-
/// Expected error on "alias c", because it is already used as alias of `a`
8+
// Warning on "c" and "b"
129
#[serde(alias = "c")]
1310
b: (),
1411

@@ -18,22 +15,22 @@ struct S1 {
1815

1916
#[derive(Deserialize)]
2017
struct S2 {
21-
/// Expected error on "alias c", because this is a name of other field after
22-
/// applying rename rules
2318
#[serde(alias = "b", alias = "c")]
2419
a: (),
2520

21+
// Warning on "c"
2622
#[serde(rename = "c")]
2723
b: (),
2824
}
2925

3026
#[derive(Deserialize)]
3127
#[serde(rename_all = "UPPERCASE")]
3228
struct S3 {
33-
/// Expected error on "alias B", because this is a name of field after
34-
/// applying rename rules
3529
#[serde(alias = "B", alias = "c")]
3630
a: (),
31+
32+
// Warning on "b" because this collides with the "B" above after applying
33+
// rename rules
3734
b: (),
3835
}
3936

‎test_suite/tests/ui/conflict/alias.stderr

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
error: expected expression, found `@`
2-
--> tests/ui/conflict/alias.rs:41:5
2+
--> tests/ui/conflict/alias.rs:38:5
33
|
4-
41 | @//fail
4+
38 | @//fail
55
| ^ expected expression
66

77
warning: unreachable pattern
8-
--> tests/ui/conflict/alias.rs:13:5
8+
--> tests/ui/conflict/alias.rs:10:5
99
|
10-
8 | #[serde(alias = "a", alias = "b", alias = "c")]
10+
5 | #[serde(alias = "a", alias = "b", alias = "c")]
1111
| --- matches all the relevant values
1212
...
13-
13 | b: (),
13+
10 | b: (),
1414
| ^ no value can reach this
1515
|
1616
= note: `#[warn(unreachable_patterns)]` on by default
1717

1818
warning: unreachable pattern
19-
--> tests/ui/conflict/alias.rs:12:21
20-
|
21-
8 | #[serde(alias = "a", alias = "b", alias = "c")]
22-
| --- matches all the relevant values
19+
--> tests/ui/conflict/alias.rs:9:21
20+
|
21+
5 | #[serde(alias = "a", alias = "b", alias = "c")]
22+
| --- matches all the relevant values
2323
...
24-
12 | #[serde(alias = "c")]
25-
| ^^^ no value can reach this
24+
9 | #[serde(alias = "c")]
25+
| ^^^ no value can reach this
2626

2727
warning: unreachable pattern
28-
--> tests/ui/conflict/alias.rs:26:22
28+
--> tests/ui/conflict/alias.rs:22:22
2929
|
30-
23 | #[serde(alias = "b", alias = "c")]
30+
18 | #[serde(alias = "b", alias = "c")]
3131
| --- matches all the relevant values
3232
...
33-
26 | #[serde(rename = "c")]
33+
22 | #[serde(rename = "c")]
3434
| ^^^ no value can reach this
3535

3636
warning: unreachable pattern
37-
--> tests/ui/conflict/alias.rs:37:5
37+
--> tests/ui/conflict/alias.rs:34:5
3838
|
39-
35 | #[serde(alias = "B", alias = "c")]
39+
29 | #[serde(alias = "B", alias = "c")]
4040
| --- matches all the relevant values
41-
36 | a: (),
42-
37 | b: (),
41+
...
42+
34 | b: (),
4343
| ^ no value can reach this

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy