mirror of
https://github.com/rust-lang/rust
synced 2024-10-17 05:53:41 +00:00
Rename atomic 'as_mut_ptr' to 'as_ptr' to match Cell (ref #66893)
This commit is contained in:
parent
5a8dfd933a
commit
787b1116e8
|
@ -922,13 +922,13 @@ pub fn fetch_not(&self, order: Ordering) -> bool {
|
|||
///
|
||||
/// 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 @@ pub fn fetch_xor(&self, val: usize, order: Ordering) -> *mut 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 @@ pub fn fetch_min(&self, val: $int_type, order: Ordering) -> $int_type {
|
|||
///
|
||||
/// // 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 @@ pub fn fetch_min(&self, val: $int_type, order: Ordering) -> $int_type {
|
|||
#[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()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -60,7 +60,7 @@ pub unsafe fn park(self: Pin<&Self>) {
|
|||
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 @@ pub unsafe fn park_timeout(self: Pin<&Self>, dur: Duration) {
|
|||
|
||||
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 @@ pub fn unpark(self: Pin<&Self>) {
|
|||
// 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());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue