diff options
| author | bors <bors@rust-lang.org> | 2015-11-13 10:28:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-11-13 10:28:25 +0000 |
| commit | b12a3582b113c0f9c217f6311ec0d47fd0f79016 (patch) | |
| tree | 8fc29c0a8f3bc0ccdd0b5d438c2ecc39068ad396 /src/libsyntax/ext/base.rs | |
| parent | 82251354ff30e9a6f9f98d8dbef9fe54df400285 (diff) | |
| parent | 69210a96358dcd85bf6d08f21c8e2df5b0975d3b (diff) | |
| download | rust-b12a3582b113c0f9c217f6311ec0d47fd0f79016.tar.gz rust-b12a3582b113c0f9c217f6311ec0d47fd0f79016.zip | |
Auto merge of #29761 - eefriedman:rename-nopanic, r=sanxiyn
Just `sed s/_nopanic//g`. Hopefully makes libsyntax a bit more readable.
Diffstat (limited to 'src/libsyntax/ext/base.rs')
| -rw-r--r-- | src/libsyntax/ext/base.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 3e854cd72ba..18db028b60b 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -821,7 +821,7 @@ pub fn get_single_str_from_tts(cx: &mut ExtCtxt, cx.span_err(sp, &format!("{} takes 1 argument", name)); return None } - let ret = cx.expander().fold_expr(panictry!(p.parse_expr_nopanic())); + let ret = cx.expander().fold_expr(panictry!(p.parse_expr())); if p.token != token::Eof { cx.span_err(sp, &format!("{} takes 1 argument", name)); } @@ -838,7 +838,7 @@ pub fn get_exprs_from_tts(cx: &mut ExtCtxt, let mut p = cx.new_parser_from_tts(tts); let mut es = Vec::new(); while p.token != token::Eof { - es.push(cx.expander().fold_expr(panictry!(p.parse_expr_nopanic()))); + es.push(cx.expander().fold_expr(panictry!(p.parse_expr()))); if panictry!(p.eat(&token::Comma)){ continue; } |