Skip to content

Commit daa5b81

Browse files
committed
Issue rust-lang#50974: Suboptimal error in case of duplicate , in struct constructor
1 parent 4f6d9bf commit daa5b81

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/libsyntax/parse/parser.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,9 @@ impl<'a> Parser<'a> {
767767
err.span_label(self.span, format!("expected identifier, found {}", token_descr));
768768
} else {
769769
err.span_label(self.span, "expected identifier");
770+
if self.token == token::Comma {
771+
err.span_suggestion(self.span, "try removing a comma", ",".into());
772+
}
770773
}
771774
err
772775
}
@@ -2527,8 +2530,11 @@ impl<'a> Parser<'a> {
25272530
Err(mut e) => {
25282531
e.span_label(struct_sp, "while parsing this struct");
25292532
e.emit();
2530-
self.recover_stmt();
2531-
break;
2533+
2534+
if self.token != token::Comma {
2535+
self.recover_stmt();
2536+
break;
2537+
}
25322538
}
25332539
}
25342540

0 commit comments

Comments
 (0)