diff options
| author | Corey Farwell <coreyf@rwell.org> | 2016-05-06 19:32:18 -0400 |
|---|---|---|
| committer | Corey Farwell <coreyf@rwell.org> | 2016-05-09 08:40:57 -0400 |
| commit | 62b19c627ebde2bbfa6021de146c502124da7975 (patch) | |
| tree | 1dddc25ccb212bba5ceb77a9613bee56368082af /src/libstd | |
| parent | 50909f2d5036e59871f779500dd722a62421c13c (diff) | |
| download | rust-62b19c627ebde2bbfa6021de146c502124da7975.tar.gz rust-62b19c627ebde2bbfa6021de146c502124da7975.zip | |
Utilize `Result::unwrap_err` in more places.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/fs.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/buffered.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/mod.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index 03ebaa59ca5..c19fe1e1d26 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -1772,7 +1772,7 @@ mod tests { let tmpdir = tmpdir(); let dir = &tmpdir.join("mkdir_error_twice"); check!(fs::create_dir(dir)); - let e = fs::create_dir(dir).err().unwrap(); + let e = fs::create_dir(dir).unwrap_err(); assert_eq!(e.kind(), ErrorKind::AlreadyExists); } diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index 632ef3db804..a92ca95f4ee 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -1127,7 +1127,7 @@ mod tests { let mut writer = BufWriter::new(PanicWriter); let _ = writer.write(b"hello world"); let _ = writer.flush(); - }).join().err().unwrap(); + }).join().unwrap_err(); assert_eq!(WRITES.load(Ordering::SeqCst), 1); } diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index dbcc2bc95bc..63b659d8db3 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -535,7 +535,7 @@ impl<T> Sender<T> { /// /// // This send will fail because the receiver is gone /// drop(rx); - /// assert_eq!(tx.send(1).err().unwrap().0, 1); + /// assert_eq!(tx.send(1).unwrap_err().0, 1); /// ``` #[stable(feature = "rust1", since = "1.0.0")] pub fn send(&self, t: T) -> Result<(), SendError<T>> { |
