about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-01-11 20:01:01 +0000
committerbors <bors@rust-lang.org>2024-01-11 20:01:01 +0000
commit6baa129fbcea6a28cb2f777582217915372bc767 (patch)
tree84f454a8bed544a22f1cdb21977b1719b5a12de8
parentaa220c7ee7a51ab39bccd03ee90fa1c9365a589a (diff)
parentfb83ef649587413c4e3a8ec9e364b828ec250a56 (diff)
downloadrust-6baa129fbcea6a28cb2f777582217915372bc767.tar.gz
rust-6baa129fbcea6a28cb2f777582217915372bc767.zip
Auto merge of #119864 - matthiaskrgr:rollup-mc2qz13, r=matthiaskrgr
Rollup of 8 pull requests

Successful merges:

 - #119448 (annotate-snippets: update to 0.10)
 - #119813 (Silence some follow-up errors [2/x])
 - #119836 (chore: remove unnecessary blank line)
 - #119841 (Remove `DiagnosticBuilder::buffer`)
 - #119842 (coverage: Add enums to accommodate other kinds of coverage mappings)
 - #119845 (rint: further doc tweaks)
 - #119852 (give const-err4 a more descriptive name)
 - #119853 (rustfmt.toml: don't ignore just any tests path, only root one)

r? `@ghost`
`@rustbot` modify labels: rollup
-rw-r--r--clippy_lints/src/doc/needless_doctest_main.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/clippy_lints/src/doc/needless_doctest_main.rs b/clippy_lints/src/doc/needless_doctest_main.rs
index a744b69ecb4..8b018220c17 100644
--- a/clippy_lints/src/doc/needless_doctest_main.rs
+++ b/clippy_lints/src/doc/needless_doctest_main.rs
@@ -53,7 +53,7 @@ pub fn check(
                 let mut parser = match maybe_new_parser_from_source_str(&sess, filename, code) {
                     Ok(p) => p,
                     Err(errs) => {
-                        drop(errs);
+                        errs.into_iter().for_each(|err| err.cancel());
                         return (false, test_attr_spans);
                     },
                 };