From af65d81490b7df820af6db89f77f0e68e40cb4b0 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 17 Mar 2016 09:39:10 -0700
Subject: [PATCH] std: Revert addition of `into_ascii_*` methods

The addition of these methods in #31335 required adding impls of the trait for
the `String` and `Vec<T>` types. This unfortunately caused a regression (#32074)
in type inference for using these methods which the libs team has decided to not
push forward with. These methods were stabilized in #32020 which was intended to
get backported to beta, but the backport hasn't happened just yet. This commit
reverts both the addition and stabilization of these methods.

One proposed method of handling this, in #32076, was to move the methods to an
extra trait to avoid conflicts with type inference. After some discussion,
however, the libs team concluded that we probably want to reevaluate what we're
doing here, so discussion will continue on the tracking issue, #27809.
---
 src/libstd/ascii.rs | 102 --------------------------------------------
 1 file changed, 102 deletions(-)

diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index 031a9b8bec2..a8a3353da4c 100644
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -160,108 +160,6 @@ pub trait AsciiExt {
     /// ```
     #[unstable(feature = "ascii", issue = "27809")]
     fn make_ascii_lowercase(&mut self);
-
-    /// Converts this type to its ASCII upper case,
-    /// consuming the value to avoid allocating memory where `to_ascii_uppercase` would.
-    ///
-    /// See `to_ascii_uppercase` for more information.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use std::ascii::AsciiExt;
-    ///
-    /// let ascii: String = "a".to_owned();
-    ///
-    /// let upper = ascii.into_ascii_uppercase();
-    ///
-    /// assert_eq!(upper, "A");
-    /// ```
-    #[stable(feature = "into_ascii", since = "1.8.0")]
-    fn into_ascii_uppercase(self) -> Self::Owned where Self: Sized {
-        self.to_ascii_uppercase()
-    }
-
-    /// Converts this type to its ASCII lower case,
-    /// consuming the value to avoid allocating memory where `to_ascii_lowercase` would.
-    ///
-    /// See `to_ascii_lowercase` for more information.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use std::ascii::AsciiExt;
-    ///
-    /// let ascii: String = "A".to_owned();
-    ///
-    /// let lower = ascii.into_ascii_lowercase();
-    ///
-    /// assert_eq!(lower, "a");
-    /// ```
-    #[stable(feature = "into_ascii", since = "1.8.0")]
-    fn into_ascii_lowercase(self) -> Self::Owned where Self: Sized {
-        self.to_ascii_lowercase()
-    }
-}
-
-/// Implement `into_ascii_lowercase` and `into_ascii_uppercase` without memory allocation,
-/// defer other methods to `str`.
-#[stable(feature = "into_ascii", since = "1.8.0")]
-impl AsciiExt for String {
-    type Owned = Self;
-
-    #[inline] fn is_ascii(&self) -> bool { (**self).is_ascii() }
-    #[inline] fn to_ascii_uppercase(&self) -> Self { (**self).to_ascii_uppercase() }
-    #[inline] fn to_ascii_lowercase(&self) -> Self { (**self).to_ascii_lowercase() }
-    #[inline] fn eq_ignore_ascii_case(&self, o: &Self) -> bool { (**self).eq_ignore_ascii_case(o) }
-    #[inline] fn make_ascii_uppercase(&mut self) { (**self).make_ascii_uppercase() }
-    #[inline] fn make_ascii_lowercase(&mut self) { (**self).make_ascii_lowercase() }
-
-    fn into_ascii_lowercase(mut self) -> Self {
-        unsafe {
-            for byte in self.as_mut_vec() {
-                *byte = byte.to_ascii_lowercase()
-            }
-        }
-        self
-    }
-
-    fn into_ascii_uppercase(mut self) -> Self {
-        unsafe {
-            for byte in self.as_mut_vec() {
-                *byte = byte.to_ascii_uppercase()
-            }
-        }
-        self
-    }
-}
-
-/// Implement `into_ascii_lowercase` and `into_ascii_uppercase` without memory allocation,
-/// defer other methods to `[u8]`.
-#[stable(feature = "into_ascii", since = "1.8.0")]
-impl AsciiExt for Vec<u8> {
-    type Owned = Self;
-
-    #[inline] fn is_ascii(&self) -> bool { (**self).is_ascii() }
-    #[inline] fn to_ascii_uppercase(&self) -> Self { (**self).to_ascii_uppercase() }
-    #[inline] fn to_ascii_lowercase(&self) -> Self { (**self).to_ascii_lowercase() }
-    #[inline] fn eq_ignore_ascii_case(&self, o: &Self) -> bool { (**self).eq_ignore_ascii_case(o) }
-    #[inline] fn make_ascii_uppercase(&mut self) { (**self).make_ascii_uppercase() }
-    #[inline] fn make_ascii_lowercase(&mut self) { (**self).make_ascii_lowercase() }
-
-    fn into_ascii_lowercase(mut self) -> Self {
-        for byte in &mut self {
-            *byte = byte.to_ascii_lowercase()
-        }
-        self
-    }
-
-    fn into_ascii_uppercase(mut self) -> Self {
-        for byte in &mut self {
-            *byte = byte.to_ascii_uppercase()
-        }
-        self
-    }
 }
 
 #[stable(feature = "rust1", since = "1.0.0")]