about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-04-20 17:33:58 +0000
committerbors <bors@rust-lang.org>2017-04-20 17:33:58 +0000
commitddc5d7bd4b9ea3e8a8ccf82cb443e950be311d61 (patch)
tree094738d887f663dcad286b3d9b16804ff4a7afbc /src/libstd
parent968ae7babecfc6c62ef9699ff052d9ab00411848 (diff)
parent9d918223a8c741e153cd3cf373a5920f7ea0dadc (diff)
downloadrust-ddc5d7bd4b9ea3e8a8ccf82cb443e950be311d61.tar.gz
rust-ddc5d7bd4b9ea3e8a8ccf82cb443e950be311d61.zip
Auto merge of #41424 - frewsxcv:rollup, r=frewsxcv
Rollup of 2 pull requests

- Successful merges: #40812, #40987
- Failed merges:
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/process.rs20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index 3795c42f5ef..4ec9076de61 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -73,6 +73,15 @@ use sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
 /// spawning process and can itself be constructed using a builder-style
 /// interface.
 ///
+/// There is no implementation of [`Drop`] for child processes,
+/// so if you do not ensure the `Child` has exited then it will continue to
+/// run, even after the `Child` handle to the child process has gone out of
+/// scope.
+///
+/// Calling [`wait`](#method.wait) (or other functions that wrap around it) will make
+/// the parent process wait until the child has actually exited before
+/// continuing.
+///
 /// # Examples
 ///
 /// ```should_panic
@@ -89,17 +98,6 @@ use sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
 /// assert!(ecode.success());
 /// ```
 ///
-/// # Note
-///
-/// Take note that there is no implementation of [`Drop`] for child processes,
-/// so if you do not ensure the `Child` has exited then it will continue to
-/// run, even after the `Child` handle to the child process has gone out of
-/// scope.
-///
-/// Calling [`wait`][`wait`] (or other functions that wrap around it) will make
-/// the parent process wait until the child has actually exited before
-/// continuing.
-///
 /// [`Command`]: struct.Command.html
 /// [`Drop`]: ../../core/ops/trait.Drop.html
 /// [`wait`]: #method.wait