OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move use align_of in atomic.rs into the places where it is used.

Browse Source
This commit is contained in:
Mara Bos 2020-09-21 20:44:45 +02:00
parent 7a04ff6c33
commit 5d6f1a1e32
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/core/src/sync/atomic.rs
View File

@ -111,9 +111,6 @@ use crate::cell::UnsafeCell;
use crate::fmt;
use crate::intrinsics;
#[allow(unused_imports)]
use crate::mem::align_of;
use crate::hint::spin_loop;
/// Signals the processor that it is inside a busy-wait spin-loop ("spin lock").
@ -861,6 +858,7 @@ impl<T> AtomicPtr<T> {
#[cfg(target_has_atomic_equal_alignment = "ptr")]
#[unstable(feature = "atomic_from_mut", issue = "76314")]
pub fn from_mut(v: &mut *mut T) -> &Self {
use crate::mem::align_of;
let [] = [(); align_of::<AtomicPtr<()>>() - align_of::<*mut ()>()];
// SAFETY:
// - the mutable reference guarantees unique ownership.
@ -1311,6 +1309,7 @@ assert_eq!(some_int, 100);
#[$cfg_align]
#[unstable(feature = "atomic_from_mut", issue = "76314")]
pub fn from_mut(v: &mut $int_type) -> &Self {
use crate::mem::align_of;
let [] = [(); align_of::<Self>() - align_of::<$int_type>()];
// SAFETY:
// - the mutable reference guarantees unique ownership.