bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

libsyntax: improve error message when a statement is prefixed with a match keyword

Browse source
This commit is contained in:
Kevin Butler 2015-10-27 13:41:55 +00:00
parent 65623dba0d
commit 99ecf4e2c9
2 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2941,9 +2941,15 @@ impl<'a> Parser<'a> {
}
fn parse_match_expr(&mut self) -> PResult<P<Expr>> {
let match_span = self.last_span;
let lo = self.last_span.lo;
let discriminant = try!(self.parse_expr_res(Restrictions::RESTRICTION_NO_STRUCT_LITERAL));
try!(self.commit_expr_expecting(&*discriminant, token::OpenDelim(token::Brace)));
if let Err(e) = self.commit_expr_expecting(&*discriminant, token::OpenDelim(token::Brace)) {
if self.token == token::Token::Semi {
self.span_note(match_span, "did you mean to remove this `match` keyword?");
}
return Err(e)
}
let mut arms: Vec<Arm> = Vec::new();
while self.token != token::CloseDelim(token::Brace) {
arms.push(try!(self.parse_arm_nopanic()));