Make AsRef and AsMut reflexive (BREAKING).

rust-lang · Jan 29, 2017 · 4a9884d · 4a9884d
1 parent 4be49e1
commit 4a9884d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 61 deletions.
diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs
@@ -1818,20 +1818,6 @@ impl<T: fmt::Debug> fmt::Debug for Vec<T> {
     }
 }
 
-#[stable(feature = "rust1", since = "1.0.0")]
-impl<T> AsRef<Vec<T>> for Vec<T> {
-    fn as_ref(&self) -> &Vec<T> {
-        self
-    }
-}
-
-#[stable(feature = "vec_as_mut", since = "1.5.0")]
-impl<T> AsMut<Vec<T>> for Vec<T> {
-    fn as_mut(&mut self) -> &mut Vec<T> {
-        self
-    }
-}
-
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<T> AsRef<[T]> for Vec<T> {
     fn as_ref(&self) -> &[T] {

diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs
@@ -224,6 +224,14 @@ pub trait TryFrom<T>: Sized {
 // GENERIC IMPLS
 ////////////////////////////////////////////////////////////////////////////////
 
+// As is reflexive
+#[stable(feature = "rust1", since = "1.0.0")]
+impl<'a, T: ?Sized> AsRef<T> for T {
+    fn as_ref(&self) -> &T {
+        self
+    }
+}
+
 // As lifts over &
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<'a, T: ?Sized, U: ?Sized> AsRef<U> for &'a T where T: AsRef<U> {
@@ -248,6 +256,14 @@ impl<'a, T: ?Sized, U: ?Sized> AsRef<U> for &'a mut T where T: AsRef<U> {
 //     }
 // }
 
+// AsMut is reflexive
+#[stable(feature = "rust1", since = "1.0.0")]
+impl<'a, T: ?Sized> AsMut<T> for T {
+    fn as_mut(&mut self) -> &mut T {
+        self
+    }
+}
+
 // AsMut lifts over &mut
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<'a, T: ?Sized, U: ?Sized> AsMut<U> for &'a mut T where T: AsMut<U> {
@@ -288,29 +304,3 @@ impl<T, U> TryInto<U> for T where U: TryFrom<T> {
         U::try_from(self)
     }
 }
-
-////////////////////////////////////////////////////////////////////////////////
-// CONCRETE IMPLS
-////////////////////////////////////////////////////////////////////////////////
-
-#[stable(feature = "rust1", since = "1.0.0")]
-impl<T> AsRef<[T]> for [T] {
-    fn as_ref(&self) -> &[T] {
-        self
-    }
-}
-
-#[stable(feature = "rust1", since = "1.0.0")]
-impl<T> AsMut<[T]> for [T] {
-    fn as_mut(&mut self) -> &mut [T] {
-        self
-    }
-}
-
-#[stable(feature = "rust1", since = "1.0.0")]
-impl AsRef<str> for str {
-    #[inline]
-    fn as_ref(&self) -> &str {
-        self
-    }
-}
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
@@ -707,13 +707,6 @@ impl ops::Index<ops::RangeFull> for CString {
     }
 }
 
-#[stable(feature = "cstring_asref", since = "1.7.0")]
-impl AsRef<CStr> for CStr {
-    fn as_ref(&self) -> &CStr {
-        self
-    }
-}
-
 #[stable(feature = "cstring_asref", since = "1.7.0")]
 impl AsRef<CStr> for CString {
     fn as_ref(&self) -> &CStr {

diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs
@@ -575,13 +575,6 @@ impl ToOwned for OsStr {
     fn to_owned(&self) -> OsString { self.to_os_string() }
 }
 
-#[stable(feature = "rust1", since = "1.0.0")]
-impl AsRef<OsStr> for OsStr {
-    fn as_ref(&self) -> &OsStr {
-        self
-    }
-}
-
 #[stable(feature = "rust1", since = "1.0.0")]
 impl AsRef<OsStr> for OsString {
     fn as_ref(&self) -> &OsStr {

diff --git a/src/libstd/path.rs b/src/libstd/path.rs
@@ -2129,13 +2129,6 @@ impl cmp::Ord for Path {
     }
 }
 
-#[stable(feature = "rust1", since = "1.0.0")]
-impl AsRef<Path> for Path {
-    fn as_ref(&self) -> &Path {
-        self
-    }
-}
-
 #[stable(feature = "rust1", since = "1.0.0")]
 impl AsRef<Path> for OsStr {
     fn as_ref(&self) -> &Path {