diff options
| author | bors <bors@rust-lang.org> | 2019-07-22 17:08:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-22 17:08:25 +0000 |
| commit | e649e903440bfd919bfc9db848c28df6d795a116 (patch) | |
| tree | d182bd52c502a10edf0c1f8dfd172f1081685ac2 /src/libcore/ptr | |
| parent | 4bc1ce7bdb7f5dc9ea07c0b630c087d8e11140e4 (diff) | |
| parent | 376382aff3e8dad93b273ce7e9231ec7946edbe0 (diff) | |
Auto merge of #62873 - Centril:rollup-ncnuelj, r=Centril
Rollup of 14 pull requests Successful merges: - #62709 (Test that maplike FromIter satisfies uniqueness) - #62713 (Stabilize <*mut _>::cast and <*const _>::cast) - #62746 ( do not use assume_init in std::io) - #62787 (Fix typo in src/libstd/net/udp.rs doc comment) - #62788 (normalize use of backticks in compiler messages for libcore/ptr) - #62799 (use const array repeat expressions for uninit_array) - #62810 (normalize use of backticks in compiler messages for librustc_lint) - #62812 (normalize use of backticks in compiler messages for librustc_metadata) - #62832 (normalize use of backticks in compiler messages for librustc_incremental) - #62845 (read: fix doc comment) - #62853 (normalize use of backticks in compiler messages for librustc/hir) - #62854 (Fix typo in Unicode character name) - #62858 (Change wrong variable name.) - #62870 (fix lexing of comments with many \r) Failed merges: r? @ghost
Diffstat (limited to 'src/libcore/ptr')
| -rw-r--r-- | src/libcore/ptr/mod.rs | 4 | ||||
| -rw-r--r-- | src/libcore/ptr/unique.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/ptr/mod.rs b/src/libcore/ptr/mod.rs index df66a2978de..a7f6926de42 100644 --- a/src/libcore/ptr/mod.rs +++ b/src/libcore/ptr/mod.rs @@ -1043,7 +1043,7 @@ impl<T: ?Sized> *const T { } /// Cast to a pointer to a different type - #[unstable(feature = "ptr_cast", issue = "60602")] + #[stable(feature = "ptr_cast", since = "1.38.0")] #[inline] pub const fn cast<U>(self) -> *const U { self as _ @@ -1678,7 +1678,7 @@ impl<T: ?Sized> *mut T { } /// Cast to a pointer to a different type - #[unstable(feature = "ptr_cast", issue = "60602")] + #[stable(feature = "ptr_cast", since = "1.38.0")] #[inline] pub const fn cast<U>(self) -> *mut U { self as _ diff --git a/src/libcore/ptr/unique.rs b/src/libcore/ptr/unique.rs index 5911518919e..d2517e51fc5 100644 --- a/src/libcore/ptr/unique.rs +++ b/src/libcore/ptr/unique.rs @@ -26,8 +26,8 @@ use crate::ptr::NonNull; /// Unlike `*mut T`, `Unique<T>` is covariant over `T`. This should always be correct /// for any type which upholds Unique's aliasing requirements. #[unstable(feature = "ptr_internals", issue = "0", - reason = "use NonNull instead and consider PhantomData<T> \ - (if you also use #[may_dangle]), Send, and/or Sync")] + reason = "use `NonNull` instead and consider `PhantomData<T>` \ + (if you also use `#[may_dangle]`), `Send`, and/or `Sync`")] #[doc(hidden)] #[repr(transparent)] #[rustc_layout_scalar_valid_range_start(1)] |