diff options
| -rw-r--r-- | src/liballoc/lib.rs | 1 | ||||
| -rw-r--r-- | src/liballoc/str.rs | 12 | ||||
| -rw-r--r-- | src/liballoc/tests/lib.rs | 1 | ||||
| -rw-r--r-- | src/libcore/str/mod.rs | 20 |
4 files changed, 14 insertions, 20 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 7e6ee4bd49d..2b28538c47d 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -82,7 +82,6 @@ #![cfg_attr(not(test), feature(core_float))] #![cfg_attr(not(test), feature(exact_size_is_empty))] #![cfg_attr(not(test), feature(slice_rotate))] -#![cfg_attr(not(test), feature(str_checked_slicing))] #![cfg_attr(test, feature(rand, test))] #![cfg_attr(stage0, feature(allocator))] #![feature(allow_internal_unstable)] diff --git a/src/liballoc/str.rs b/src/liballoc/str.rs index f56288c3013..e4953988c5c 100644 --- a/src/liballoc/str.rs +++ b/src/liballoc/str.rs @@ -328,14 +328,13 @@ impl str { /// # Examples /// /// ``` - /// # #![feature(str_checked_slicing)] /// let v = "🗻∈🌏"; /// assert_eq!(Some("🗻"), v.get(0..4)); /// assert!(v.get(1..).is_none()); /// assert!(v.get(..8).is_none()); /// assert!(v.get(..42).is_none()); /// ``` - #[unstable(feature = "str_checked_slicing", issue = "39932")] + #[stable(feature = "str_checked_slicing", since = "1.20.0")] #[inline] pub fn get<I: SliceIndex<str>>(&self, i: I) -> Option<&I::Output> { core_str::StrExt::get(self, i) @@ -351,14 +350,13 @@ impl str { /// # Examples /// /// ``` - /// # #![feature(str_checked_slicing)] /// let mut v = String::from("🗻∈🌏"); /// assert_eq!(Some("🗻"), v.get_mut(0..4).map(|v| &*v)); /// assert!(v.get_mut(1..).is_none()); /// assert!(v.get_mut(..8).is_none()); /// assert!(v.get_mut(..42).is_none()); /// ``` - #[unstable(feature = "str_checked_slicing", issue = "39932")] + #[stable(feature = "str_checked_slicing", since = "1.20.0")] #[inline] pub fn get_mut<I: SliceIndex<str>>(&mut self, i: I) -> Option<&mut I::Output> { core_str::StrExt::get_mut(self, i) @@ -383,7 +381,6 @@ impl str { /// # Examples /// /// ``` - /// # #![feature(str_checked_slicing)] /// let v = "🗻∈🌏"; /// unsafe { /// assert_eq!("🗻", v.get_unchecked(0..4)); @@ -391,7 +388,7 @@ impl str { /// assert_eq!("🌏", v.get_unchecked(7..11)); /// } /// ``` - #[unstable(feature = "str_checked_slicing", issue = "39932")] + #[stable(feature = "str_checked_slicing", since = "1.20.0")] #[inline] pub unsafe fn get_unchecked<I: SliceIndex<str>>(&self, i: I) -> &I::Output { core_str::StrExt::get_unchecked(self, i) @@ -416,7 +413,6 @@ impl str { /// # Examples /// /// ``` - /// # #![feature(str_checked_slicing)] /// let mut v = String::from("🗻∈🌏"); /// unsafe { /// assert_eq!("🗻", v.get_unchecked_mut(0..4)); @@ -424,7 +420,7 @@ impl str { /// assert_eq!("🌏", v.get_unchecked_mut(7..11)); /// } /// ``` - #[unstable(feature = "str_checked_slicing", issue = "39932")] + #[stable(feature = "str_checked_slicing", since = "1.20.0")] #[inline] pub unsafe fn get_unchecked_mut<I: SliceIndex<str>>(&mut self, i: I) -> &mut I::Output { core_str::StrExt::get_unchecked_mut(self, i) diff --git a/src/liballoc/tests/lib.rs b/src/liballoc/tests/lib.rs index c6d70ee7575..75ff7811137 100644 --- a/src/liballoc/tests/lib.rs +++ b/src/liballoc/tests/lib.rs @@ -24,7 +24,6 @@ #![feature(repr_align)] #![feature(slice_rotate)] #![feature(splice)] -#![feature(str_checked_slicing)] #![feature(str_escape)] #![feature(test)] #![feature(unboxed_closures)] diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs index 95b27751a6a..0bbbf2352b4 100644 --- a/src/libcore/str/mod.rs +++ b/src/libcore/str/mod.rs @@ -1776,7 +1776,7 @@ mod traits { } } - #[unstable(feature = "str_checked_slicing", issue = "39932")] + #[stable(feature = "str_checked_slicing", since = "1.20.0")] impl SliceIndex<str> for ops::RangeFull { type Output = str; #[inline] @@ -1805,7 +1805,7 @@ mod traits { } } - #[unstable(feature = "str_checked_slicing", issue = "39932")] + #[stable(feature = "str_checked_slicing", since = "1.20.0")] impl SliceIndex<str> for ops::Range<usize> { type Output = str; #[inline] @@ -1859,7 +1859,7 @@ mod traits { } } - #[unstable(feature = "str_checked_slicing", issue = "39932")] + #[stable(feature = "str_checked_slicing", since = "1.20.0")] impl SliceIndex<str> for ops::RangeTo<usize> { type Output = str; #[inline] @@ -1904,7 +1904,7 @@ mod traits { } } - #[unstable(feature = "str_checked_slicing", issue = "39932")] + #[stable(feature = "str_checked_slicing", since = "1.20.0")] impl SliceIndex<str> for ops::RangeFrom<usize> { type Output = str; #[inline] @@ -1951,7 +1951,7 @@ mod traits { } } - #[unstable(feature = "str_checked_slicing", issue = "39932")] + #[stable(feature = "str_checked_slicing", since = "1.20.0")] impl SliceIndex<str> for ops::RangeInclusive<usize> { type Output = str; #[inline] @@ -1994,7 +1994,7 @@ mod traits { - #[unstable(feature = "str_checked_slicing", issue = "39932")] + #[stable(feature = "str_checked_slicing", since = "1.20.0")] impl SliceIndex<str> for ops::RangeToInclusive<usize> { type Output = str; #[inline] @@ -2094,13 +2094,13 @@ pub trait StrExt { #[rustc_deprecated(since = "1.6.0", reason = "use lines() instead now")] #[allow(deprecated)] fn lines_any(&self) -> LinesAny; - #[unstable(feature = "str_checked_slicing", issue = "39932")] + #[stable(feature = "str_checked_slicing", since = "1.20.0")] fn get<I: SliceIndex<str>>(&self, i: I) -> Option<&I::Output>; - #[unstable(feature = "str_checked_slicing", issue = "39932")] + #[stable(feature = "str_checked_slicing", since = "1.20.0")] fn get_mut<I: SliceIndex<str>>(&mut self, i: I) -> Option<&mut I::Output>; - #[unstable(feature = "str_checked_slicing", issue = "39932")] + #[stable(feature = "str_checked_slicing", since = "1.20.0")] unsafe fn get_unchecked<I: SliceIndex<str>>(&self, i: I) -> &I::Output; - #[unstable(feature = "str_checked_slicing", issue = "39932")] + #[stable(feature = "str_checked_slicing", since = "1.20.0")] unsafe fn get_unchecked_mut<I: SliceIndex<str>>(&mut self, i: I) -> &mut I::Output; #[stable(feature = "core", since = "1.6.0")] unsafe fn slice_unchecked(&self, begin: usize, end: usize) -> &str; |