about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-05-02 14:56:11 +0000
committerbors <bors@rust-lang.org>2017-05-02 14:56:11 +0000
commited1f26ddda15b2bcf613a257e813e8b02ee14dff (patch)
tree4bc9cd842d2113827d984404610e91f183dd62bd /src/libstd
parent96e2c34286099eea4f51daaadbb82a8fbe99e0f6 (diff)
parente0bfd19add662c07eb102818ce579315ddc90094 (diff)
downloadrust-ed1f26ddda15b2bcf613a257e813e8b02ee14dff.tar.gz
rust-ed1f26ddda15b2bcf613a257e813e8b02ee14dff.zip
Auto merge of #41702 - frewsxcv:rollup, r=frewsxcv
Rollup of 6 pull requests

- Successful merges: #41661, #41662, #41673, #41688, #41692, #41693
- Failed merges:
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/process.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index 4ec9076de61..23ebeb4b8e3 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -1035,7 +1035,7 @@ impl Child {
 /// ```no_run
 /// use std::process;
 ///
-/// process::exit(0x0f00);
+/// process::exit(0x0100);
 /// ```
 ///
 /// [platform-specific behavior]: #platform-specific-behavior