diff --git a/tokio/src/loom/std/atomic_u16.rs b/tokio/src/loom/std/atomic_u16.rs index f352e4fae5b..dfc31f642a6 100644 --- a/tokio/src/loom/std/atomic_u16.rs +++ b/tokio/src/loom/std/atomic_u16.rs @@ -24,10 +24,7 @@ impl AtomicU16 { /// Additionally, there must be no concurrent mutations. pub(crate) unsafe fn unsync_load(&self) -> u16 { // See - #[cfg(miri)] - return self.load(std::sync::atomic::Ordering::Relaxed); - #[cfg(not(miri))] - return core::ptr::read(self.inner.get() as *const u16); + self.load(std::sync::atomic::Ordering::Relaxed) } } diff --git a/tokio/src/loom/std/atomic_u32.rs b/tokio/src/loom/std/atomic_u32.rs index 422dc789037..94400176911 100644 --- a/tokio/src/loom/std/atomic_u32.rs +++ b/tokio/src/loom/std/atomic_u32.rs @@ -24,10 +24,7 @@ impl AtomicU32 { /// Additionally, there must be no concurrent mutations. pub(crate) unsafe fn unsync_load(&self) -> u32 { // See - #[cfg(miri)] - return self.load(std::sync::atomic::Ordering::Relaxed); - #[cfg(not(miri))] - return core::ptr::read(self.inner.get() as *const u32); + self.load(std::sync::atomic::Ordering::Relaxed) } } diff --git a/tokio/src/loom/std/atomic_usize.rs b/tokio/src/loom/std/atomic_usize.rs index 03f2b566550..64605c76dd0 100644 --- a/tokio/src/loom/std/atomic_usize.rs +++ b/tokio/src/loom/std/atomic_usize.rs @@ -24,10 +24,7 @@ impl AtomicUsize { /// Additionally, there must be no concurrent mutations. pub(crate) unsafe fn unsync_load(&self) -> usize { // See - #[cfg(miri)] - return self.load(std::sync::atomic::Ordering::Relaxed); - #[cfg(not(miri))] - return core::ptr::read(self.inner.get() as *const usize); + self.load(std::sync::atomic::Ordering::Relaxed) } pub(crate) fn with_mut(&mut self, f: impl FnOnce(&mut usize) -> R) -> R {