rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto merge of #29285 - eefriedman:libsyntax-panic, r=nrc

Browse Source 
A set of commits which pushes some panics out of core parser methods, and into users of those parser methods.
This commit is contained in:
bors
2015-11-03 03:06:03 +00:00
parent 749625ad6d e7d3ae606e
commit b7fbfb658e
21 changed files with 174 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsyntax/ext/base.rs
View File

@@ -809,7 +809,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(p.parse_expr());
let ret = cx.expander().fold_expr(panictry!(p.parse_expr_nopanic()));
if p.token != token::Eof {
cx.span_err(sp, &format!("{} takes 1 argument", name));
}
@@ -826,7 +826,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(p.parse_expr()));
es.push(cx.expander().fold_expr(panictry!(p.parse_expr_nopanic())));
if panictry!(p.eat(&token::Comma)){
continue;
}