From 99ecf4e2c94a72a68294111ecdf6a82c150c378a Mon Sep 17 00:00:00 2001 From: Kevin Butler Date: Tue, 27 Oct 2015 13:41:55 +0000 Subject: libsyntax: improve error message when a statement is prefixed with a match keyword --- src/libsyntax/parse/parser.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 6cee7b86a61..d1fc8ac2002 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2941,9 +2941,15 @@ impl<'a> Parser<'a> { } fn parse_match_expr(&mut self) -> PResult> { + 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 = Vec::new(); while self.token != token::CloseDelim(token::Brace) { arms.push(try!(self.parse_arm_nopanic())); -- cgit 1.4.1-3-g733a5