Skip to content

Commit

Permalink
Make Atomic*::from_mut return &mut Atomic*
Browse files Browse the repository at this point in the history
  • Loading branch information
WaffleLapkin committed Jan 8, 2022
1 parent 84abaf3 commit 2b03ed1
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions library/core/src/sync/atomic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,10 @@ impl AtomicBool {
#[inline]
#[cfg(target_has_atomic_equal_alignment = "8")]
#[unstable(feature = "atomic_from_mut", issue = "76314")]
pub fn from_mut(v: &mut bool) -> &Self {
pub fn from_mut(v: &mut bool) -> &mut Self {
// SAFETY: the mutable reference guarantees unique ownership, and
// alignment of both `bool` and `Self` is 1.
unsafe { &*(v as *mut bool as *mut Self) }
unsafe { &mut *(v as *mut bool as *mut Self) }
}

/// Consumes the atomic and returns the contained value.
Expand Down Expand Up @@ -934,14 +934,14 @@ impl<T> AtomicPtr<T> {
#[inline]
#[cfg(target_has_atomic_equal_alignment = "ptr")]
#[unstable(feature = "atomic_from_mut", issue = "76314")]
pub fn from_mut(v: &mut *mut T) -> &Self {
pub fn from_mut(v: &mut *mut T) -> &mut Self {
use crate::mem::align_of;
let [] = [(); align_of::<AtomicPtr<()>>() - align_of::<*mut ()>()];
// SAFETY:
// - the mutable reference guarantees unique ownership.
// - the alignment of `*mut T` and `Self` is the same on all platforms
// supported by rust, as verified above.
unsafe { &*(v as *mut *mut T as *mut Self) }
unsafe { &mut *(v as *mut *mut T as *mut Self) }
}

/// Consumes the atomic and returns the contained value.
Expand Down Expand Up @@ -1447,14 +1447,14 @@ macro_rules! atomic_int {
#[inline]
#[$cfg_align]
#[unstable(feature = "atomic_from_mut", issue = "76314")]
pub fn from_mut(v: &mut $int_type) -> &Self {
pub fn from_mut(v: &mut $int_type) -> &mut Self {
use crate::mem::align_of;
let [] = [(); align_of::<Self>() - align_of::<$int_type>()];
// SAFETY:
// - the mutable reference guarantees unique ownership.
// - the alignment of `$int_type` and `Self` is the
// same, as promised by $cfg_align and verified above.
unsafe { &*(v as *mut $int_type as *mut Self) }
unsafe { &mut *(v as *mut $int_type as *mut Self) }
}

/// Consumes the atomic and returns the contained value.
Expand Down

0 comments on commit 2b03ed1

Please sign in to comment.