From ff8df0bbe38d8b1216661c6544de4187e41eb45b Mon Sep 17 00:00:00 2001
From: Mara Bos <m-ou.se@m-ou.se>
Date: Mon, 19 Oct 2020 10:57:44 +0200
Subject: [PATCH] Add cfg(not(test)) to std_panic_macro rustc_diagnostic_item.

---
 library/std/src/macros.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/std/src/macros.rs b/library/std/src/macros.rs
index f34eea1f8ac..de072e83dfc 100644
--- a/library/std/src/macros.rs
+++ b/library/std/src/macros.rs
@@ -8,7 +8,7 @@
 #[macro_export]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[allow_internal_unstable(libstd_sys_internals)]
-#[cfg_attr(not(bootstrap), rustc_diagnostic_item = "std_panic_macro")]
+#[cfg_attr(not(any(bootstrap, test)), rustc_diagnostic_item = "std_panic_macro")]
 macro_rules! panic {
     () => ({ $crate::panic!("explicit panic") });
     ($msg:expr $(,)?) => ({ $crate::rt::begin_panic($msg) });