Skip to content

Commit 71f16bd

Browse files
estebankestebank
committed
Make ; suggestions inline
1 parent b6f5188 commit 71f16bd

12 files changed

+32
-170
lines changed

‎compiler/rustc_parse/src/errors.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1215,14 +1215,14 @@ pub(crate) enum ExpectedSemiSugg {
12151215
parse_sugg_change_this_to_semi,
12161216
code = ";",
12171217
applicability = "machine-applicable",
1218-
style = "verbose"
1218+
style = "short"
12191219
)]
12201220
ChangeToSemi(#[primary_span] Span),
12211221
#[suggestion(
12221222
parse_sugg_add_semi,
1223-
style = "verbose",
12241223
code = ";",
1225-
applicability = "machine-applicable"
1224+
applicability = "machine-applicable",
1225+
style = "short"
12261226
)]
12271227
AddSemi(#[primary_span] Span),
12281228
}

‎tests/ui/let-else/let-else-missing-semicolon.stderr

+2-12
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,17 @@ error: expected `;`, found keyword `let`
22
--> $DIR/let-else-missing-semicolon.rs:4:6
33
|
44
LL | }
5-
| ^
5+
| ^ help: add `;` here
66
LL | let _ = "";
77
| --- unexpected token
8-
|
9-
help: add `;` here
10-
|
11-
LL | };
12-
| +
138

149
error: expected `;`, found `}`
1510
--> $DIR/let-else-missing-semicolon.rs:8:6
1611
|
1712
LL | }
18-
| ^
13+
| ^ help: add `;` here
1914
LL | }
2015
| - unexpected token
21-
|
22-
help: add `;` here
23-
|
24-
LL | };
25-
| +
2616

2717
error: aborting due to 2 previous errors
2818

‎tests/ui/parser/issues/issue-103425.stderr

+3-18
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,28 @@ error: expected `;`, found `5.0`
22
--> $DIR/issue-103425.rs:2:6
33
|
44
LL | 3
5-
| ^
5+
| ^ help: add `;` here
66
LL |
77
LL | 5.0
88
| --- unexpected token
9-
|
10-
help: add `;` here
11-
|
12-
LL | 3;
13-
| +
149

1510
error: expected `;`, found `3_i8`
1611
--> $DIR/issue-103425.rs:8:10
1712
|
1813
LL | 2_u32
19-
| ^
14+
| ^ help: add `;` here
2015
LL |
2116
LL | 3_i8
2217
| ---- unexpected token
23-
|
24-
help: add `;` here
25-
|
26-
LL | 2_u32;
27-
| +
2818

2919
error: expected `;`, found `5.0`
3020
--> $DIR/issue-103425.rs:10:9
3121
|
3222
LL | 3_i8
33-
| ^
23+
| ^ help: add `;` here
3424
LL |
3525
LL | 5.0
3626
| --- unexpected token
37-
|
38-
help: add `;` here
39-
|
40-
LL | 3_i8;
41-
| +
4227

4328
error: aborting due to 3 previous errors
4429

‎tests/ui/parser/issues/issue-118530-ice.stderr

