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

Fix another case

Browse Source
This commit is contained in:
Esteban Küber
2019-07-23 11:19:13 -07:00
parent 5b3b6b8d00
commit f56c8f6ea4
3 changed files with 72 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libsyntax/parse/parser.rs
View File

@@ -7670,8 +7670,9 @@ impl<'a> Parser<'a> {
let ret = f(self);
let last_token = if self.token_cursor.stack.len() == prev {
&mut self.token_cursor.frame.last_token
} else if self.token_cursor.stack.is_empty() {//&& !self.unclosed_delims.is_empty() {
// This can happen with mismatched delimiters (#62881)
} else if self.token_cursor.stack.get(prev).is_none() {
// This can happen due to a bad interaction of two unrelated recovery mechanisms with
// mismatched delimiters *and* recovery lookahead on `pub ident(` likely typo (#62881)
return Ok((ret?, TokenStream::new(vec![])));
} else {
&mut self.token_cursor.stack[prev].last_token
@@ -7680,7 +7681,15 @@ impl<'a> Parser<'a> {
// Pull out the tokens that we've collected from the call to `f` above.
let mut collected_tokens = match *last_token {
LastToken::Collecting(ref mut v) => mem::take(v),
LastToken::Was(_) => panic!("our vector went away?"),
LastToken::Was(ref was) => {
let msg = format!("our vector went away? - found Was({:?})", was);
debug!("collect_tokens: {}", msg);
self.sess.span_diagnostic.delay_span_bug(self.token.span, &msg);
// This can happen due to a bad interaction of two unrelated recovery mechanisms
// with mismatched delimiters *and* recovery lookahead on `pub ident(` likely typo
// (#62895, different but similar to the case above)
return Ok((ret?, TokenStream::new(vec![])));
}
};
// If we're not at EOF our current token wasn't actually consumed by