bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Continue evaluating after finding incorrect .. in pattern

Browse source
This commit is contained in:
Esteban Küber 2019-01-11 21:33:57 -08:00
parent 975f8b5e32
commit 8119017746
5 changed files with 42 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libsyntax/parse/parser.rs
View file

@ -3814,8 +3814,12 @@ impl<'a> Parser<'a> {
ddpos = Some(fields.len());
} else {
// Emit a friendly error, ignore `..` and continue parsing
self.span_err(self.prev_span,
"`..` can only be used once per tuple or tuple struct pattern");
self.struct_span_err(
self.prev_span,
"`..` can only be used once per tuple or tuple struct pattern",
)
.span_label(self.prev_span, "can only be used once per pattern")
.emit();
}
} else if !self.check(&token::CloseDelim(token::Paren)) {
fields.push(self.parse_pat(None)?);
@ -3831,7 +3835,10 @@ impl<'a> Parser<'a> {
if ddpos == Some(fields.len()) && trailing_comma {
// `..` needs to be followed by `)` or `, pat`, `..,)` is disallowed.
self.span_err(self.prev_span, "trailing comma is not permitted after `..`");
let msg = "trailing comma is not permitted after `..`";
self.struct_span_err(self.prev_span, msg)
.span_label(self.prev_span, msg)
.emit();
}
Ok((fields, ddpos, trailing_comma))