about summary refs log tree commit diff
path: root/src/libstd/ffi
diff options
context:
space:
mode:
authorOliver Middleton <olliemail27@gmail.com>2017-05-20 08:38:39 +0100
committerOliver Middleton <olliemail27@gmail.com>2017-05-20 08:38:39 +0100
commit2f703e4304c1c9b15c616b7a08bac581af5ab430 (patch)
tree6eea2177e7026700814b0e820655ec77fb37ca8d /src/libstd/ffi
parent9f15631c36665911eb8e6f594ebcfe93e65a461c (diff)
downloadrust-2f703e4304c1c9b15c616b7a08bac581af5ab430.tar.gz
rust-2f703e4304c1c9b15c616b7a08bac581af5ab430.zip
Correct some stability versions
These were found by running tidy on stable versions of rust and finding
features stabilised with the wrong version numbers.
Diffstat (limited to 'src/libstd/ffi')
-rw-r--r--src/libstd/ffi/c_str.rs4
-rw-r--r--src/libstd/ffi/os_str.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
index 44b62593fa3..f40475a4142 100644
--- a/src/libstd/ffi/c_str.rs
+++ b/src/libstd/ffi/c_str.rs
@@ -419,14 +419,14 @@ impl<'a> From<&'a CStr> for Box<CStr> {
     }
 }
 
-#[stable(feature = "c_string_from_box", since = "1.17.0")]
+#[stable(feature = "c_string_from_box", since = "1.18.0")]
 impl From<Box<CStr>> for CString {
     fn from(s: Box<CStr>) -> CString {
         s.into_c_string()
     }
 }
 
-#[stable(feature = "box_from_c_string", since = "1.17.0")]
+#[stable(feature = "box_from_c_string", since = "1.18.0")]
 impl Into<Box<CStr>> for CString {
     fn into(self) -> Box<CStr> {
         self.into_boxed_c_str()
diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs
index b90192dd8af..eaf0502a577 100644
--- a/src/libstd/ffi/os_str.rs
+++ b/src/libstd/ffi/os_str.rs
@@ -529,14 +529,14 @@ impl<'a> From<&'a OsStr> for Box<OsStr> {
     }
 }
 
-#[stable(feature = "os_string_from_box", since = "1.17.0")]
+#[stable(feature = "os_string_from_box", since = "1.18.0")]
 impl<'a> From<Box<OsStr>> for OsString {
     fn from(boxed: Box<OsStr>) -> OsString {
         boxed.into_os_string()
     }
 }
 
-#[stable(feature = "box_from_c_string", since = "1.17.0")]
+#[stable(feature = "box_from_os_string", since = "1.18.0")]
 impl Into<Box<OsStr>> for OsString {
     fn into(self) -> Box<OsStr> {
         self.into_boxed_os_str()