Auto merge of #23512 - oli-obk:result_ok_unwrap, r=alexcrichton

[rust.git] / src / libstd / sys / unix / timer.rs

diff --git a/src/libstd/sys/unix/timer.rs b/src/libstd/sys/unix/timer.rs
index ef175d68fc43fa9966dfa01c7b5cab6c4e690590..b6d2aca9a52365a4eed5a3d66bea8e920f06ad7e 100644 (file)
--- a/src/libstd/sys/unix/timer.rs
+++ b/src/libstd/sys/unix/timer.rs
@@ -204,7 +204,7 @@ fn signal(active: &mut Vec<Box<Inner>>,
 
                 // 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 => {}