about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorGeorge Burton <burtonageo@gmail.com>2018-04-27 20:27:38 +0100
committerGeorge Burton <burtonageo@gmail.com>2018-04-27 20:27:38 +0100
commitea8131de53a7aa587938106cfb5b0ec77b127bca (patch)
treea3a0eb2830faea1af0d4fbc2d95852fc2034c19a /src/libstd
parent1133a149f1bd89bbc9303e3514a6bc20c3a5fc8b (diff)
downloadrust-ea8131de53a7aa587938106cfb5b0ec77b127bca.tar.gz
rust-ea8131de53a7aa587938106cfb5b0ec77b127bca.zip
Add cstring_from_cow_cstr and osstring_from_cow_osstr
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/ffi/c_str.rs8
-rw-r--r--src/libstd/ffi/os_str.rs8
2 files changed, 16 insertions, 0 deletions
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
index 08a1596ef25..7f38cadfb22 100644
--- a/src/libstd/ffi/c_str.rs
+++ b/src/libstd/ffi/c_str.rs
@@ -682,6 +682,14 @@ impl Borrow<CStr> for CString {
     fn borrow(&self) -> &CStr { self }
 }
 
+#[stable(feature = "cstring_from_cow_cstr", since = "1.28.0")]
+impl<'a> From<Cow<'a, CStr>> for CString {
+    #[inline]
+    fn from(s: Cow<'a, CStr>) -> Self {
+        s.into_owned()
+    }
+}
+
 #[stable(feature = "box_from_c_str", since = "1.17.0")]
 impl<'a> From<&'a CStr> for Box<CStr> {
     fn from(s: &'a CStr) -> Box<CStr> {
diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs
index e42a28ed88f..0a3148029d0 100644
--- a/src/libstd/ffi/os_str.rs
+++ b/src/libstd/ffi/os_str.rs
@@ -688,6 +688,14 @@ impl<'a> From<&'a OsString> for Cow<'a, OsStr> {
     }
 }
 
+#[stable(feature = "osstring_from_cow_osstr", since = "1.28.0")]
+impl<'a> From<Cow<'a, OsStr>> for OsString {
+    #[inline]
+    fn from(s: Cow<'a, OsStr>) -> Self {
+        s.into_owned()
+    }
+}
+
 #[stable(feature = "box_default_extra", since = "1.17.0")]
 impl Default for Box<OsStr> {
     fn default() -> Box<OsStr> {