Skip to content

Commit 998df0d

Browse files
Remove Handler::cancel
1 parent 2a3930d commit 998df0d

File tree

7 files changed

+7
-17
lines changed

7 files changed

+7
-17
lines changed

src/librustc/infer/error_reporting/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
11191119
Some((expected, found)) => Some((expected, found)),
11201120
None => {
11211121
// Derived error. Cancel the emitter.
1122-
self.tcx.sess.diagnostic().cancel(diag);
1122+
diag.cancel();
11231123
return;
11241124
}
11251125
};

src/librustc_errors/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,10 +520,6 @@ impl Handler {
520520
DiagnosticBuilder::new(self, Level::Fatal, msg)
521521
}
522522

523-
pub fn cancel(&self, err: &mut DiagnosticBuilder<'_>) {
524-
err.cancel();
525-
}
526-
527523
fn panic_if_treat_err_as_bug(&self) {
528524
if self.treat_err_as_bug() {
529525
let s = match (self.err_count(), self.flags.treat_err_as_bug.unwrap_or(0)) {

src/libsyntax/parse/attr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,14 +309,14 @@ impl<'a> Parser<'a> {
309309
Ok(lit) => {
310310
return Ok(ast::NestedMetaItem::Literal(lit))
311311
}
312-
Err(ref mut err) => self.diagnostic().cancel(err)
312+
Err(ref mut err) => err.cancel(),
313313
}
314314

315315
match self.parse_meta_item() {
316316
Ok(mi) => {
317317
return Ok(ast::NestedMetaItem::MetaItem(mi))
318318
}
319-
Err(ref mut err) => self.diagnostic().cancel(err)
319+
Err(ref mut err) => err.cancel(),
320320
}
321321

322322
let found = self.this_token_to_string();

src/libsyntax/parse/diagnostics.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,6 @@ impl<'a> Parser<'a> {
197197
self.sess.span_diagnostic.span_bug(sp, m)
198198
}
199199

200-
crate fn cancel(&self, err: &mut DiagnosticBuilder<'_>) {
201-
self.sess.span_diagnostic.cancel(err)
202-
}
203-
204200
crate fn diagnostic(&self) -> &'a errors::Handler {
205201
&self.sess.span_diagnostic
206202
}
@@ -426,15 +422,13 @@ impl<'a> Parser<'a> {
426422
/// Eats and discards tokens until one of `kets` is encountered. Respects token trees,
427423
/// passes through any errors encountered. Used for error recovery.
428424
crate fn eat_to_tokens(&mut self, kets: &[&TokenKind]) {
429-
let handler = self.diagnostic();
430-
431425
if let Err(ref mut err) = self.parse_seq_to_before_tokens(
432426
kets,
433427
SeqSep::none(),
434428
TokenExpectType::Expect,
435429
|p| Ok(p.parse_token_tree()),
436430
) {
437-
handler.cancel(err);
431+
err.cancel();
438432
}
439433
}
440434

src/libsyntax/parse/parser/expr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ impl<'a> Parser<'a> {
770770
ex = ExprKind::Lit(literal);
771771
}
772772
Err(mut err) => {
773-
self.cancel(&mut err);
773+
err.cancel();
774774
return Err(self.expected_expression_found());
775775
}
776776
}

src/libsyntax/parse/parser/pat.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ impl<'a> Parser<'a> {
537537
mut err: DiagnosticBuilder<'a>,
538538
expected: Expected,
539539
) -> PResult<'a, P<Pat>> {
540-
self.cancel(&mut err);
540+
err.cancel();
541541

542542
let expected = expected.unwrap_or("pattern");
543543
let msg = format!("expected {}, found {}", expected, self.this_token_descr());

src/libsyntax/parse/parser/stmt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ impl<'a> Parser<'a> {
361361
}
362362
Err(mut e) => {
363363
self.recover_stmt_(SemiColonMode::Break, BlockMode::Ignore);
364-
self.cancel(&mut e);
364+
e.cancel();
365365
}
366366
_ => ()
367367
}

0 commit comments

Comments
 (0)