diff options
| author | bors <bors@rust-lang.org> | 2021-02-04 23:16:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-04 23:16:08 +0000 |
| commit | dab3a80f235ed86d64d002e58b35adc3664e21a4 (patch) | |
| tree | 61ffa795a2e1c4bdfd66d9439de3139b653b40d5 /compiler/rustc_errors/src | |
| parent | 4f4656d46d84a488ae3df34b08f362d7071036a0 (diff) | |
| parent | 6f014cd4db1182adf80f540a269a4f0917c063d3 (diff) | |
| download | rust-dab3a80f235ed86d64d002e58b35adc3664e21a4.tar.gz rust-dab3a80f235ed86d64d002e58b35adc3664e21a4.zip | |
Auto merge of #81761 - m-ou-se:rollup-xp7v07n, r=m-ou-se
Rollup of 9 pull requests Successful merges: - #74304 (Stabilize the Wake trait) - #79805 (Rename Iterator::fold_first to reduce and stabilize it) - #81556 (introduce future-compatibility warning for forbidden lint groups) - #81645 (Add lint for `panic!(123)` which is not accepted in Rust 2021.) - #81710 (OsStr eq_ignore_ascii_case takes arg by value) - #81711 (add #[inline] to all the public IpAddr functions) - #81725 (Move test to be with the others) - #81727 (Revert stabilizing integer::BITS.) - #81745 (Stabilize poison API of Once, rename poisoned()) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index e184e929b07..aa882332099 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -901,7 +901,7 @@ impl HandlerInner { fn span_bug(&mut self, sp: impl Into<MultiSpan>, msg: &str) -> ! { self.emit_diag_at_span(Diagnostic::new(Bug, msg), sp); - panic!(ExplicitBug); + panic::panic_any(ExplicitBug); } fn emit_diag_at_span(&mut self, mut diag: Diagnostic, sp: impl Into<MultiSpan>) { @@ -955,7 +955,7 @@ impl HandlerInner { fn bug(&mut self, msg: &str) -> ! { self.emit_diagnostic(&Diagnostic::new(Bug, msg)); - panic!(ExplicitBug); + panic::panic_any(ExplicitBug); } fn delay_as_bug(&mut self, diagnostic: Diagnostic) { |