diff options
| author | bors <bors@rust-lang.org> | 2013-11-28 20:31:39 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-11-28 20:31:39 -0800 |
| commit | bf6964ecb67f4ffce6be75130ab7a3be793960ff (patch) | |
| tree | ddf8aabea4d05b3ae0cb977cc1a466526f871b06 /src/libstd/io/native | |
| parent | 90d06ecf6b26e949921778f0d479ea1532077200 (diff) | |
| parent | ab387a68388974a432951e806851936898907fd0 (diff) | |
| download | rust-bf6964ecb67f4ffce6be75130ab7a3be793960ff.tar.gz rust-bf6964ecb67f4ffce6be75130ab7a3be793960ff.zip | |
auto merge of #10709 : alexcrichton/rust/snapshot, r=pcwalton
Diffstat (limited to 'src/libstd/io/native')
| -rw-r--r-- | src/libstd/io/native/file.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/native/process.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/io/native/file.rs b/src/libstd/io/native/file.rs index 9dd6daf66e9..218040b72d6 100644 --- a/src/libstd/io/native/file.rs +++ b/src/libstd/io/native/file.rs @@ -114,7 +114,7 @@ impl FileDesc { impl io::Reader for FileDesc { fn read(&mut self, buf: &mut [u8]) -> Option<uint> { - match self.inner_read(buf) { Ok(n) => Some(n), Err(*) => None } + match self.inner_read(buf) { Ok(n) => Some(n), Err(..) => None } } fn eof(&mut self) -> bool { false } } diff --git a/src/libstd/io/native/process.rs b/src/libstd/io/native/process.rs index 038b6ec0ff2..1b614852737 100644 --- a/src/libstd/io/native/process.rs +++ b/src/libstd/io/native/process.rs @@ -129,7 +129,7 @@ impl rtio::RtioProcess for Process { // and we kill it, then on unix we might ending up killing a // newer process that happens to have the same (re-used) id match self.exit_code { - Some(*) => return Err(io::IoError { + Some(..) => return Err(io::IoError { kind: io::OtherIoError, desc: "can't kill an exited process", detail: None, |
