From 71393422495b8d3c7a6e4ded3e64adaec45dca6d Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Wed, 3 Jun 2020 15:15:53 -0400 Subject: Bump to 1.46 --- src/libstd/sys/cloudabi/mod.rs | 5 +---- src/libstd/sys/windows/mod.rs | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src/libstd/sys') diff --git a/src/libstd/sys/cloudabi/mod.rs b/src/libstd/sys/cloudabi/mod.rs index dde2b21c9bc..8dbc31472d6 100644 --- a/src/libstd/sys/cloudabi/mod.rs +++ b/src/libstd/sys/cloudabi/mod.rs @@ -52,10 +52,7 @@ pub fn decode_error_kind(errno: i32) -> ErrorKind { } pub fn abort_internal() -> ! { - #[cfg_attr(not(bootstrap), allow(unused_unsafe))] // remove `unsafe` on bootstrap bump - unsafe { - core::intrinsics::abort(); - } + core::intrinsics::abort(); } pub use libc::strlen; diff --git a/src/libstd/sys/windows/mod.rs b/src/libstd/sys/windows/mod.rs index 4098c6b3ee9..69877e68ba8 100644 --- a/src/libstd/sys/windows/mod.rs +++ b/src/libstd/sys/windows/mod.rs @@ -314,8 +314,5 @@ pub fn abort_internal() -> ! { llvm_asm!("int $$0x29" :: "{ecx}"(7) ::: volatile); // 7 is FAST_FAIL_FATAL_APP_EXIT crate::intrinsics::unreachable(); } - #[cfg_attr(not(bootstrap), allow(unused_unsafe))] // remove `unsafe` on bootstrap bump - unsafe { - crate::intrinsics::abort(); - } + crate::intrinsics::abort(); } -- cgit 1.4.1-3-g733a5