about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-03-06 11:16:15 +0000
committerbors <bors@rust-lang.org>2016-03-06 11:16:15 +0000
commitc116ae35cf49b55bd8d82e31f1ba030cf7e63867 (patch)
tree52199cdf9f6d48cd55291f31515634f75f14ccbb
parent21fb3ce71b39133cc24b40de82e3214dd603cd61 (diff)
parent6f9afba6027a7433f0c48237dc0b6cb19251f19e (diff)
downloadrust-c116ae35cf49b55bd8d82e31f1ba030cf7e63867.tar.gz
rust-c116ae35cf49b55bd8d82e31f1ba030cf7e63867.zip
Auto merge of #32020 - alexcrichton:stabilize-into-ascii, r=brson
These were intended to land in stable 1.8 but were just waiting for the
implementation PR, so now they're landing. Specifically this PR stabilizes:

* `AsciiExt::into_ascii_uppercase`
* `AsciiExt::into_ascii_lowercase`
* `AsciiExt for Vec<u8>`
* `AsciiExt for String`
-rw-r--r--src/libstd/ascii.rs12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index 587d1d42258..98685cae870 100644
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -169,8 +169,6 @@ pub trait AsciiExt {
     /// # Examples
     ///
     /// ```
-    /// #![feature(ascii)]
-    ///
     /// use std::ascii::AsciiExt;
     ///
     /// let ascii: String = "a".to_owned();
@@ -179,7 +177,7 @@ pub trait AsciiExt {
     ///
     /// assert_eq!(upper, "A");
     /// ```
-    #[unstable(feature = "ascii", issue = "27809")]
+    #[stable(feature = "into_ascii", since = "1.8.0")]
     fn into_ascii_uppercase(self) -> Self::Owned where Self: Sized {
         self.to_ascii_uppercase()
     }
@@ -192,8 +190,6 @@ pub trait AsciiExt {
     /// # Examples
     ///
     /// ```
-    /// #![feature(ascii)]
-    ///
     /// use std::ascii::AsciiExt;
     ///
     /// let ascii: String = "A".to_owned();
@@ -202,7 +198,7 @@ pub trait AsciiExt {
     ///
     /// assert_eq!(lower, "a");
     /// ```
-    #[unstable(feature = "ascii", issue = "27809")]
+    #[stable(feature = "into_ascii", since = "1.8.0")]
     fn into_ascii_lowercase(self) -> Self::Owned where Self: Sized {
         self.to_ascii_lowercase()
     }
@@ -210,7 +206,7 @@ pub trait AsciiExt {
 
 /// Implement `into_ascii_lowercase` and `into_ascii_uppercase` without memory allocation,
 /// defer other methods to `str`.
-#[unstable(feature = "ascii", issue = "27809")]
+#[stable(feature = "into_ascii", since = "1.8.0")]
 impl AsciiExt for String {
     type Owned = Self;
 
@@ -242,7 +238,7 @@ impl AsciiExt for String {
 
 /// Implement `into_ascii_lowercase` and `into_ascii_uppercase` without memory allocation,
 /// defer other methods to `[u8]`.
-#[unstable(feature = "ascii", issue = "27809")]
+#[stable(feature = "into_ascii", since = "1.8.0")]
 impl AsciiExt for Vec<u8> {
     type Owned = Self;