about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCAD97 <cad97@cad97.com>2020-01-14 16:45:11 -0500
committerCAD97 <cad97@cad97.com>2020-01-14 20:15:39 -0500
commitf76177ce4376ea15b1b303da347e8f653679cf88 (patch)
treeb1fa9f39e91f1667cc9109a6e3cbdf4e685ade3c
parent72b2bd55edbb1e63a930c5ddd08b25e4f9044786 (diff)
Stabilize ptr::slice_from_raw_parts[_mut]
-rw-r--r--src/liballoc/lib.rs1
-rw-r--r--src/libcore/ptr/mod.rs11
-rw-r--r--src/libcore/tests/lib.rs1
3 files changed, 5 insertions, 8 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index fdabf109b2e..38c6fa91cc5 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -104,7 +104,6 @@
 #![feature(ptr_offset_from)]
 #![feature(rustc_attrs)]
 #![feature(receiver_trait)]
-#![feature(slice_from_raw_parts)]
 #![feature(specialization)]
 #![feature(staged_api)]
 #![feature(std_internals)]
diff --git a/src/libcore/ptr/mod.rs b/src/libcore/ptr/mod.rs
index d7b351f1345..80f865d79e4 100644
--- a/src/libcore/ptr/mod.rs
+++ b/src/libcore/ptr/mod.rs
@@ -248,17 +248,16 @@ pub(crate) struct FatPtr<T> {
 /// # Examples
 ///
 /// ```rust
-/// #![feature(slice_from_raw_parts)]
 /// use std::ptr;
 ///
 /// // create a slice pointer when starting out with a pointer to the first element
-/// let mut x = [5, 6, 7];
-/// let ptr = &mut x[0] as *mut _;
-/// let slice = ptr::slice_from_raw_parts_mut(ptr, 3);
+/// let x = [5, 6, 7];
+/// let ptr = &x[0] as *const _;
+/// let slice = ptr::slice_from_raw_parts(ptr, 3);
 /// assert_eq!(unsafe { &*slice }[2], 7);
 /// ```
 #[inline]
-#[unstable(feature = "slice_from_raw_parts", reason = "recently added", issue = "36925")]
+#[stable(feature = "slice_from_raw_parts", since = "1.42.0")]
 #[rustc_const_unstable(feature = "const_slice_from_raw_parts", issue = "67456")]
 pub const fn slice_from_raw_parts<T>(data: *const T, len: usize) -> *const [T] {
     unsafe { Repr { raw: FatPtr { data, len } }.rust }
@@ -275,7 +274,7 @@ pub const fn slice_from_raw_parts<T>(data: *const T, len: usize) -> *const [T] {
 /// [`slice_from_raw_parts`]: fn.slice_from_raw_parts.html
 /// [`from_raw_parts_mut`]: ../../std/slice/fn.from_raw_parts_mut.html
 #[inline]
-#[unstable(feature = "slice_from_raw_parts", reason = "recently added", issue = "36925")]
+#[stable(feature = "slice_from_raw_parts", since = "1.42.0")]
 #[rustc_const_unstable(feature = "const_slice_from_raw_parts", issue = "67456")]
 pub const fn slice_from_raw_parts_mut<T>(data: *mut T, len: usize) -> *mut [T] {
     unsafe { Repr { raw: FatPtr { data, len } }.rust_mut }
diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs
index 39f6133f2a6..6cd1f1e0327 100644
--- a/src/libcore/tests/lib.rs
+++ b/src/libcore/tests/lib.rs
@@ -37,7 +37,6 @@
 #![feature(iter_is_partitioned)]
 #![feature(iter_order_by)]
 #![feature(cmp_min_max_by)]
-#![feature(slice_from_raw_parts)]
 #![feature(const_slice_from_raw_parts)]
 #![feature(const_raw_ptr_deref)]