diff options
Diffstat (limited to 'src/libstd/panicking.rs')
| -rw-r--r-- | src/libstd/panicking.rs | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs index bf381896a22..6a120f930ab 100644 --- a/src/libstd/panicking.rs +++ b/src/libstd/panicking.rs @@ -332,10 +332,7 @@ pub fn panicking() -> bool { #[cfg_attr(feature = "panic_immediate_abort", inline)] pub fn begin_panic_fmt(msg: &fmt::Arguments<'_>) -> ! { if cfg!(feature = "panic_immediate_abort") { - #[cfg_attr(not(bootstrap), allow(unused_unsafe))] // remove `unsafe` on bootstrap bump - unsafe { - intrinsics::abort() - } + intrinsics::abort() } let info = PanicInfo::internal_constructor(Some(msg), Location::caller()); @@ -401,10 +398,7 @@ pub fn begin_panic_handler(info: &PanicInfo<'_>) -> ! { #[track_caller] pub fn begin_panic<M: Any + Send>(msg: M) -> ! { if cfg!(feature = "panic_immediate_abort") { - #[cfg_attr(not(bootstrap), allow(unused_unsafe))] // remove `unsafe` on bootstrap bump - unsafe { - intrinsics::abort() - } + intrinsics::abort() } rust_panic_with_hook(&mut PanicPayload::new(msg), None, Location::caller()); @@ -464,10 +458,7 @@ fn rust_panic_with_hook( "thread panicked while processing \ panic. aborting.\n" )); - #[cfg_attr(not(bootstrap), allow(unused_unsafe))] // remove `unsafe` on bootstrap bump - unsafe { - intrinsics::abort() - } + intrinsics::abort() } unsafe { @@ -502,10 +493,7 @@ fn rust_panic_with_hook( "thread panicked while panicking. \ aborting.\n" )); - #[cfg_attr(not(bootstrap), allow(unused_unsafe))] // remove `unsafe` on bootstrap bump - unsafe { - intrinsics::abort() - } + intrinsics::abort() } rust_panic(payload) |