Skip to content

Commit d4486be

Browse files
dtolnaydtolnay
committed
Format all ui tests from PR 2558 using rustfmt
1 parent 991e344 commit d4486be

8 files changed

+52
-64
lines changed

‎test_suite/tests/ui/default-attribute/incorrect_type_enum_adjacently_tagged.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ use serde_derive::Deserialize;
66
enum Enum {
77
// Newtype variants does not use the provided path, so it is forbidden here
88
// Newtype(#[serde(default = "main")] u8),
9-
Tuple(
10-
u8,
11-
#[serde(default = "main")] i8,
12-
),
9+
Tuple(u8, #[serde(default = "main")] i8),
1310
Struct {
1411
#[serde(default = "main")]
1512
f1: u8,

‎test_suite/tests/ui/default-attribute/incorrect_type_enum_adjacently_tagged.stderr‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
error[E0308]: `match` arms have incompatible types
2-
--> tests/ui/default-attribute/incorrect_type_enum_adjacently_tagged.rs:11:27
3-
|
4-
4 | #[derive(Deserialize)]
5-
| -----------
6-
| |
7-
| this is found to be of type `i8`
8-
| `match` arms have incompatible types
2+
--> tests/ui/default-attribute/incorrect_type_enum_adjacently_tagged.rs:9:33
3+
|
4+
4 | #[derive(Deserialize)]
5+
| -----------
6+
| |
7+
| this is found to be of type `i8`
8+
| `match` arms have incompatible types
99
...
10-
11 | #[serde(default = "main")] i8,
11-
| ^^^^^^ expected `i8`, found `()`
10+
9 | Tuple(u8, #[serde(default = "main")] i8),
11+
| ^^^^^^ expected `i8`, found `()`
1212

1313
error[E0308]: `match` arms have incompatible types
14-
--> tests/ui/default-attribute/incorrect_type_enum_adjacently_tagged.rs:14:27
14+
--> tests/ui/default-attribute/incorrect_type_enum_adjacently_tagged.rs:11:27
1515
|
1616
4 | #[derive(Deserialize)]
1717
| -----------
1818
| |
1919
| this is found to be of type `u8`
2020
| `match` arms have incompatible types
2121
...
22-
14 | #[serde(default = "main")]
22+
11 | #[serde(default = "main")]
2323
| ^^^^^^ expected `u8`, found `()`
2424

2525
error[E0308]: `match` arms have incompatible types
26-
--> tests/ui/default-attribute/incorrect_type_enum_adjacently_tagged.rs:17:27
26+
--> tests/ui/default-attribute/incorrect_type_enum_adjacently_tagged.rs:14:27
2727
|
2828
4 | #[derive(Deserialize)]
2929
| -----------
3030
| |
3131
| this is found to be of type `i8`
3232
| `match` arms have incompatible types
3333
...
34-
17 | #[serde(default = "main")]
34+
14 | #[serde(default = "main")]
3535
| ^^^^^^ expected `i8`, found `()`

‎test_suite/tests/ui/default-attribute/incorrect_type_enum_externally_tagged.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ use serde_derive::Deserialize;
55
enum Enum {
66
// Newtype variants does not use the provided path, so it is forbidden here
77
// Newtype(#[serde(default = "main")] u8),
8-
Tuple(
9-
u8,
10-
#[serde(default = "main")] i8,
11-
),
8+
Tuple(u8, #[serde(default = "main")] i8),
129
Struct {
1310
#[serde(default = "main")]
1411
f1: u8,

‎test_suite/tests/ui/default-attribute/incorrect_type_enum_externally_tagged.stderr‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
error[E0308]: `match` arms have incompatible types
2-
--> tests/ui/default-attribute/incorrect_type_enum_externally_tagged.rs:10:27
3-
|
4-
4 | #[derive(Deserialize)]
5-
| -----------
6-
| |
7-
| this is found to be of type `i8`
8-
| `match` arms have incompatible types
2+
--> tests/ui/default-attribute/incorrect_type_enum_externally_tagged.rs:8:33
3+
|
4+
4 | #[derive(Deserialize)]
5+
| -----------
6+
| |
7+
| this is found to be of type `i8`
8+
| `match` arms have incompatible types
99
...
10-
10 | #[serde(default = "main")] i8,
11-
| ^^^^^^ expected `i8`, found `()`
10+
8 | Tuple(u8, #[serde(default = "main")] i8),
11+
| ^^^^^^ expected `i8`, found `()`
1212

1313
error[E0308]: `match` arms have incompatible types
14-
--> tests/ui/default-attribute/incorrect_type_enum_externally_tagged.rs:13:27
14+
--> tests/ui/default-attribute/incorrect_type_enum_externally_tagged.rs:10:27
1515
|
1616
4 | #[derive(Deserialize)]
1717
| -----------
1818
| |
1919
| this is found to be of type `u8`
2020
| `match` arms have incompatible types
2121
...
22-
13 | #[serde(default = "main")]
22+
10 | #[serde(default = "main")]
2323
| ^^^^^^ expected `u8`, found `()`
2424

2525
error[E0308]: `match` arms have incompatible types
26-
--> tests/ui/default-attribute/incorrect_type_enum_externally_tagged.rs:16:27
26+
--> tests/ui/default-attribute/incorrect_type_enum_externally_tagged.rs:13:27
2727
|
2828
4 | #[derive(Deserialize)]
2929
| -----------
3030
| |
3131
| this is found to be of type `i8`
3232
| `match` arms have incompatible types
3333
...
34-
16 | #[serde(default = "main")]
34+
13 | #[serde(default = "main")]
3535
| ^^^^^^ expected `i8`, found `()`

‎test_suite/tests/ui/default-attribute/incorrect_type_enum_untagged.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ use serde_derive::Deserialize;
66
enum Enum {
77
// Newtype variants does not use the provided path, so it is forbidden here
88
// Newtype(#[serde(default = "main")] u8),
9-
Tuple(
10-
u8,
11-
#[serde(default = "main")] i8,
12-
),
9+
Tuple(u8, #[serde(default = "main")] i8),
1310
Struct {
1411
#[serde(default = "main")]
1512
f1: u8,

‎test_suite/tests/ui/default-attribute/incorrect_type_enum_untagged.stderr‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
error[E0308]: `match` arms have incompatible types
2-
--> tests/ui/default-attribute/incorrect_type_enum_untagged.rs:11:27
3-
|
4-
4 | #[derive(Deserialize)]
5-
| -----------
6-
| |
7-
| this is found to be of type `i8`
8-
| `match` arms have incompatible types
2+
--> tests/ui/default-attribute/incorrect_type_enum_untagged.rs:9:33
3+
|
4+
4 | #[derive(Deserialize)]
5+
| -----------
6+
| |
7+
| this is found to be of type `i8`
8+
| `match` arms have incompatible types
99
...
10-
11 | #[serde(default = "main")] i8,
11-
| ^^^^^^ expected `i8`, found `()`
10+
9 | Tuple(u8, #[serde(default = "main")] i8),
11+
| ^^^^^^ expected `i8`, found `()`
1212

1313
error[E0308]: `match` arms have incompatible types
14-
--> tests/ui/default-attribute/incorrect_type_enum_untagged.rs:14:27
14+
--> tests/ui/default-attribute/incorrect_type_enum_untagged.rs:11:27
1515
|
1616
4 | #[derive(Deserialize)]
1717
| -----------
1818
| |
1919
| this is found to be of type `u8`
2020
| `match` arms have incompatible types
2121
...
22-
14 | #[serde(default = "main")]
22+
11 | #[serde(default = "main")]
2323
| ^^^^^^ expected `u8`, found `()`
2424

2525
error[E0308]: `match` arms have incompatible types
26-
--> tests/ui/default-attribute/incorrect_type_enum_untagged.rs:17:27
26+
--> tests/ui/default-attribute/incorrect_type_enum_untagged.rs:14:27
2727
|
2828
4 | #[derive(Deserialize)]
2929
| -----------
3030
| |
3131
| this is found to be of type `i8`
3232
| `match` arms have incompatible types
3333
...
34-
17 | #[serde(default = "main")]
34+
14 | #[serde(default = "main")]
3535
| ^^^^^^ expected `i8`, found `()`

‎test_suite/tests/ui/default-attribute/incorrect_type_tuple.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ use serde_derive::Deserialize;
33

44
#[derive(Deserialize)]
55
#[serde(default = "main")]
6-
struct Tuple(
7-
u8,
8-
#[serde(default = "main")] i8,
9-
);
6+
struct Tuple(u8, #[serde(default = "main")] i8);
107

118
fn main() {}

‎test_suite/tests/ui/default-attribute/incorrect_type_tuple.stderr‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ error[E0308]: mismatched types
88
| expected due to this
99

1010
error[E0308]: `match` arms have incompatible types
11-
--> tests/ui/default-attribute/incorrect_type_tuple.rs:8:23
11+
--> tests/ui/default-attribute/incorrect_type_tuple.rs:6:36
1212
|
1313
4 | #[derive(Deserialize)]
1414
| -----------
1515
| |
1616
| this is found to be of type `i8`
1717
| `match` arms have incompatible types
18-
...
19-
8 | #[serde(default = "main")] i8,
20-
| ^^^^^^ expected `i8`, found `()`
18+
5 | #[serde(default = "main")]
19+
6 | struct Tuple(u8, #[serde(default = "main")] i8);
20+
| ^^^^^^ expected `i8`, found `()`
2121

2222
error[E0308]: mismatched types
2323
--> tests/ui/default-attribute/incorrect_type_tuple.rs:5:19
2424
|
2525
5 | #[serde(default = "main")]
2626
| ^^^^^^ expected `Tuple`, found `()`
27-
6 | struct Tuple(
27+
6 | struct Tuple(u8, #[serde(default = "main")] i8);
2828
| ----- expected due to this
2929

3030
error[E0308]: mismatched types
31-
--> tests/ui/default-attribute/incorrect_type_tuple.rs:8:23
31+
--> tests/ui/default-attribute/incorrect_type_tuple.rs:6:36
3232
|
3333
4 | #[derive(Deserialize)]
3434
| ----------- expected due to the type of this binding
35-
...
36-
8 | #[serde(default = "main")] i8,
37-
| ^^^^^^ expected `i8`, found `()`
35+
5 | #[serde(default = "main")]
36+
6 | struct Tuple(u8, #[serde(default = "main")] i8);
37+
| ^^^^^^ expected `i8`, found `()`

0 commit comments

Comments
 (0)