diff options
| author | bors <bors@rust-lang.org> | 2023-11-01 12:18:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-01 12:18:36 +0000 |
| commit | 11cd1f00268061dff447bc0df3d679b35d460875 (patch) | |
| tree | 11646a3a20b2cc806709e1294a0648f9b0a34372 /compiler/rustc_errors/src | |
| parent | d1611e39c43e26333ba989cedbd63117be798741 (diff) | |
| parent | 515fdbf687e7191b70a5541fe4b43a2351e4f15b (diff) | |
| download | rust-11cd1f00268061dff447bc0df3d679b35d460875.tar.gz rust-11cd1f00268061dff447bc0df3d679b35d460875.zip | |
Auto merge of #117482 - matthiaskrgr:rollup-doc6jgm, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #115626 (Clean up unchecked_math, separate out unchecked_shifts) - #117397 (Don't emit delayed good-path bugs on panic) - #117401 (Refactor: move suggestion functions from demand to suggestions) - #117475 (Inline and remove `create_session`.) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index 5e3fdf170bc..dd462cc6486 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -556,7 +556,7 @@ impl Drop for HandlerInner { // instead of "require some error happened". Sadly that isn't ideal, as // lints can be `#[allow]`'d, potentially leading to this triggering. // Also, "good path" should be replaced with a better naming. - if !self.has_any_message() && !self.suppressed_expected_diag { + if !self.has_any_message() && !self.suppressed_expected_diag && !std::thread::panicking() { let bugs = std::mem::replace(&mut self.delayed_good_path_bugs, Vec::new()); self.flush_delayed( bugs, |