Skip to content

Commit c365ce3

Browse files
authored
Rollup merge of #101502 - TaKO8Ki:do-not-suggest-semicolon-for-macro-without-exclamation-mark, r=wesleywiser
Do not suggest a semicolon for a macro without `!` Fixes a regression in #101490
2 parents 9361297 + 7ac1248 commit c365ce3

8 files changed

+16
-2
lines changed

compiler/rustc_parse/src/parser/expr.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1977,6 +1977,9 @@ impl<'a> Parser<'a> {
19771977
open_delim_span: Span,
19781978
) -> PResult<'a, ()> {
19791979
if self.token.kind == token::Comma {
1980+
if !self.sess.source_map().is_multiline(prev_span.until(self.token.span)) {
1981+
return Ok(());
1982+
}
19801983
let mut snapshot = self.create_snapshot_for_diagnostic();
19811984
snapshot.bump();
19821985
match snapshot.parse_seq_to_before_end(

src/test/ui/parser/do-not-suggest-suggest-semicolon-before-array.stderr renamed to src/test/ui/parser/do-not-suggest-semicolon-before-array.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: expected one of `.`, `?`, `]`, or an operator, found `,`
2-
--> $DIR/do-not-suggest-suggest-semicolon-before-array.rs:5:5
2+
--> $DIR/do-not-suggest-semicolon-before-array.rs:5:5
33
|
44
LL | [1, 3)
55
| ^ ^ help: `]` may belong here
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
fn main() {
2+
let _x = vec[1, 2, 3]; //~ ERROR expected one of `.`, `?`, `]`, or an operator
3+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
error: expected one of `.`, `?`, `]`, or an operator, found `,`
2+
--> $DIR/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs:2:19
3+
|
4+
LL | let _x = vec[1, 2, 3];
5+
| ^ expected one of `.`, `?`, `]`, or an operator
6+
7+
error: aborting due to previous error
8+

src/test/ui/parser/suggest-suggest-semicolon-before-array.stderr renamed to src/test/ui/parser/suggest-semicolon-before-array.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: expected `;`, found `[`
2-
--> $DIR/suggest-suggest-semicolon-before-array.rs:8:5
2+
--> $DIR/suggest-semicolon-before-array.rs:8:5
33
|
44
LL | [1, 3]
55
| ^

0 commit comments

Comments
 (0)