Skip to content

Commit e846d5a

Browse files
committed
Tweak tests to avoid confusing suggestion output
1 parent 67bdf12 commit e846d5a

6 files changed

+12
-12
lines changed

tests/ui/enum/nested-enum.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
enum Foo {
2-
enum Bar { Baz }, //~ ERROR `enum` definition cannot be nested inside `enum`
3-
struct Quux { field: u8 }, //~ ERROR `struct` definition cannot be nested inside `enum`
4-
union Wibble { field: u8 }, //~ ERROR `union` definition cannot be nested inside `enum`
2+
enum Bar { Baz },
3+
//~^ ERROR `enum` definition cannot be nested inside `enum`
4+
struct Quux { field: u8 },
5+
//~^ ERROR `struct` definition cannot be nested inside `enum`
6+
union Wibble { field: u8 },
7+
//~^ ERROR `union` definition cannot be nested inside `enum`
58
Bat,
69
}
710

tests/ui/enum/nested-enum.stderr

+2-5
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,28 @@ LL | enum Bar { Baz },
77
help: consider creating a new `enum` definition instead of nesting
88
|
99
LL - enum Bar { Baz },
10-
LL +
1110
|
1211

1312
error: `struct` definition cannot be nested inside `enum`
14-
--> $DIR/nested-enum.rs:3:5
13+
--> $DIR/nested-enum.rs:4:5
1514
|
1615
LL | struct Quux { field: u8 },
1716
| ^^^^^^
1817
|
1918
help: consider creating a new `struct` definition instead of nesting
2019
|
2120
LL - struct Quux { field: u8 },
22-
LL +
2321
|
2422

2523
error: `union` definition cannot be nested inside `enum`
26-
--> $DIR/nested-enum.rs:4:5
24+
--> $DIR/nested-enum.rs:6:5
2725
|
2826
LL | union Wibble { field: u8 },
2927
| ^^^^^
3028
|
3129
help: consider creating a new `union` definition instead of nesting
3230
|
3331
LL - union Wibble { field: u8 },
34-
LL +
3532
|
3633

3734
error: aborting due to 3 previous errors

tests/ui/parser/issues/fn-no-semicolon-issue-124935-semi-after-item.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
// Tests that we do not erroneously emit an error about
33
// missing main function when the mod starts with a `;`
44

5-
; //~ ERROR expected item, found `;`
5+
;
6+
//~^ ERROR expected item, found `;`
67
fn main() { }

tests/ui/parser/issues/fn-no-semicolon-issue-124935-semi-after-item.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ LL | ;
77
help: remove this semicolon
88
|
99
LL - ;
10-
LL +
1110
|
1211

1312
error: aborting due to 1 previous error

tests/ui/parser/issues/missing-main-issue-124935-semi-after-item.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
// Tests that we still emit an error after an item.
33

44
fn main() { }
5-
; //~ ERROR expected item, found `;`
5+
;
6+
//~^ ERROR expected item, found `;`

tests/ui/parser/issues/missing-main-issue-124935-semi-after-item.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ LL | ;
88
help: remove this semicolon
99
|
1010
LL - ;
11-
LL +
1211
|
1312

1413
error: aborting due to 1 previous error

0 commit comments

Comments
 (0)