about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-05-07 10:21:19 +0000
committerbors <bors@rust-lang.org>2015-05-07 10:21:19 +0000
commitacb3aa0949f846ee315568e34d5796fb746c07e8 (patch)
treeb1ac42dd7d982f7a878e1bb0856795f86c3fb92a /src/libstd
parent95607544b6b59f88f838a9050a126149b4570049 (diff)
parent5ac5203e6e136507b63e451c32127bd9f23edd8a (diff)
downloadrust-acb3aa0949f846ee315568e34d5796fb746c07e8.tar.gz
rust-acb3aa0949f846ee315568e34d5796fb746c07e8.zip
Auto merge of #25175 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #24576, #24966, #25052, #25131, #25137, #25138, #25139, #25141, #25142, #25144, #25146, #25148, #25154, #25156, #25160, #25173
- Failed merges: 
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/sys/unix/process2.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/process2.rs b/src/libstd/sys/unix/process2.rs
index 4e7c4d241f5..6f3c0fd63aa 100644
--- a/src/libstd/sys/unix/process2.rs
+++ b/src/libstd/sys/unix/process2.rs
@@ -328,7 +328,7 @@ impl Process {
         }) {
             Ok(0) => None,
             Ok(n) if n == self.pid => Some(translate_status(status)),
-            Ok(n) => panic!("unkown pid: {}", n),
+            Ok(n) => panic!("unknown pid: {}", n),
             Err(e) => panic!("unknown waitpid error: {}", e),
         }
     }