nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename atomic 'as_mut_ptr' to 'as_ptr' to match Cell (ref #66893)

Browse Source
This commit is contained in:
Trevor Gross 2023-02-06 15:01:40 -05:00
parent 5a8dfd933a
commit 787b1116e8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -922,13 +922,13 @@ impl AtomicBool {
///
/// let mut atomic = AtomicBool::new(true);
/// unsafe {
/// my_atomic_op(atomic.as_mut_ptr());
/// my_atomic_op(atomic.as_ptr());
/// }
/// # }
/// ```
#[inline]
#[unstable(feature = "atomic_mut_ptr", reason = "recently added", issue = "66893")]
pub const fn as_mut_ptr(&self) -> *mut bool {
pub const fn as_ptr(&self) -> *mut bool {
self.v.get().cast()
}
@ -1814,12 +1814,12 @@ impl<T> AtomicPtr<T> {
///
/// // SAFETY: Safe as long as `my_atomic_op` is atomic.
/// unsafe {
/// my_atomic_op(atomic.as_mut_ptr());
/// my_atomic_op(atomic.as_ptr());
/// }
/// ```
#[inline]
#[unstable(feature = "atomic_mut_ptr", reason = "recently added", issue = "66893")]
pub const fn as_mut_ptr(&self) -> *mut *mut T {
pub const fn as_ptr(&self) -> *mut *mut T {
self.p.get()
}
}
@ -2719,7 +2719,7 @@ macro_rules! atomic_int {
///
/// // SAFETY: Safe as long as `my_atomic_op` is atomic.
/// unsafe {
/// my_atomic_op(atomic.as_mut_ptr());
/// my_atomic_op(atomic.as_ptr());
/// }
/// # }
/// ```
@ -2727,7 +2727,7 @@ macro_rules! atomic_int {
#[unstable(feature = "atomic_mut_ptr",
reason = "recently added",
issue = "66893")]
pub const fn as_mut_ptr(&self) -> *mut $int_type {
pub const fn as_ptr(&self) -> *mut $int_type {
self.v.get()
}
}

6
library/std/src/sys_common/thread_parking/id.rs
View File

@ -60,7 +60,7 @@ impl Parker {
if state == PARKED {
// Loop to guard against spurious wakeups.
while state == PARKED {
park(self.state.as_mut_ptr().addr());
park(self.state.as_ptr().addr());
state = self.state.load(Acquire);
}
@ -76,7 +76,7 @@ impl Parker {
let state = self.state.fetch_sub(1, Acquire).wrapping_sub(1);
if state == PARKED {
park_timeout(dur, self.state.as_mut_ptr().addr());
park_timeout(dur, self.state.as_ptr().addr());
// Swap to ensure that we observe all state changes with acquire
// ordering, even if the state has been changed after the timeout
// occured.
@ -99,7 +99,7 @@ impl Parker {
// and terminated before this call is made. This call then returns an
// error or wakes up an unrelated thread. The platform API and
// environment does allow this, however.
unpark(tid, self.state.as_mut_ptr().addr());
unpark(tid, self.state.as_ptr().addr());
}
}
}