diff options
| author | bors <bors@rust-lang.org> | 2020-07-07 00:56:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-07 00:56:44 +0000 |
| commit | 70f9d23b916f2db7da711aa4a0317a218997ba42 (patch) | |
| tree | 583d0a11c2b82dc7ebc149ebbcdab4523dedbdfe /src/liballoc | |
| parent | 8981dbbc36f1575b0a417b6849767bde29e7c6b4 (diff) | |
| parent | 73f2069d529c9d945967dd8f1a3b71b6003c7f96 (diff) | |
| download | rust-70f9d23b916f2db7da711aa4a0317a218997ba42.tar.gz rust-70f9d23b916f2db7da711aa4a0317a218997ba42.zip | |
Auto merge of #74117 - Manishearth:rollup-ds7z0kx, r=Manishearth
Rollup of 14 pull requests Successful merges: - #70563 ([rustdoc] Page hash handling) - #73856 (Edit librustc_lexer top-level docs) - #73870 (typeck: adding type information to projection) - #73953 (Audit hidden/short code suggestions) - #73962 (libstd/net/tcp.rs: #![deny(unsafe_op_in_unsafe_fn)]) - #73969 (mir: mark mir construction temporaries as internal) - #73974 (Move A|Rc::as_ptr from feature(weak_into_raw) to feature(rc_as_ptr)) - #74067 (rustdoc: Restore underline text decoration on hover for FQN in header) - #74074 (Fix the return type of Windows' `OpenOptionsExt::security_qos_flags`.) - #74078 (Always resolve type@primitive as a primitive, not a module) - #74089 (Add rust-analyzer to the build manifest) - #74090 (Remove unused RUSTC_DEBUG_ASSERTIONS) - #74102 (Fix const prop ICE) - #74112 (Expand abbreviation in core::ffi description) Failed merges: r? @ghost
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); |
