diff options
| author | Yoshua Wuyts <yoshuawuyts@gmail.com> | 2020-11-22 01:04:02 +0100 |
|---|---|---|
| committer | Yoshua Wuyts <yoshuawuyts@gmail.com> | 2020-12-18 23:34:48 +0100 |
| commit | a55039df84f53a4a3060e2a7ae84dee1dc9006ef (patch) | |
| tree | 0f4d21a8be102034d8efcf0406a261b025aeb8a4 | |
| parent | 6340607acaab10eed3cf11ef7ad3564db58ec981 (diff) | |
| download | rust-a55039df84f53a4a3060e2a7ae84dee1dc9006ef.tar.gz rust-a55039df84f53a4a3060e2a7ae84dee1dc9006ef.zip | |
Stabilize Arc::{incr,decr}_strong_count
| -rw-r--r-- | library/alloc/src/sync.rs | 18 | ||||
| -rw-r--r-- | library/alloc/src/task.rs | 4 |
2 files changed, 9 insertions, 13 deletions
diff --git a/library/alloc/src/sync.rs b/library/alloc/src/sync.rs index 9d478a302e9..1ff30ca610d 100644 --- a/library/alloc/src/sync.rs +++ b/library/alloc/src/sync.rs @@ -870,15 +870,13 @@ impl<T: ?Sized> Arc<T> { /// # Examples /// /// ``` - /// #![feature(arc_mutate_strong_count)] - /// /// use std::sync::Arc; /// /// let five = Arc::new(5); /// /// unsafe { /// let ptr = Arc::into_raw(five); - /// Arc::incr_strong_count(ptr); + /// Arc::increment_strong_count(ptr); /// /// // This assertion is deterministic because we haven't shared /// // the `Arc` between threads. @@ -887,8 +885,8 @@ impl<T: ?Sized> Arc<T> { /// } /// ``` #[inline] - #[unstable(feature = "arc_mutate_strong_count", issue = "71983")] - pub unsafe fn incr_strong_count(ptr: *const T) { + #[stable(feature = "arc_mutate_strong_count", since = "1.50.0")] + pub unsafe fn increment_strong_count(ptr: *const T) { // Retain Arc, but don't touch refcount by wrapping in ManuallyDrop let arc = unsafe { mem::ManuallyDrop::new(Arc::<T>::from_raw(ptr)) }; // Now increase refcount, but don't drop new refcount either @@ -909,27 +907,25 @@ impl<T: ?Sized> Arc<T> { /// # Examples /// /// ``` - /// #![feature(arc_mutate_strong_count)] - /// /// use std::sync::Arc; /// /// let five = Arc::new(5); /// /// unsafe { /// let ptr = Arc::into_raw(five); - /// Arc::incr_strong_count(ptr); + /// Arc::increment_strong_count(ptr); /// /// // Those assertions are deterministic because we haven't shared /// // the `Arc` between threads. /// let five = Arc::from_raw(ptr); /// assert_eq!(2, Arc::strong_count(&five)); - /// Arc::decr_strong_count(ptr); + /// Arc::decrement_strong_count(ptr); /// assert_eq!(1, Arc::strong_count(&five)); /// } /// ``` #[inline] - #[unstable(feature = "arc_mutate_strong_count", issue = "71983")] - pub unsafe fn decr_strong_count(ptr: *const T) { + #[stable(feature = "arc_mutate_strong_count", since = "1.50.0")] + pub unsafe fn decrement_strong_count(ptr: *const T) { unsafe { mem::drop(Arc::from_raw(ptr)) }; } diff --git a/library/alloc/src/task.rs b/library/alloc/src/task.rs index fcab3fd0bad..4ee79dae3f1 100644 --- a/library/alloc/src/task.rs +++ b/library/alloc/src/task.rs @@ -60,7 +60,7 @@ impl<W: Wake + Send + Sync + 'static> From<Arc<W>> for RawWaker { fn raw_waker<W: Wake + Send + Sync + 'static>(waker: Arc<W>) -> RawWaker { // Increment the reference count of the arc to clone it. unsafe fn clone_waker<W: Wake + Send + Sync + 'static>(waker: *const ()) -> RawWaker { - unsafe { Arc::incr_strong_count(waker as *const W) }; + unsafe { Arc::increment_strong_count(waker as *const W) }; RawWaker::new( waker as *const (), &RawWakerVTable::new(clone_waker::<W>, wake::<W>, wake_by_ref::<W>, drop_waker::<W>), @@ -81,7 +81,7 @@ fn raw_waker<W: Wake + Send + Sync + 'static>(waker: Arc<W>) -> RawWaker { // Decrement the reference count of the Arc on drop unsafe fn drop_waker<W: Wake + Send + Sync + 'static>(waker: *const ()) { - unsafe { Arc::decr_strong_count(waker as *const W) }; + unsafe { Arc::decrement_strong_count(waker as *const W) }; } RawWaker::new( |
