squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Make Atomic*::from_mut return &mut Atomic*

Browse source
This commit is contained in:
Maybe Waffle 2022-01-08 16:57:20 +03:00
parent 84abaf3f7d
commit 2b03ed19f6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
library/core/src/sync/atomic.rs
View file

@ -333,10 +333,10 @@ impl AtomicBool {
#[inline] #[inline]
#[cfg(target_has_atomic_equal_alignment = "8")] #[cfg(target_has_atomic_equal_alignment = "8")]
#[unstable(feature = "atomic_from_mut", issue = "76314")] #[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 // SAFETY: the mutable reference guarantees unique ownership, and
// alignment of both `bool` and `Self` is 1. // 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. /// Consumes the atomic and returns the contained value.
@ -934,14 +934,14 @@ impl<T> AtomicPtr<T> {
#[inline] #[inline]
#[cfg(target_has_atomic_equal_alignment = "ptr")] #[cfg(target_has_atomic_equal_alignment = "ptr")]
#[unstable(feature = "atomic_from_mut", issue = "76314")] #[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; use crate::mem::align_of;
let [] = [(); align_of::<AtomicPtr<()>>() - align_of::<*mut ()>()]; let [] = [(); align_of::<AtomicPtr<()>>() - align_of::<*mut ()>()];
// SAFETY: // SAFETY:
// - the mutable reference guarantees unique ownership. // - the mutable reference guarantees unique ownership.
// - the alignment of `*mut T` and `Self` is the same on all platforms // - the alignment of `*mut T` and `Self` is the same on all platforms
// supported by rust, as verified above. // 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. /// Consumes the atomic and returns the contained value.
@ -1447,14 +1447,14 @@ macro_rules! atomic_int {
#[inline] #[inline]
#[$cfg_align] #[$cfg_align]
#[unstable(feature = "atomic_from_mut", issue = "76314")] #[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; use crate::mem::align_of;
let [] = [(); align_of::<Self>() - align_of::<$int_type>()]; let [] = [(); align_of::<Self>() - align_of::<$int_type>()];
// SAFETY: // SAFETY:
// - the mutable reference guarantees unique ownership. // - the mutable reference guarantees unique ownership.
// - the alignment of `$int_type` and `Self` is the // - the alignment of `$int_type` and `Self` is the
// same, as promised by $cfg_align and verified above. // 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. /// Consumes the atomic and returns the contained value.