From e7d3ae606ed496144554dae499b69207da3b09c5 Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Tue, 27 Oct 2015 22:20:01 -0700 Subject: Make quote plugin use parsing functions which explicitly panic. Rename parse_* to parse_*_panic, and add parse_attribute_panic. --- src/libsyntax/parse/parser.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/libsyntax/parse/parser.rs') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index d71ea4d105b..570934a5bff 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -360,30 +360,34 @@ impl<'a> Parser<'a> { // Panicing fns (for now!) // These functions are used by the quote_*!() syntax extensions, but shouldn't // be used otherwise. - pub fn parse_expr(&mut self) -> P { + pub fn parse_expr_panic(&mut self) -> P { panictry!(self.parse_expr_nopanic()) } - pub fn parse_item(&mut self) -> Option> { + pub fn parse_item_panic(&mut self) -> Option> { panictry!(self.parse_item_nopanic()) } - pub fn parse_pat(&mut self) -> P { + pub fn parse_pat_panic(&mut self) -> P { panictry!(self.parse_pat_nopanic()) } - pub fn parse_arm(&mut self) -> Arm { + pub fn parse_arm_panic(&mut self) -> Arm { panictry!(self.parse_arm_nopanic()) } - pub fn parse_ty(&mut self) -> P { + pub fn parse_ty_panic(&mut self) -> P { panictry!(self.parse_ty_nopanic()) } - pub fn parse_stmt(&mut self) -> Option> { + pub fn parse_stmt_panic(&mut self) -> Option> { panictry!(self.parse_stmt_nopanic()) } + pub fn parse_attribute_panic(&mut self, permit_inner: bool) -> ast::Attribute { + panictry!(self.parse_attribute(permit_inner)) + } + /// Convert a token to a string using self's reader pub fn token_to_string(token: &token::Token) -> String { pprust::token_to_string(token) -- cgit 1.4.1-3-g733a5