Skip to content

Commit b12a358

Browse files
borsbors
committed
Auto merge of #29761 - eefriedman:rename-nopanic, r=sanxiyn
Just `sed s/_nopanic//g`. Hopefully makes libsyntax a bit more readable.
2 parents 8225135 + 69210a9 commit b12a358

File tree

10 files changed

+87
-87
lines changed

10 files changed

+87
-87
lines changed

‎src/libsyntax/ext/asm.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
7979
cx.span_err(sp, "malformed inline assembly");
8080
return DummyResult::expr(sp);
8181
}
82-
let (s, style) = match expr_to_string(cx, panictry!(p.parse_expr_nopanic()),
82+
let (s, style) = match expr_to_string(cx, panictry!(p.parse_expr()),
8383
"inline assembly must be a string literal") {
8484
Some((s, st)) => (s, st),
8585
// let compilation continue
@@ -102,7 +102,7 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
102102
let span = p.last_span;
103103

104104
panictry!(p.expect(&token::OpenDelim(token::Paren)));
105-
let out = panictry!(p.parse_expr_nopanic());
105+
let out = panictry!(p.parse_expr());
106106
panictry!(p.expect(&token::CloseDelim(token::Paren)));
107107

108108
// Expands a read+write operand into two operands.
@@ -146,7 +146,7 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
146146
}
147147

148148
panictry!(p.expect(&token::OpenDelim(token::Paren)));
149-
let input = panictry!(p.parse_expr_nopanic());
149+
let input = panictry!(p.parse_expr());
150150
panictry!(p.expect(&token::CloseDelim(token::Paren)));
151151

152152
inputs.push((constraint, input));

‎src/libsyntax/ext/base.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ pub fn get_single_str_from_tts(cx: &mut ExtCtxt,
821821
cx.span_err(sp, &format!("{} takes 1 argument", name));
822822
return None
823823
}
824-
let ret = cx.expander().fold_expr(panictry!(p.parse_expr_nopanic()));
824+
let ret = cx.expander().fold_expr(panictry!(p.parse_expr()));
825825
if p.token != token::Eof {
826826
cx.span_err(sp, &format!("{} takes 1 argument", name));
827827
}
@@ -838,7 +838,7 @@ pub fn get_exprs_from_tts(cx: &mut ExtCtxt,
838838
let mut p = cx.new_parser_from_tts(tts);
839839
let mut es = Vec::new();
840840
while p.token != token::Eof {
841-
es.push(cx.expander().fold_expr(panictry!(p.parse_expr_nopanic())));
841+
es.push(cx.expander().fold_expr(panictry!(p.parse_expr())));
842842
if panictry!(p.eat(&token::Comma)){
843843
continue;
844844
}

‎src/libsyntax/ext/format.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ fn parse_args(ecx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
9494
ecx.span_err(sp, "requires at least a format string argument");
9595
return None;
9696
}
97-
let fmtstr = panictry!(p.parse_expr_nopanic());
97+
let fmtstr = panictry!(p.parse_expr());
9898
let mut named = false;
9999
while p.token != token::Eof {
100100
if !panictry!(p.eat(&token::Comma)) {
@@ -125,7 +125,7 @@ fn parse_args(ecx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
125125
let name: &str = &ident.name.as_str();
126126

127127
panictry!(p.expect(&token::Eq));
128-
let e = panictry!(p.parse_expr_nopanic());
128+
let e = panictry!(p.parse_expr());
129129
match names.get(name) {
130130
None => {}
131131
Some(prev) => {
@@ -139,7 +139,7 @@ fn parse_args(ecx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
139139
order.push(name.to_string());
140140
names.insert(name.to_string(), e);
141141
} else {
142-
args.push(panictry!(p.parse_expr_nopanic()));
142+
args.push(panictry!(p.parse_expr()));
143143
}
144144
}
145145
Some((fmtstr, args, order, names))

‎src/libsyntax/ext/quote.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ fn parse_arguments_to_quote(cx: &ExtCtxt, tts: &[TokenTree])
752752
let mut p = cx.new_parser_from_tts(tts);
753753
p.quote_depth += 1;
754754

755-
let cx_expr = panictry!(p.parse_expr_nopanic());
755+
let cx_expr = panictry!(p.parse_expr());
756756
if !panictry!(p.eat(&token::Comma)) {
757757
panic!(p.fatal("expected token `,`"));
758758
}

‎src/libsyntax/ext/source_util.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,13 @@ pub fn expand_include<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree
109109
}
110110
impl<'a> base::MacResult for ExpandResult<'a> {
111111
fn make_expr(mut self: Box<ExpandResult<'a>>) -> Option<P<ast::Expr>> {
112-
Some(panictry!(self.p.parse_expr_nopanic()))
112+
Some(panictry!(self.p.parse_expr()))
113113
}
114114
fn make_items(mut self: Box<ExpandResult<'a>>)
115115
-> Option<SmallVector<P<ast::Item>>> {
116116
let mut ret = SmallVector::zero();
117117
while self.p.token != token::Eof {
118-
match panictry!(self.p.parse_item_nopanic()) {
118+
match panictry!(self.p.parse_item()) {
119119
Some(item) => ret.push(item),
120120
None => panic!(self.p.span_fatal(
121121
self.p.span,

‎src/libsyntax/ext/tt/macro_parser.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -501,18 +501,18 @@ pub fn parse_nt(p: &mut Parser, sp: Span, name: &str) -> Nonterminal {
501501
// check at the beginning and the parser checks after each bump
502502
panictry!(p.check_unknown_macro_variable());
503503
match name {
504-
"item" => match panictry!(p.parse_item_nopanic()) {
504+
"item" => match panictry!(p.parse_item()) {
505505
Some(i) => token::NtItem(i),
506506
None => panic!(p.fatal("expected an item keyword"))
507507
},
508508
"block" => token::NtBlock(panictry!(p.parse_block())),
509-
"stmt" => match panictry!(p.parse_stmt_nopanic()) {
509+
"stmt" => match panictry!(p.parse_stmt()) {
510510
Some(s) => token::NtStmt(s),
511511
None => panic!(p.fatal("expected a statement"))
512512
},
513-
"pat" => token::NtPat(panictry!(p.parse_pat_nopanic())),
514-
"expr" => token::NtExpr(panictry!(p.parse_expr_nopanic())),
515-
"ty" => token::NtTy(panictry!(p.parse_ty_nopanic())),
513+
"pat" => token::NtPat(panictry!(p.parse_pat())),
514+
"expr" => token::NtExpr(panictry!(p.parse_expr())),
515+
"ty" => token::NtTy(panictry!(p.parse_ty())),
516516
// this could be handled like a token, since it is one
517517
"ident" => match p.token {
518518
token::Ident(sn,b) => { panictry!(p.bump()); token::NtIdent(Box::new(sn),b) }

‎src/libsyntax/ext/tt/macro_rules.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,18 @@ impl<'a> ParserAnyMacro<'a> {
6767

6868
impl<'a> MacResult for ParserAnyMacro<'a> {
6969
fn make_expr(self: Box<ParserAnyMacro<'a>>) -> Option<P<ast::Expr>> {
70-
let ret = panictry!(self.parser.borrow_mut().parse_expr_nopanic());
70+
let ret = panictry!(self.parser.borrow_mut().parse_expr());
7171
self.ensure_complete_parse(true);
7272
Some(ret)
7373
}
7474
fn make_pat(self: Box<ParserAnyMacro<'a>>) -> Option<P<ast::Pat>> {
75-
let ret = panictry!(self.parser.borrow_mut().parse_pat_nopanic());
75+
let ret = panictry!(self.parser.borrow_mut().parse_pat());
7676
self.ensure_complete_parse(false);
7777
Some(ret)
7878
}
7979
fn make_items(self: Box<ParserAnyMacro<'a>>) -> Option<SmallVector<P<ast::Item>>> {
8080
let mut ret = SmallVector::zero();
81-
while let Some(item) = panictry!(self.parser.borrow_mut().parse_item_nopanic()) {
81+
while let Some(item) = panictry!(self.parser.borrow_mut().parse_item()) {
8282
ret.push(item);
8383
}
8484
self.ensure_complete_parse(false);
@@ -106,7 +106,7 @@ impl<'a> MacResult for ParserAnyMacro<'a> {
106106
let mut parser = self.parser.borrow_mut();
107107
match parser.token {
108108
token::Eof => break,
109-
_ => match parser.parse_stmt_nopanic() {
109+
_ => match parser.parse_stmt() {
110110
Ok(maybe_stmt) => match maybe_stmt {
111111
Some(stmt) => ret.push(stmt),
112112
None => (),
@@ -120,7 +120,7 @@ impl<'a> MacResult for ParserAnyMacro<'a> {
120120
}
121121

122122
fn make_ty(self: Box<ParserAnyMacro<'a>>) -> Option<P<ast::Ty>> {
123-
let ret = panictry!(self.parser.borrow_mut().parse_ty_nopanic());
123+
let ret = panictry!(self.parser.borrow_mut().parse_ty());
124124
self.ensure_complete_parse(true);
125125
Some(ret)
126126
}

‎src/libsyntax/parse/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ pub fn parse_expr_from_source_str(name: String,
116116
sess: &ParseSess)
117117
-> P<ast::Expr> {
118118
let mut p = new_parser_from_source_str(sess, cfg, name, source);
119-
maybe_aborted(panictry!(p.parse_expr_nopanic()), p)
119+
maybe_aborted(panictry!(p.parse_expr()), p)
120120
}
121121

122122
pub fn parse_item_from_source_str(name: String,
@@ -125,7 +125,7 @@ pub fn parse_item_from_source_str(name: String,
125125
sess: &ParseSess)
126126
-> Option<P<ast::Item>> {
127127
let mut p = new_parser_from_source_str(sess, cfg, name, source);
128-
maybe_aborted(panictry!(p.parse_item_nopanic()), p)
128+
maybe_aborted(panictry!(p.parse_item()), p)
129129
}
130130

131131
pub fn parse_meta_from_source_str(name: String,
@@ -148,7 +148,7 @@ pub fn parse_stmt_from_source_str(name: String,
148148
name,
149149
source
150150
);
151-
maybe_aborted(panictry!(p.parse_stmt_nopanic()), p)
151+
maybe_aborted(panictry!(p.parse_stmt()), p)
152152
}
153153

154154
// Warning: This parses with quote_depth > 0, which is not the default.
@@ -882,7 +882,7 @@ mod tests {
882882
#[test] fn parse_ident_pat () {
883883
let sess = ParseSess::new();
884884
let mut parser = string_to_parser(&sess, "b".to_string());
885-
assert!(panictry!(parser.parse_pat_nopanic())
885+
assert!(panictry!(parser.parse_pat())
886886
== P(ast::Pat{
887887
id: ast::DUMMY_NODE_ID,
888888
node: ast::PatIdent(ast::BindByValue(ast::MutImmutable),

0 commit comments

Comments
 (0)