Revert "`#![deny(unsafe_op_in_unsafe_fn)]` in sys/hermit"

This reverts commit 7cae9e8c88e468e94c157d9aaee4b8e3cf90b9a4.

diff --git a/library/std/src/sys/hermit/alloc.rs b/library/std/src/sys/hermit/alloc.rs
index 04446172197f76bb76d833e2eeea389cfea573b4..d153914e77e10235294109f575e627882e34c926 100644 (file)
--- a/library/std/src/sys/hermit/alloc.rs
+++ b/library/std/src/sys/hermit/alloc.rs
@@ -1,5 +1,3 @@
-#![deny(unsafe_op_in_unsafe_fn)]
-
 use crate::alloc::{GlobalAlloc, Layout, System};
 use crate::ptr;
 use crate::sys::hermit::abi;
@@ -8,33 +6,26 @@
 unsafe impl GlobalAlloc for System {
     #[inline]
     unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
-        // SAFETY: The safety contract for `malloc` must be upheld by the caller.
-        unsafe { abi::malloc(layout.size(), layout.align()) }
+        abi::malloc(layout.size(), layout.align())
     }
 
     unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
-        // SAFETY: The safety contract for `malloc` must be upheld by the caller.
-        // Also, `addr` must be valid for writes of `layout.size() * size_of::<u8>()` bytes.
-        unsafe {
-            let addr = abi::malloc(layout.size(), layout.align());
-
-            if !addr.is_null() {
-                ptr::write_bytes(addr, 0x00, layout.size());
-            }
+        let addr = abi::malloc(layout.size(), layout.align());
 
-            addr
+        if !addr.is_null() {
+            ptr::write_bytes(addr, 0x00, layout.size());
         }
+
+        addr
     }
 
     #[inline]
     unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
-        // SAFETY: The safety contract for `free` must be upheld by the caller.
-        unsafe { abi::free(ptr, layout.size(), layout.align()) }
+        abi::free(ptr, layout.size(), layout.align())
     }
 
     #[inline]
     unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
-        // SAFETY: The safety contract for `realloc` must be upheld by the caller.
-        unsafe { abi::realloc(ptr, layout.size(), layout.align(), new_size) }
+        abi::realloc(ptr, layout.size(), layout.align(), new_size)
     }
 }

diff --git a/library/std/src/sys/hermit/args.rs b/library/std/src/sys/hermit/args.rs
index dd8830599c37efbf7a669fc69aba0ffbdc5f7524..72c1b8511cac8cc25a8d196c8336572626742913 100644 (file)
--- a/library/std/src/sys/hermit/args.rs
+++ b/library/std/src/sys/hermit/args.rs
@@ -1,17 +1,15 @@
-#![deny(unsafe_op_in_unsafe_fn)]
-
 use crate::ffi::OsString;
 use crate::marker::PhantomData;
 use crate::vec;
 
 /// One-time global initialization.
 pub unsafe fn init(argc: isize, argv: *const *const u8) {
-    unsafe { imp::init(argc, argv) }
+    imp::init(argc, argv)
 }
 
 /// One-time global cleanup.
 pub unsafe fn cleanup() {
-    unsafe { imp::cleanup() }
+    imp::cleanup()
 }
 
 /// Returns the command line arguments
