about summary refs log tree commit diff
path: root/src/libstd/process.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-05-21 22:06:08 +0000
committerbors <bors@rust-lang.org>2017-05-21 22:06:08 +0000
commitf6cc40f16843cd733b1a93de1f3218e4faacaf50 (patch)
treeea810c7409fcfc928596eaef1925a988f451ae93 /src/libstd/process.rs
parent14f30da6132c25543da1f06c32a8c5699d3e5747 (diff)
parent7c2cd93b2bf3c84b97ea798617105a6f85529d23 (diff)
downloadrust-f6cc40f16843cd733b1a93de1f3218e4faacaf50.tar.gz
rust-f6cc40f16843cd733b1a93de1f3218e4faacaf50.zip
Auto merge of #41904 - sfackler:1.18-stabilization, r=alexcrichton
Stabilize library features for 1.18.0

Closes #38863
Closes #38980
Closes #38903
Closes #36648

r? @alexcrichton

@rust-lang/libs
Diffstat (limited to 'src/libstd/process.rs')
-rw-r--r--src/libstd/process.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index d0e7defbbbb..da64704efba 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -928,8 +928,6 @@ impl Child {
     /// Basic usage:
     ///
     /// ```no_run
-    /// #![feature(process_try_wait)]
-    ///
     /// use std::process::Command;
     ///
     /// let mut child = Command::new("ls").spawn().unwrap();
@@ -944,7 +942,7 @@ impl Child {
     ///     Err(e) => println!("error attempting to wait: {}", e),
     /// }
     /// ```
-    #[unstable(feature = "process_try_wait", issue = "38903")]
+    #[stable(feature = "process_try_wait", since = "1.18.0")]
     pub fn try_wait(&mut self) -> io::Result<Option<ExitStatus>> {
         Ok(self.handle.try_wait()?.map(ExitStatus))
     }