summary refs log tree commit diff
path: root/src/libstd/ffi
diff options
context:
space:
mode:
authorOliver Middleton <olliemail27@gmail.com>2017-06-13 00:08:37 +0100
committerOliver Middleton <olliemail27@gmail.com>2017-06-21 01:18:19 +0100
commit0d885efe16899c2dbad2918345c9ede7b83caa7f (patch)
tree60fa4a5be6a1e5c2979533887226d8f4dde5850d /src/libstd/ffi
parent5a97036b6900ee208f90c52ceadcce606d497e93 (diff)
downloadrust-0d885efe16899c2dbad2918345c9ede7b83caa7f.tar.gz
rust-0d885efe16899c2dbad2918345c9ede7b83caa7f.zip
Update version numbers for From impls
Diffstat (limited to 'src/libstd/ffi')
-rw-r--r--src/libstd/ffi/c_str.rs2
-rw-r--r--src/libstd/ffi/os_str.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
index 1586e0a4ddb..5f0b11a616e 100644
--- a/src/libstd/ffi/c_str.rs
+++ b/src/libstd/ffi/c_str.rs
@@ -585,7 +585,7 @@ impl From<Box<CStr>> for CString {
     }
 }
 
-#[stable(feature = "box_from_c_string", since = "1.18.0")]
+#[stable(feature = "box_from_c_string", since = "1.20.0")]
 impl From<CString> for Box<CStr> {
     #[inline]
     fn from(s: CString) -> Box<CStr> {
diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs
index 3815f986681..3232a51546e 100644
--- a/src/libstd/ffi/os_str.rs
+++ b/src/libstd/ffi/os_str.rs
@@ -542,7 +542,7 @@ impl From<Box<OsStr>> for OsString {
     }
 }
 
-#[stable(feature = "box_from_os_string", since = "1.18.0")]
+#[stable(feature = "box_from_os_string", since = "1.20.0")]
 impl From<OsString> for Box<OsStr> {
     fn from(s: OsString) -> Box<OsStr> {
         s.into_boxed_os_str()