diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2020-07-06 17:45:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 17:45:28 -0700 |
| commit | 7d7b3e637c5586f2db3e534129afd4d9fc045ddc (patch) | |
| tree | 727f70a0496533a25c94e2ac63d3897fb7ff494e /src/liballoc | |
| parent | 62ba1bf1f1afb7ace6ca8e772dc6a46f90444a77 (diff) | |
| parent | 7391bf882a040814f25f65f6b6539e2f521d17ec (diff) | |
| download | rust-7d7b3e637c5586f2db3e534129afd4d9fc045ddc.tar.gz rust-7d7b3e637c5586f2db3e534129afd4d9fc045ddc.zip | |
Rollup merge of #73974 - CAD97:rc-no-weak, r=dtolnay
Move A|Rc::as_ptr from feature(weak_into_raw) to feature(rc_as_ptr) These were stabilized alongside the Weak versions, but having `feature = "weak_.."` on a fn definition for the non-weak pointers is potentially very misleading, especially in a review context where the impl header may not be immediately visible. r? @RalfJung @bors rollup=always
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/rc.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/sync.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index fccdfa0dca9..77ff567aa7a 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -1701,7 +1701,7 @@ impl<T> Weak<T> { /// ``` /// /// [`null`]: ../../std/ptr/fn.null.html - #[stable(feature = "weak_into_raw", since = "1.45.0")] + #[stable(feature = "rc_as_ptr", since = "1.45.0")] pub fn as_ptr(&self) -> *const T { let ptr: *mut RcBox<T> = NonNull::as_ptr(self.ptr); diff --git a/src/liballoc/sync.rs b/src/liballoc/sync.rs index 2d6a3917c76..0053a54f203 100644 --- a/src/liballoc/sync.rs +++ b/src/liballoc/sync.rs @@ -587,7 +587,7 @@ impl<T: ?Sized> Arc<T> { /// assert_eq!(x_ptr, Arc::as_ptr(&y)); /// assert_eq!(unsafe { &*x_ptr }, "hello"); /// ``` - #[stable(feature = "weak_into_raw", since = "1.45.0")] + #[stable(feature = "rc_as_ptr", since = "1.45.0")] pub fn as_ptr(this: &Self) -> *const T { let ptr: *mut ArcInner<T> = NonNull::as_ptr(this.ptr); |
