about summary refs log tree commit diff
path: root/src/libstd/sys/unix/timer.rs
diff options
context:
space:
mode:
authorOliver Schneider <git1984941651981@oli-obk.de>2015-03-20 08:19:13 +0100
committerOliver Schneider <git1984941651981@oli-obk.de>2015-03-20 08:19:13 +0100
commitb4a1e59146c70a12d8c4c1f85c08a2ecf9fb3d2e (patch)
tree7b986ee36f81d3566200a9acda28c20b5921e032 /src/libstd/sys/unix/timer.rs
parent0084f92302b3352372bfd14ebbf083bae695d16e (diff)
downloadrust-b4a1e59146c70a12d8c4c1f85c08a2ecf9fb3d2e.tar.gz
rust-b4a1e59146c70a12d8c4c1f85c08a2ecf9fb3d2e.zip
don't use Result::ok just to be able to use unwrap/unwrap_or
Diffstat (limited to 'src/libstd/sys/unix/timer.rs')
-rw-r--r--src/libstd/sys/unix/timer.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/timer.rs b/src/libstd/sys/unix/timer.rs
index ef0274fdda9..c830eb91068 100644
--- a/src/libstd/sys/unix/timer.rs
+++ b/src/libstd/sys/unix/timer.rs
@@ -197,7 +197,7 @@ fn helper(input: libc::c_int, messages: Receiver<Req>, _: ()) {
 
                 // drain the file descriptor
                 let mut buf = [0];
-                assert_eq!(fd.read(&mut buf).ok().unwrap(), 1);
+                assert_eq!(fd.read(&mut buf).unwrap(), 1);
             }
 
             -1 if os::errno() == libc::EINTR as i32 => {}