about summary refs log tree commit diff
path: root/src/libstd/ffi
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-06-28 11:55:37 +0000
committerbors <bors@rust-lang.org>2017-06-28 11:55:37 +0000
commitc16930762a4a7762b26579f7d44273d3bab4c11e (patch)
tree06bb0b0d660adb3cca26948a5a17bd8742f702f6 /src/libstd/ffi
parent6b52a1162eff2469c0da88300577863e5cc0c78f (diff)
parent143206d54d7558c2326212df99efc98110904fdb (diff)
downloadrust-c16930762a4a7762b26579f7d44273d3bab4c11e.tar.gz
rust-c16930762a4a7762b26579f7d44273d3bab4c11e.zip
Auto merge of #42745 - sfackler:1.19-stabilization, r=alexcrichton
1.19 stabilization

r? @alexcrichton
Diffstat (limited to 'src/libstd/ffi')
-rw-r--r--src/libstd/ffi/os_str.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs
index e9296f33b9e..42d641706a8 100644
--- a/src/libstd/ffi/os_str.rs
+++ b/src/libstd/ffi/os_str.rs
@@ -230,8 +230,6 @@ impl OsString {
     /// # Examples
     ///
     /// ```
-    /// #![feature(osstring_shrink_to_fit)]
-    ///
     /// use std::ffi::OsString;
     ///
     /// let mut s = OsString::from("foo");
@@ -242,7 +240,7 @@ impl OsString {
     /// s.shrink_to_fit();
     /// assert_eq!(3, s.capacity());
     /// ```
-    #[unstable(feature = "osstring_shrink_to_fit", issue = "40421")]
+    #[stable(feature = "osstring_shrink_to_fit", since = "1.19.0")]
     pub fn shrink_to_fit(&mut self) {
         self.inner.shrink_to_fit()
     }