auto merge of #19146 : gereeter/rust/reference-borrow, r=aturon

This should be a more general version of #19131.

1 files changed, 10 insertions, 2 deletions

diff --git a/src/libcore/borrow.rs b/src/libcore/borrow.rs
index f0a14c02382..70b1bc16227 100644
--- a/src/libcore/borrow.rs
+++ b/src/libcore/borrow.rs
@@ -69,8 +69,16 @@ impl<Sized? T> BorrowFromMut<T> for T {
     fn borrow_from_mut(owned: &mut T) -> &mut T { owned }
 }
 
-impl BorrowFrom<&'static str> for str {
-    fn borrow_from<'a>(owned: &'a &'static str) -> &'a str { &**owned }
+impl<'a, Sized? T> BorrowFrom<&'a T> for T {
+    fn borrow_from<'b>(owned: &'b &'a T) -> &'b T { &**owned }
+}
+
+impl<'a, Sized? T> BorrowFrom<&'a mut T> for T {
+    fn borrow_from<'b>(owned: &'b &'a mut T) -> &'b T { &**owned }
+}
+
+impl<'a, Sized? T> BorrowFromMut<&'a mut T> for T {
+    fn borrow_from_mut<'b>(owned: &'b mut &'a mut T) -> &'b mut T { &mut **owned }
 }
 
 /// A generalization of Clone to borrowed data.