Skip to content

Commit 881b8cb

Browse files
committed
rustc_errors: take self by value in DiagnosticBuilder::cancel.
1 parent 88483bd commit 881b8cb

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

clippy_lints/src/doc.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -628,9 +628,7 @@ fn check_code(cx: &LateContext<'_>, text: &str, edition: Edition, span: Span) {
628628
let mut parser = match maybe_new_parser_from_source_str(&sess, filename, code) {
629629
Ok(p) => p,
630630
Err(errs) => {
631-
for mut err in errs {
632-
err.cancel();
633-
}
631+
drop(errs);
634632
return false;
635633
},
636634
};
@@ -668,7 +666,7 @@ fn check_code(cx: &LateContext<'_>, text: &str, edition: Edition, span: Span) {
668666
_ => {},
669667
},
670668
Ok(None) => break,
671-
Err(mut e) => {
669+
Err(e) => {
672670
e.cancel();
673671
return false;
674672
},

clippy_lints/src/write.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ impl Write {
534534
match parser
535535
.parse_expr()
536536
.map(rustc_ast::ptr::P::into_inner)
537-
.map_err(|mut e| e.cancel())
537+
.map_err(|e| e.cancel())
538538
{
539539
// write!(e, ...)
540540
Ok(p) if parser.eat(&token::Comma) => Some(p),
@@ -563,7 +563,7 @@ impl Write {
563563
}
564564

565565
let comma_span = parser.prev_token.span;
566-
let token_expr = if let Ok(expr) = parser.parse_expr().map_err(|mut err| err.cancel()) {
566+
let token_expr = if let Ok(expr) = parser.parse_expr().map_err(|err| err.cancel()) {
567567
expr
568568
} else {
569569
return (Some(fmtstr), None);

0 commit comments

Comments
 (0)