From 998914f5da91bd6e07a0bdf45612dcd446e6fa94 Mon Sep 17 00:00:00 2001 From: Kevin Butler Date: Sun, 25 Oct 2015 01:02:08 +0100 Subject: libsyntax: remove panics from Parser::parse_pat_nopanic --- src/libsyntax/parse/parser.rs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/libsyntax/parse/parser.rs') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 092013a4753..7bc9441fb9d 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3276,12 +3276,9 @@ impl<'a> Parser<'a> { } token::OpenDelim(token::Brace) => { if qself.is_some() { - let span = self.span; - self.span_err(span, - "unexpected `{` after qualified path"); - self.abort_if_errors(); + return Err(self.fatal("unexpected `{` after qualified path")); } - // Parse struct pattern + // Parse struct pattern try!(self.bump()); let (fields, etc) = try!(self.parse_pat_fields()); try!(self.bump()); @@ -3289,10 +3286,7 @@ impl<'a> Parser<'a> { } token::OpenDelim(token::Paren) => { if qself.is_some() { - let span = self.span; - self.span_err(span, - "unexpected `(` after qualified path"); - self.abort_if_errors(); + return Err(self.fatal("unexpected `(` after qualified path")); } // Parse tuple struct or enum pattern if self.look_ahead(1, |t| *t == token::DotDot) { -- cgit 1.4.1-3-g733a5