bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #36502 - TimNN:correct-cancel, r=jseyfried

Browse source 
correctly cancel some errors

Fixes #36499.

I also (proactively) changed all other calls in `parser.rs` to use `Handler::cancel`.
This commit is contained in:
bors 2016-09-17 20:57:05 -07:00 • committed by GitHub
commit 0b03ba1f55
2 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libsyntax/parse/parser.rs
View file

@ -808,10 +808,12 @@ impl<'a> Parser<'a> {
/// Eat and discard tokens until one of `kets` is encountered. Respects token trees,
/// passes through any errors encountered. Used for error recovery.
pub fn eat_to_tokens(&mut self, kets: &[&token::Token]) {
let handler = self.diagnostic();
self.parse_seq_to_before_tokens(kets,
SeqSep::none(),
|p| p.parse_token_tree(),
|mut e| e.cancel());
|mut e| handler.cancel(&mut e));
}
/// Parse a sequence, including the closing delimiter. The function
@ -1040,6 +1042,10 @@ impl<'a> Parser<'a> {
self.sess.span_diagnostic.abort_if_errors();
}
fn cancel(&self, err: &mut DiagnosticBuilder) {
self.sess.span_diagnostic.cancel(err)
}
pub fn diagnostic(&self) -> &'a errors::Handler {
&self.sess.span_diagnostic
}
@ -2386,7 +2392,7 @@ impl<'a> Parser<'a> {
ex = ExprKind::Lit(P(lit));
}
Err(mut err) => {
err.cancel();
self.cancel(&mut err);
let msg = format!("expected expression, found {}",
self.this_token_descr());
return Err(self.fatal(&msg));
@ -3702,7 +3708,7 @@ impl<'a> Parser<'a> {
}
}
Err(mut err) => {
err.cancel();
self.cancel(&mut err);
let msg = format!("expected pattern, found {}", self.this_token_descr());
return Err(self.fatal(&msg));
}
@ -4076,7 +4082,7 @@ impl<'a> Parser<'a> {
}
Err(mut e) => {
self.recover_stmt_(SemiColonMode::Break);
e.cancel();
self.cancel(&mut e);
}
_ => ()
}
@ -4317,7 +4323,7 @@ impl<'a> Parser<'a> {
let span_hi = match self.parse_ty() {
Ok(..) => self.span.hi,
Err(ref mut err) => {
err.cancel();
self.cancel(err);
span_hi
}
};