Explicitly use std panic over core panic

Author: Voultapher

library/std/src/prelude/mod.rs

@@ -145,6 +145,11 @@ pub mod rust_2021 {
     #[stable(feature = "prelude_2021", since = "1.55.0")]
     #[doc(no_inline)]
     pub use core::prelude::rust_2021::*;
+
+    // There are two different panic macros, one in `core` and one in `std`. They are slightly
+    // different. For `std` we explicitly want the one defined in `std`.
+    #[stable(feature = "prelude_2021", since = "1.55.0")]
+    pub use super::v1::panic;
 }
 
 /// The 2024 version of the prelude of The Rust Standard Library.
@@ -159,6 +164,11 @@ pub mod rust_2024 {
     #[stable(feature = "prelude_2024", since = "1.85.0")]
     #[doc(no_inline)]
     pub use core::prelude::rust_2024::*;
+
+    // There are two different panic macros, one in `core` and one in `std`. They are slightly
+    // different. For `std` we explicitly want the one defined in `std`.
+    #[stable(feature = "prelude_2024", since = "1.85.0")]
+    pub use super::v1::panic;
 }
 
 /// The Future version of the prelude of The Rust Standard Library.
@@ -174,4 +184,9 @@ pub mod rust_future {
     #[unstable(feature = "prelude_next", issue = "none")]
     #[doc(no_inline)]
     pub use core::prelude::rust_future::*;
+
+    // There are two different panic macros, one in `core` and one in `std`. They are slightly
+    // different. For `std` we explicitly want the one defined in `std`.
+    #[unstable(feature = "prelude_next", issue = "none")]
+    pub use super::v1::panic;
 }

library/std/src/prelude/v1.rs

@@ -48,26 +48,28 @@ pub use crate::result::Result::{self, Err, Ok};
 #[doc(no_inline)]
 pub use core::prelude::v1::{
     assert, assert_eq, assert_ne, cfg, column, compile_error, concat, debug_assert, debug_assert_eq, debug_assert_ne, env, file, format_args, include, include_bytes, include_str, line, matches,
-    module_path, option_env, panic, stringify, todo, r#try, unimplemented, unreachable, write,
+    module_path, option_env, stringify, todo, r#try, unimplemented, unreachable, write,
     writeln, Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd,
 };
 
 #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
 #[doc(no_inline)]
 pub use crate::{
-    dbg, eprint, eprintln, format, is_x86_feature_detected, print, println, thread_local,
+    dbg, eprint, eprintln, format, is_x86_feature_detected, print, println, thread_local
 };
 
 // These macros needs special handling, so that we don't export it *and* the modules of the same
 // name. We only want the macro in the prelude.
 mod ambiguous_macro_only_std {
     #[allow(hidden_glob_reexports)]
     mod vec {}
+    #[allow(hidden_glob_reexports)]
+    mod panic {}
     #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
     pub use crate::*;
 }
 #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
-pub use self::ambiguous_macro_only_std::vec;
+pub use self::ambiguous_macro_only_std::{vec, panic};
 
 #[unstable(feature = "cfg_match", issue = "115585")]
 #[doc(no_inline)]