about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorGeorge Burton <burtonageo@gmail.com>2018-04-22 22:57:52 +0100
committerGeorge Burton <burtonageo@gmail.com>2018-04-22 22:57:52 +0100
commit1133a149f1bd89bbc9303e3514a6bc20c3a5fc8b (patch)
tree80cff074923f350ef99554dab8f3e9fc6269b334 /src/liballoc
parentff48277add047928dcd19d64ffe93c46b0612a4d (diff)
downloadrust-1133a149f1bd89bbc9303e3514a6bc20c3a5fc8b.tar.gz
rust-1133a149f1bd89bbc9303e3514a6bc20c3a5fc8b.zip
Implement From for more types on Cow
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/string.rs8
-rw-r--r--src/liballoc/vec.rs7
2 files changed, 15 insertions, 0 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index 2f84d5f7f86..5f684361fdc 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -2239,6 +2239,14 @@ impl<'a> From<String> for Cow<'a, str> {
     }
 }
 
+#[stable(feature = "cow_from_string_ref", since = "1.28.0")]
+impl<'a> From<&'a String> for Cow<'a, str> {
+    #[inline]
+    fn from(s: &'a String) -> Cow<'a, str> {
+        Cow::Borrowed(s.as_str())
+    }
+}
+
 #[stable(feature = "cow_str_from_iter", since = "1.12.0")]
 impl<'a> FromIterator<char> for Cow<'a, str> {
     fn from_iter<I: IntoIterator<Item = char>>(it: I) -> Cow<'a, str> {
diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs
index b184404c15b..be4c80c85d9 100644
--- a/src/liballoc/vec.rs
+++ b/src/liballoc/vec.rs
@@ -2285,6 +2285,13 @@ impl<'a, T: Clone> From<Vec<T>> for Cow<'a, [T]> {
     }
 }
 
+#[stable(feature = "cow_from_vec_ref", since = "1.28.0")]
+impl<'a, T: Clone> From<&'a Vec<T>> for Cow<'a, [T]> {
+    fn from(v: &'a Vec<T>) -> Cow<'a, [T]> {
+        Cow::Borrowed(v.as_slice())
+    }
+}
+
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<'a, T> FromIterator<T> for Cow<'a, [T]> where T: Clone {
     fn from_iter<I: IntoIterator<Item = T>>(it: I) -> Cow<'a, [T]> {