+2-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,8 @@ LL | #[feature]
3030
| ---------- only `;` terminated statements or tail expressions are allowed after this attribute
3131
LL | attr::fn bar() -> String {
3232
| ^--- unexpected token
33-
|
34-
help: add `;` here
35-
|
36-
LL | attr::fn; bar() -> String {
37-
| +
33+
| |
34+
| help: add `;` here
3835

3936
error: `->` used for field access or method call
4037
--> $DIR/issue-118530-ice.rs:5:20

‎tests/ui/parser/issues/issue-3036.stderr

+1-6
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@ error: expected `;`, found `}`
22
--> $DIR/issue-3036.rs:6:15
33
|
44
LL | let _x = 3
5-
| ^
5+
| ^ help: add `;` here
66
LL | }
77
| - unexpected token
8-
|
9-
help: add `;` here
10-
|
11-
LL | let _x = 3;
12-
| +
138

149
error: aborting due to 1 previous error
1510

‎tests/ui/parser/issues/issue-87197-missing-semicolon.stderr

+3-18
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,25 @@ error: expected `;`, found `println`
22
--> $DIR/issue-87197-missing-semicolon.rs:6:16
33
|
44
LL | let x = 100
5-
| ^
5+
| ^ help: add `;` here
66
LL | println!("{}", x)
77
| ------- unexpected token
8-
|
9-
help: add `;` here
10-
|
11-
LL | let x = 100;
12-
| +
138

149
error: expected `;`, found keyword `let`
1510
--> $DIR/issue-87197-missing-semicolon.rs:7:22
1611
|
1712
LL | println!("{}", x)
18-
| ^
13+
| ^ help: add `;` here
1914
LL | let y = 200
2015
| --- unexpected token
21-
|
22-
help: add `;` here
23-
|
24-
LL | println!("{}", x);
25-
| +
2616

2717
error: expected `;`, found `println`
2818
--> $DIR/issue-87197-missing-semicolon.rs:8:16
2919
|
3020
LL | let y = 200
31-
| ^
21+
| ^ help: add `;` here
3222
LL | println!("{}", y);
3323
| ------- unexpected token
34-
|
35-
help: add `;` here
36-
|
37-
LL | let y = 200;
38-
| +
3924

4025
error: aborting due to 3 previous errors
4126

‎tests/ui/parser/macros-no-semicolon.stderr

+2-12
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,17 @@ error: expected `;`, found `assert_eq`
22
--> $DIR/macros-no-semicolon.rs:2:21
33
|
44
LL | assert_eq!(1, 2)
5-
| ^
5+
| ^ help: add `;` here
66
LL | assert_eq!(3, 4)
77
| --------- unexpected token
8-
|
9-
help: add `;` here
10-
|
11-
LL | assert_eq!(1, 2);
12-
| +
138

149
error: expected `;`, found `println`
1510
--> $DIR/macros-no-semicolon.rs:3:21
1611
|
1712
LL | assert_eq!(3, 4)
18-
| ^
13+
| ^ help: add `;` here
1914
LL | println!("hello");
2015
| ------- unexpected token
21-
|
22-
help: add `;` here
23-
|
24-
LL | assert_eq!(3, 4);
25-
| +
2616

2717
error: aborting due to 2 previous errors
2818

‎tests/ui/parser/raw/raw-str-unbalanced.stderr

+1-6
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,10 @@ error: expected `;`, found `#`
1919
--> $DIR/raw-str-unbalanced.rs:10:28
2020
|
2121
LL | const A: &'static str = r""
22-
| ^
22+
| ^ help: add `;` here
2323
...
2424
LL | #[test]
2525
| - unexpected token
26-
|
27-
help: add `;` here
28-
|
29-
LL | const A: &'static str = r"";
30-
| +
3126

3227
error: too many `#` when terminating raw string
3328
--> $DIR/raw-str-unbalanced.rs:16:28

‎tests/ui/parser/recover/recover-missing-semi-before-item.stderr

+10-60
Original file line numberDiff line numberDiff line change
@@ -2,132 +2,82 @@ error: expected `;`, found keyword `struct`
22
--> $DIR/recover-missing-semi-before-item.rs:6:16
33
|
44
LL | let foo = 3
5-
| ^
5+
| ^ help: add `;` here
66
LL | struct Foo;
77
| ------ unexpected token
8-
|
9-
help: add `;` here
10-
|
11-
LL | let foo = 3;
12-
| +
138

149
error: expected `;`, found `union`
1510
--> $DIR/recover-missing-semi-before-item.rs:11:16
1611
|
1712
LL | let foo = 3
18-
| ^
13+
| ^ help: add `;` here
1914
LL | union Foo {
2015
| ----- unexpected token
21-
|
22-
help: add `;` here
23-
|
24-
LL | let foo = 3;
25-
| +
2616

2717
error: expected `;`, found keyword `enum`
2818
--> $DIR/recover-missing-semi-before-item.rs:18:16
2919
|
3020
LL | let foo = 3
31-
| ^
21+
| ^ help: add `;` here
3222
LL | enum Foo {
3323
| ---- unexpected token
34-
|
35-
help: add `;` here
36-
|
37-
LL | let foo = 3;
38-
| +
3924

4025
error: expected `;`, found keyword `fn`
4126
--> $DIR/recover-missing-semi-before-item.rs:25:16
4227
|
4328
LL | let foo = 3
44-
| ^
29+
| ^ help: add `;` here
4530
LL | fn foo() {}
4631
| -- unexpected token
47-
|
48-
help: add `;` here
49-
|
50-
LL | let foo = 3;
51-
| +
5232

5333
error: expected `;`, found keyword `extern`
5434
--> $DIR/recover-missing-semi-before-item.rs:30:16
5535
|
5636
LL | let foo = 3
57-
| ^
37+
| ^ help: add `;` here
5838
LL | extern fn foo() {}
5939
| ------ unexpected token
60-
|
61-
help: add `;` here
62-
|
63-
LL | let foo = 3;
64-
| +
6540

6641
error: expected `;`, found keyword `impl`
6742
--> $DIR/recover-missing-semi-before-item.rs:36:16
6843
|
6944
LL | let foo = 3
70-
| ^
45+
| ^ help: add `;` here
7146
LL | impl Foo {}
7247
| ---- unexpected token
73-
|
74-
help: add `;` here
75-
|
76-
LL | let foo = 3;
77-
| +
7848

7949
error: expected `;`, found keyword `pub`
8050
--> $DIR/recover-missing-semi-before-item.rs:41:16
8151
|
8252
LL | let foo = 3
83-
| ^
53+
| ^ help: add `;` here
8454
LL | pub use bar::Bar;
8555
| --- unexpected token
86-
|
87-
help: add `;` here
88-
|
89-
LL | let foo = 3;
90-
| +
9156

9257
error: expected `;`, found keyword `mod`
9358
--> $DIR/recover-missing-semi-before-item.rs:46:16
9459
|
9560
LL | let foo = 3
96-
| ^
61+
| ^ help: add `;` here
9762
LL | mod foo {}
9863
| --- unexpected token
99-
|
100-
help: add `;` here
101-
|
102-
LL | let foo = 3;
103-
| +
10464

10565
error: expected `;`, found keyword `type`
10666
--> $DIR/recover-missing-semi-before-item.rs:51:16
10767
|
10868
LL | let foo = 3
109-
| ^
69+
| ^ help: add `;` here
11070
LL | type Foo = usize;
11171
| ---- unexpected token
112-
|
113-
help: add `;` here
114-
|
115-
LL | let foo = 3;
116-
| +
11772

11873
error: expected `;`, found keyword `fn`
11974
--> $DIR/recover-missing-semi-before-item.rs:59:19
12075
|
12176
LL | const X: i32 = 123
122-
| ^
77+
| ^ help: add `;` here
12378
LL |
12479
LL | fn main() {}
12580
| -- unexpected token
126-
|
127-
help: add `;` here
128-
|
129-
LL | const X: i32 = 123;
130-
| +
13181

13282
error: aborting due to 10 previous errors
13383

‎tests/ui/parser/recover/recover-missing-semi.stderr

+2-12
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,19 @@ error: expected `;`, found keyword `let`
22
--> $DIR/recover-missing-semi.rs:2:22
33
|
44
LL | let _: usize = ()
5-
| ^
5+
| ^ help: add `;` here
66
...
77
LL | let _ = 3;
88
| --- unexpected token
9-
|
10-
help: add `;` here
11-
|
12-
LL | let _: usize = ();
13-
| +
149

1510
error: expected `;`, found keyword `return`
1611
--> $DIR/recover-missing-semi.rs:9:22
1712
|
1813
LL | let _: usize = ()
19-
| ^
14+
| ^ help: add `;` here
2015
...
2116
LL | return 3;
2217
| ------ unexpected token
23-
|
24-
help: add `;` here
25-
|
26-
LL | let _: usize = ();
27-
| +
2818

2919
error[E0308]: mismatched types
3020
--> $DIR/recover-missing-semi.rs:2:20

0 commit comments

Comments
 (0)