diff options
| author | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2016-05-25 20:05:47 +0000 |
|---|---|---|
| committer | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2016-05-26 01:20:55 +0000 |
| commit | 5b82c5f369fa9b7ab8ace58b3112e44ff5a1d388 (patch) | |
| tree | e44b9cf236cf47f41b1ba66f0d83471a92a3e18d /src/libsyntax/parse | |
| parent | 2c937204e9172121da5439f08c2b631de1e135e2 (diff) | |
| download | rust-5b82c5f369fa9b7ab8ace58b3112e44ff5a1d388.tar.gz rust-5b82c5f369fa9b7ab8ace58b3112e44ff5a1d388.zip | |
Fix ICE on failure to parse token tree
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 3a28632f07a..9f4a773973e 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2702,7 +2702,10 @@ impl<'a> Parser<'a> { return Ok(TokenTree::Token(sp, SpecialVarNt(SpecialMacroVar::CrateMacroVar))); } else { sp = mk_sp(sp.lo, self.span.hi); - self.parse_ident()? + self.parse_ident().unwrap_or_else(|mut e| { + e.emit(); + keywords::Invalid.ident() + }) } } token::SubstNt(name) => { @@ -2845,7 +2848,7 @@ impl<'a> Parser<'a> { // and an error emitted then. Thus we don't pop from // self.open_braces here. }, - _ => unreachable!(), + _ => {} } Ok(TokenTree::Delimited(span, Rc::new(Delimited { |