@@ -67,18 +65,14 @@ mod imp {
 
     pub unsafe fn init(argc: isize, argv: *const *const u8) {
         let _guard = LOCK.lock();
-        unsafe {
-            ARGC = argc;
-            ARGV = argv;
-        }
+        ARGC = argc;
+        ARGV = argv;
     }
 
     pub unsafe fn cleanup() {
         let _guard = LOCK.lock();
         ARGC = 0;
-        unsafe {
-            ARGV = ptr::null();
-        }
+        ARGV = ptr::null();
     }
 
     pub fn args() -> Args {

diff --git a/library/std/src/sys/hermit/condvar.rs b/library/std/src/sys/hermit/condvar.rs
index 662dc9394a36f228a24bee1313b3619a9ebe6afc..52c8c3b17e8262571775b4a41b1ab543fbd78b39 100644 (file)
--- a/library/std/src/sys/hermit/condvar.rs
+++ b/library/std/src/sys/hermit/condvar.rs
@@ -1,5 +1,3 @@
-#![deny(unsafe_op_in_unsafe_fn)]
-
 use crate::ffi::c_void;
 use crate::ptr;
 use crate::sync::atomic::{AtomicUsize, Ordering::SeqCst};
@@ -25,43 +23,33 @@ pub const fn new() -> Condvar {
     }
 
     pub unsafe fn init(&mut self) {
-        unsafe {
-            let _ = abi::sem_init(&mut self.sem1 as *mut *const c_void, 0);
-            let _ = abi::sem_init(&mut self.sem2 as *mut *const c_void, 0);
-        }
+        let _ = abi::sem_init(&mut self.sem1 as *mut *const c_void, 0);
+        let _ = abi::sem_init(&mut self.sem2 as *mut *const c_void, 0);
     }
 
     pub unsafe fn notify_one(&self) {
         if self.counter.load(SeqCst) > 0 {
             self.counter.fetch_sub(1, SeqCst);
-            unsafe {
-                abi::sem_post(self.sem1);
-                abi::sem_timedwait(self.sem2, 0);
-            }
+            abi::sem_post(self.sem1);
+            abi::sem_timedwait(self.sem2, 0);
         }
     }
 
     pub unsafe fn notify_all(&self) {
         let counter = self.counter.swap(0, SeqCst);
         for _ in 0..counter {
-            unsafe {
-                abi::sem_post(self.sem1);
-            }
+            abi::sem_post(self.sem1);
         }
         for _ in 0..counter {
-            unsafe {
-                abi::sem_timedwait(self.sem2, 0);
-            }
+            abi::sem_timedwait(self.sem2, 0);
         }
     }
 
     pub unsafe fn wait(&self, mutex: &Mutex) {
         self.counter.fetch_add(1, SeqCst);
         mutex.unlock();
-        unsafe {
-            abi::sem_timedwait(self.sem1, 0);
-            abi::sem_post(self.sem2);
-        }
+        abi::sem_timedwait(self.sem1, 0);
+        abi::sem_post(self.sem2);
         mutex.lock();
     }
 
@@ -70,9 +58,7 @@ pub unsafe fn wait_timeout(&self, _mutex: &Mutex, _dur: Duration) -> bool {
     }
 
     pub unsafe fn destroy(&self) {
-        unsafe {
-            let _ = abi::sem_destroy(self.sem1);
-            let _ = abi::sem_destroy(self.sem2);
-        }
+        let _ = abi::sem_destroy(self.sem1);
+        let _ = abi::sem_destroy(self.sem2);
     }
 }

diff --git a/library/std/src/sys/hermit/fd.rs b/library/std/src/sys/hermit/fd.rs
index 2914e5ad3dbe2f3c78089ecbe9b3a832d0ab5ea4..97d1a38b41ab17eec4637c2532de60797e81333b 100644 (file)
--- a/library/std/src/sys/hermit/fd.rs
+++ b/library/std/src/sys/hermit/fd.rs
@@ -1,4 +1,3 @@
-#![deny(unsafe_op_in_unsafe_fn)]
 #![unstable(reason = "not public", issue = "none", feature = "fd")]
 
 use crate::io::{self, ErrorKind, Read};

diff --git a/library/std/src/sys/hermit/mod.rs b/library/std/src/sys/hermit/mod.rs
index 0e4504020df4231778473ea91a715532a2901549..675b82ceb775f7b0a35c116cc54b2c39d0c93b90 100644 (file)
--- a/library/std/src/sys/hermit/mod.rs
+++ b/library/std/src/sys/hermit/mod.rs
@@ -13,8 +13,6 @@
 //! compiling for wasm. That way it's a compile time error for something that's
 //! guaranteed to be a runtime error!
 
-#![deny(unsafe_op_in_unsafe_fn)]
-
 use crate::intrinsics;
 use crate::os::raw::c_char;
 
@@ -64,12 +62,8 @@ pub enum Void {}
 pub unsafe fn strlen(start: *const c_char) -> usize {
     let mut str = start;
 
-    // SAFETY: The safety contract for `*str != 0` must be upheld by the caller.
-    // `start` must not be null.
-    unsafe {
-        while *str != 0 {
-            str = str.offset(1);
-        }
+    while *str != 0 {
+        str = str.offset(1);
     }
 
     (str as usize) - (start as usize)
@@ -117,15 +111,13 @@ pub fn init() {
         fn main(argc: isize, argv: *const *const c_char) -> i32;
     }
 
-    unsafe {
-        // initialize environment
-        os::init_environment(env as *const *const i8);
+    // initialize environment
+    os::init_environment(env as *const *const i8);
 
-        let result = main(argc as isize, argv);
+    let result = main(argc as isize, argv);
 
-        run_dtors();
-        abi::exit(result);
-    }
+    run_dtors();
+    abi::exit(result);
 }
 
 pub fn decode_error_kind(errno: i32) -> ErrorKind {

diff --git a/library/std/src/sys/hermit/mutex.rs b/library/std/src/sys/hermit/mutex.rs
index bcb2554ab29278a44a2b5c821a458710b29c54bf..3d4813209cbc4d0030dca9030f28afe18e6a83e7 100644 (file)
--- a/library/std/src/sys/hermit/mutex.rs
+++ b/library/std/src/sys/hermit/mutex.rs
@@ -1,5 +1,3 @@
-#![deny(unsafe_op_in_unsafe_fn)]
-
 use crate::ffi::c_void;
 use crate::ptr;
 use crate::sys::hermit::abi;
@@ -18,34 +16,28 @@ pub const fn new() -> Mutex {
 
     #[inline]
     pub unsafe fn init(&mut self) {
-        unsafe {
-            let _ = abi::sem_init(&mut self.inner as *mut *const c_void, 1);
-        }
+        let _ = abi::sem_init(&mut self.inner as *mut *const c_void, 1);
     }
 
     #[inline]
     pub unsafe fn lock(&self) {
-        unsafe {
-            let _ = abi::sem_timedwait(self.inner, 0);
-        }
+        let _ = abi::sem_timedwait(self.inner, 0);
     }
 
     #[inline]
     pub unsafe fn unlock(&self) {
-        unsafe {
-            let _ = abi::sem_post(self.inner);
-        }
+        let _ = abi::sem_post(self.inner);
     }
 
     #[inline]
     pub unsafe fn try_lock(&self) -> bool {
-        let result = unsafe { abi::sem_trywait(self.inner) };
+        let result = abi::sem_trywait(self.inner);
         result == 0
     }
 
     #[inline]
     pub unsafe fn destroy(&self) {
-        let _ = unsafe { abi::sem_destroy(self.inner) };
+        let _ = abi::sem_destroy(self.inner);
     }
 }
 
@@ -60,12 +52,12 @@ impl ReentrantMutex {
 
     #[inline]
     pub unsafe fn init(&self) {
-        let _ = unsafe { abi::recmutex_init(&self.inner as *const *const c_void as *mut _) };
+        let _ = abi::recmutex_init(&self.inner as *const *const c_void as *mut _);
     }
 
     #[inline]
     pub unsafe fn lock(&self) {
-        let _ = unsafe { abi::recmutex_lock(self.inner) };
+        let _ = abi::recmutex_lock(self.inner);
     }
 
     #[inline]
@@ -75,11 +67,11 @@ pub unsafe fn try_lock(&self) -> bool {
 
     #[inline]
     pub unsafe fn unlock(&self) {
-        let _ = unsafe { abi::recmutex_unlock(self.inner) };
+        let _ = abi::recmutex_unlock(self.inner);
     }
 
     #[inline]
     pub unsafe fn destroy(&self) {
-        let _ = unsafe { abi::recmutex_destroy(self.inner) };
+        let _ = abi::recmutex_destroy(self.inner);
     }
 }

diff --git a/library/std/src/sys/hermit/os.rs b/library/std/src/sys/hermit/os.rs
index d95940c9a76c8b16b1b7843a0196e766a5853fac..78eabf8f81e984e149bd551efed65503381eed02 100644 (file)
--- a/library/std/src/sys/hermit/os.rs
+++ b/library/std/src/sys/hermit/os.rs
@@ -1,5 +1,3 @@
-#![deny(unsafe_op_in_unsafe_fn)]
-
 use crate::collections::HashMap;
 use crate::error::Error as StdError;
 use crate::ffi::{CStr, OsStr, OsString};

diff --git a/library/std/src/sys/hermit/rwlock.rs b/library/std/src/sys/hermit/rwlock.rs
index a6c7bcc7641fc6650239fd4bf74a1cd3d677d8d5..06442e925f4c8710d33caf6fff3e18a54e495081 100644 (file)
--- a/library/std/src/sys/hermit/rwlock.rs
+++ b/library/std/src/sys/hermit/rwlock.rs
@@ -1,5 +1,3 @@
-#![deny(unsafe_op_in_unsafe_fn)]
-
 use crate::cell::UnsafeCell;
 use crate::sys::condvar::Condvar;
 use crate::sys::mutex::Mutex;
@@ -34,76 +32,62 @@ pub const fn new() -> RWLock {
 
     #[inline]
     pub unsafe fn read(&self) {
-        unsafe {
-            self.lock.lock();
-            while !(*self.state.get()).inc_readers() {
-                self.cond.wait(&self.lock);
-            }
-            self.lock.unlock();
+        self.lock.lock();
+        while !(*self.state.get()).inc_readers() {
+            self.cond.wait(&self.lock);
         }
+        self.lock.unlock();
     }
 
     #[inline]
     pub unsafe fn try_read(&self) -> bool {
-        unsafe {
-            self.lock.lock();
-            let ok = (*self.state.get()).inc_readers();
-            self.lock.unlock();
-        }
+        self.lock.lock();
+        let ok = (*self.state.get()).inc_readers();
+        self.lock.unlock();
         return ok;
     }
 
     #[inline]
     pub unsafe fn write(&self) {
-        unsafe {
-            self.lock.lock();
-            while !(*self.state.get()).inc_writers() {
-                self.cond.wait(&self.lock);
-            }
+        self.lock.lock();
+        while !(*self.state.get()).inc_writers() {
+            self.cond.wait(&self.lock);
         }
         self.lock.unlock();
     }
 
     #[inline]
     pub unsafe fn try_write(&self) -> bool {
-        unsafe {
-            self.lock.lock();
-            let ok = (*self.state.get()).inc_writers();
-            self.lock.unlock();
-        }
+        self.lock.lock();
+        let ok = (*self.state.get()).inc_writers();
+        self.lock.unlock();
         return ok;
     }
 
     #[inline]
     pub unsafe fn read_unlock(&self) {
-        unsafe {
-            self.lock.lock();
-            let notify = (*self.state.get()).dec_readers();
-            self.lock.unlock();
-            if notify {
-                // FIXME: should only wake up one of these some of the time
-                self.cond.notify_all();
-            }
+        self.lock.lock();
+        let notify = (*self.state.get()).dec_readers();
+        self.lock.unlock();
+        if notify {
+            // FIXME: should only wake up one of these some of the time
+            self.cond.notify_all();
         }
     }
 
     #[inline]
     pub unsafe fn write_unlock(&self) {
-        unsafe {
-            self.lock.lock();
-            (*self.state.get()).dec_writers();
-            self.lock.unlock();
-            // FIXME: should only wake up one of these some of the time
-            self.cond.notify_all();
-        }
+        self.lock.lock();
+        (*self.state.get()).dec_writers();
+        self.lock.unlock();
+        // FIXME: should only wake up one of these some of the time
+        self.cond.notify_all();
     }
 
     #[inline]
     pub unsafe fn destroy(&self) {
-        unsafe {
-            self.lock.destroy();
-            self.cond.destroy();
-        }
+        self.lock.destroy();
+        self.cond.destroy();
     }
 }
 

diff --git a/library/std/src/sys/hermit/thread.rs b/library/std/src/sys/hermit/thread.rs
index 7c52112a80c2d299eceb28955217fef13b29452d..e11afed668728f08abe9be030ca22af6f231bab7 100644 (file)
--- a/library/std/src/sys/hermit/thread.rs
+++ b/library/std/src/sys/hermit/thread.rs
@@ -1,5 +1,4 @@
 #![allow(dead_code)]
-#![deny(unsafe_op_in_unsafe_fn)]
 
 use crate::ffi::CStr;
 use crate::io;
@@ -26,22 +25,18 @@ pub unsafe fn new_with_coreid(
         core_id: isize,
     ) -> io::Result<Thread> {
         let p = Box::into_raw(box p);
-        let tid = unsafe {
-            abi::spawn2(
-                thread_start,
-                p as usize,
-                abi::Priority::into(abi::NORMAL_PRIO),
-                stack,
-                core_id,
-            )
-        };
+        let tid = abi::spawn2(
+            thread_start,
+            p as usize,
+            abi::Priority::into(abi::NORMAL_PRIO),
+            stack,
+            core_id,
+        );
 
         return if tid == 0 {
             // The thread failed to start and as a result p was not consumed. Therefore, it is
             // safe to reconstruct the box so that it gets deallocated.
-            unsafe {
-                drop(Box::from_raw(p));
-            }
+            drop(Box::from_raw(p));
             Err(io::Error::new(io::ErrorKind::Other, "Unable to create thread!"))
         } else {
             Ok(Thread { tid: tid })

diff --git a/library/std/src/sys/hermit/thread_local_dtor.rs b/library/std/src/sys/hermit/thread_local_dtor.rs
index 7998dd3cb4347f55a827c9ac3418e3526fcbd70f..9b683fce157488df8d26ee08184e278578e5c17b 100644 (file)
--- a/library/std/src/sys/hermit/thread_local_dtor.rs
+++ b/library/std/src/sys/hermit/thread_local_dtor.rs
@@ -1,6 +1,5 @@
 #![cfg(target_thread_local)]
 #![unstable(feature = "thread_local_internals", issue = "none")]
-#![deny(unsafe_op_in_unsafe_fn)]
 
 // Simplify dtor registration by using a list of destructors.
 // The this solution works like the implementation of macOS and
@@ -20,8 +19,7 @@ pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern "C" fn(*mut u8)) {
         DTORS.set(Box::into_raw(v));
     }
 
-    // SAFETY: `DTORS.get()` is not null.
-    let list: &mut List = unsafe { &mut *DTORS.get() };
+    let list: &mut List = &mut *DTORS.get();
     list.push((t, dtor));
 }
 
@@ -29,8 +27,7 @@ pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern "C" fn(*mut u8)) {
 pub unsafe fn run_dtors() {
     let mut ptr = DTORS.replace(ptr::null_mut());
     while !ptr.is_null() {
-        // SAFETY: `ptr` is not null.
-        let list = unsafe { Box::from_raw(ptr) };
+        let list = Box::from_raw(ptr);
         for (ptr, dtor) in list.into_iter() {
             dtor(ptr);
         }