about summary refs log tree commit diff
path: root/compiler
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-02-08 07:13:27 +0100
committerGitHub <noreply@github.com>2023-02-08 07:13:27 +0100
commit31345cd70a6c037f1ac4df5a1e9bd0d6c288b1ab (patch)
treebb1021d287b7c44cba3670037306cdab70777a70 /compiler
parent86cc4141f78f094ff639c76fe3c8ab72f64def26 (diff)
parenta7597a15265df589b29ed3c61a3047994fc45d0a (diff)
downloadrust-31345cd70a6c037f1ac4df5a1e9bd0d6c288b1ab.tar.gz
rust-31345cd70a6c037f1ac4df5a1e9bd0d6c288b1ab.zip
Rollup merge of #107771 - estebank:ice-msg, r=compiler-errors
Tweak ICE message

Modify main message to be more conversational and emit one fewer note.
Diffstat (limited to 'compiler')
-rw-r--r--compiler/rustc_driver_impl/src/lib.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/rustc_driver_impl/src/lib.rs b/compiler/rustc_driver_impl/src/lib.rs
index 1da13afecfa..a392d70f100 100644
--- a/compiler/rustc_driver_impl/src/lib.rs
+++ b/compiler/rustc_driver_impl/src/lib.rs
@@ -1200,11 +1200,9 @@ pub fn report_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str) {
     if !info.payload().is::<rustc_errors::ExplicitBug>()
         && !info.payload().is::<rustc_errors::DelayedBugPanic>()
     {
-        let mut d = rustc_errors::Diagnostic::new(rustc_errors::Level::Bug, "unexpected panic");
-        handler.emit_diagnostic(&mut d);
+        handler.emit_err(session_diagnostics::Ice);
     }
 
-    handler.emit_note(session_diagnostics::Ice);
     handler.emit_note(session_diagnostics::IceBugReport { bug_report_url });
     handler.emit_note(session_diagnostics::IceVersion {
         version: util::version_str!().unwrap_or("unknown_version"),