From 9734406a5f95393e8e888cf67b48861ea8a39de7 Mon Sep 17 00:00:00 2001 From: Aaron Turon Date: Fri, 29 Jan 2016 16:25:18 -0800 Subject: Assorted fixed after rebasing --- src/libsyntax/parse/parser.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 969d39056aa..6839f11cd70 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -654,12 +654,12 @@ impl<'a> Parser<'a> { } } - pub fn eat_contextual_keyword(&mut self, ident: Ident) -> PResult { + pub fn eat_contextual_keyword(&mut self, ident: Ident) -> bool { if self.check_contextual_keyword(ident) { - try!(self.bump()); - Ok(true) + self.bump(); + true } else { - Ok(false) + false } } @@ -5229,8 +5229,8 @@ impl<'a> Parser<'a> { } /// Parse defaultness: DEFAULT or nothing - fn parse_defaultness(&mut self) -> PResult { - if try!(self.eat_contextual_keyword(special_idents::DEFAULT)) { + fn parse_defaultness(&mut self) -> PResult<'a, Defaultness> { + if self.eat_contextual_keyword(special_idents::DEFAULT) { Ok(Defaultness::Default) } else { Ok(Defaultness::Final) -- cgit 1.4.1-3-g733a5