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-03 23:05:07 +0000
committerbors <bors@rust-lang.org>2017-05-03 23:05:07 +0000
commitb16c7a235fa0f57fed6b7ec13ffd3cff1bcdd9ad (patch)
treee8fa6a2c0127f43d06a1e4fe7788c3cce852fab0 /src/libstd/process.rs
parent2d4ed8e0cbe2c5f3763273a5d8f6b15119473ba7 (diff)
parente20b2823303ddb145ce58286abeb67d4c017ccf0 (diff)
downloadrust-b16c7a235fa0f57fed6b7ec13ffd3cff1bcdd9ad.tar.gz
rust-b16c7a235fa0f57fed6b7ec13ffd3cff1bcdd9ad.zip
Auto merge of #41735 - frewsxcv:rollup, r=frewsxcv
Rollup of 6 pull requests

- Successful merges: #41543, #41600, #41715, #41720, #41721, #41730
- Failed merges:
Diffstat (limited to 'src/libstd/process.rs')
-rw-r--r--src/libstd/process.rs10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index 23ebeb4b8e3..3896fc20a2d 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -148,8 +148,9 @@ impl fmt::Debug for Child {
     }
 }
 
-/// A handle to a child process's stdin. This struct is used in the [`stdin`]
-/// field on [`Child`].
+/// A handle to a child process's stdin.
+///
+/// This struct is used in the [`stdin`] field on [`Child`].
 ///
 /// [`Child`]: struct.Child.html
 /// [`stdin`]: struct.Child.html#structfield.stdin
@@ -190,8 +191,9 @@ impl fmt::Debug for ChildStdin {
     }
 }
 
-/// A handle to a child process's stdout. This struct is used in the [`stdout`]
-/// field on [`Child`].
+/// A handle to a child process's stdout.
+///
+/// This struct is used in the [`stdout`] field on [`Child`].
 ///
 /// [`Child`]: struct.Child.html
 /// [`stdout`]: struct.Child.html#structfield.stdout