Auto merge of #93741 - Mark-Simulacrum:global-job-id, r=cjgillot

[rust.git] / library / core / src / panicking.rs

diff --git a/library/core/src/panicking.rs b/library/core/src/panicking.rs
index 5078eea07a15c5499daff9c0fa50d9982407c83b..0798076411ac4bff1d157112732fea1ced9b0d07 100644 (file)
--- a/library/core/src/panicking.rs
+++ b/library/core/src/panicking.rs
@@ -50,12 +50,20 @@ pub const fn panic(expr: &'static str) -> ! {
 
 #[inline]
 #[track_caller]
-#[lang = "panic_str"] // needed for `non-fmt-panics` lint
+#[rustc_diagnostic_item = "panic_str"]
 #[rustc_const_unstable(feature = "core_panic", issue = "none")]
 pub const fn panic_str(expr: &str) -> ! {
     panic_display(&expr);
 }
 
+#[cfg(not(bootstrap))]
+#[inline]
+#[track_caller]
+#[rustc_diagnostic_item = "unreachable_display"] // needed for `non-fmt-panics` lint
+pub fn unreachable_display<T: fmt::Display>(x: &T) -> ! {
+    panic_fmt(format_args!("internal error: entered unreachable code: {}", *x));
+}
+
 #[inline]
 #[track_caller]
 #[lang = "panic_display"] // needed for const-evaluated panics