diff options
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/fs.rs | 36 | ||||
| -rw-r--r-- | src/libstd/io/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/native/file.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/native/process.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/net/ip.rs | 4 | ||||
| -rw-r--r-- | src/libstd/io/stdio.rs | 8 |
6 files changed, 27 insertions, 27 deletions
diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs index d1502df047e..a4be74d1d7f 100644 --- a/src/libstd/io/fs.rs +++ b/src/libstd/io/fs.rs @@ -678,7 +678,7 @@ impl path::Path { pub fn is_file(&self) -> bool { match io::result(|| self.stat()) { Ok(s) => s.kind == io::TypeFile, - Err(*) => false + Err(..) => false } } @@ -693,7 +693,7 @@ impl path::Path { pub fn is_dir(&self) -> bool { match io::result(|| self.stat()) { Ok(s) => s.kind == io::TypeDirectory, - Err(*) => false + Err(..) => false } } } @@ -1027,8 +1027,8 @@ mod test { let from = Path::new("test/nonexistent-bogus-path"); let to = Path::new("test/other-bogus-path"); match io::result(|| copy(&from, &to)) { - Ok(*) => fail!(), - Err(*) => { + Ok(..) => fail!(), + Err(..) => { assert!(!from.exists()); assert!(!to.exists()); } @@ -1054,7 +1054,7 @@ mod test { File::create(&out); match io::result(|| copy(&out, &*tmpdir)) { - Ok(*) => fail!(), Err(*) => {} + Ok(..) => fail!(), Err(..) => {} } }) @@ -1076,7 +1076,7 @@ mod test { let out = tmpdir.join("out"); match io::result(|| copy(&*tmpdir, &out)) { - Ok(*) => fail!(), Err(*) => {} + Ok(..) => fail!(), Err(..) => {} } assert!(!out.exists()); }) @@ -1121,8 +1121,8 @@ mod test { test!(fn readlink_not_symlink() { let tmpdir = tmpdir(); match io::result(|| readlink(&*tmpdir)) { - Ok(*) => fail!("wanted a failure"), - Err(*) => {} + Ok(..) => fail!("wanted a failure"), + Err(..) => {} } }) @@ -1142,13 +1142,13 @@ mod test { // can't link to yourself match io::result(|| link(&input, &input)) { - Ok(*) => fail!("wanted a failure"), - Err(*) => {} + Ok(..) => fail!("wanted a failure"), + Err(..) => {} } // can't link to something that doesn't exist match io::result(|| link(&tmpdir.join("foo"), &tmpdir.join("bar"))) { - Ok(*) => fail!("wanted a failure"), - Err(*) => {} + Ok(..) => fail!("wanted a failure"), + Err(..) => {} } }) @@ -1162,8 +1162,8 @@ mod test { assert!(stat(&file).perm & io::UserWrite == 0); match io::result(|| chmod(&tmpdir.join("foo"), io::UserRWX)) { - Ok(*) => fail!("wanted a failure"), - Err(*) => {} + Ok(..) => fail!("wanted a failure"), + Err(..) => {} } chmod(&file, io::UserFile); @@ -1218,7 +1218,7 @@ mod test { match io::result(|| File::open_mode(&tmpdir.join("a"), io::Open, io::Read)) { - Ok(*) => fail!(), Err(*) => {} + Ok(..) => fail!(), Err(..) => {} } File::open_mode(&tmpdir.join("b"), io::Open, io::Write).unwrap(); File::open_mode(&tmpdir.join("c"), io::Open, io::ReadWrite).unwrap(); @@ -1233,7 +1233,7 @@ mod test { let mut f = File::open_mode(&tmpdir.join("h"), io::Open, io::Read).unwrap(); match io::result(|| f.write("wut".as_bytes())) { - Ok(*) => fail!(), Err(*) => {} + Ok(..) => fail!(), Err(..) => {} } } assert_eq!(stat(&tmpdir.join("h")).size, 3); @@ -1267,8 +1267,8 @@ mod test { let tmpdir = tmpdir(); match io::result(|| change_file_times(&tmpdir.join("a"), 100, 200)) { - Ok(*) => fail!(), - Err(*) => {} + Ok(..) => fail!(), + Err(..) => {} } } } diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 8cc4e7b389b..8b680020fd9 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1047,7 +1047,7 @@ pub trait Buffer: Reader { let mut buf = [0, ..4]; match self.read(buf.mut_slice_to(width)) { Some(n) if n == width => {} - Some(*) | None => return None // read error + Some(..) | None => return None // read error } match str::from_utf8_slice_opt(buf.slice_to(width)) { Some(s) => Some(s.char_at(0)), 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, diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs index e089628b9c7..6a97a21673d 100644 --- a/src/libstd/io/net/ip.rs +++ b/src/libstd/io/net/ip.rs @@ -56,8 +56,8 @@ pub struct SocketAddr { impl ToStr for SocketAddr { fn to_str(&self) -> ~str { match self.ip { - Ipv4Addr(*) => format!("{}:{}", self.ip.to_str(), self.port), - Ipv6Addr(*) => format!("[{}]:{}", self.ip.to_str(), self.port), + Ipv4Addr(..) => format!("{}:{}", self.ip.to_str(), self.port), + Ipv6Addr(..) => format!("[{}]:{}", self.ip.to_str(), self.port), } } } diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs index 2aa8b0c7ed6..fe0385c9a95 100644 --- a/src/libstd/io/stdio.rs +++ b/src/libstd/io/stdio.rs @@ -247,7 +247,7 @@ impl StdWriter { } } } - File(*) => { + File(..) => { io_error::cond.raise(IoError { kind: OtherIoError, desc: "stream is not a tty", @@ -273,7 +273,7 @@ impl StdWriter { Err(e) => io_error::cond.raise(e), } } - File(*) => { + File(..) => { io_error::cond.raise(IoError { kind: OtherIoError, desc: "stream is not a tty", @@ -286,8 +286,8 @@ impl StdWriter { /// Returns whether this stream is attached to a TTY instance or not. pub fn isatty(&self) -> bool { match self.inner { - TTY(*) => true, - File(*) => false, + TTY(..) => true, + File(..) => false, } } } |