about summary refs log tree commit diff
path: root/src/libstd/sys/unix/timer.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-11-17 11:22:00 +0000
committerbors <bors@rust-lang.org>2014-11-17 11:22:00 +0000
commit0047dbe59c41b951d34ce6324f3a8c0e15d523e9 (patch)
treee4f717adb4830ca6e737a23c81abbab3bb3a80b5 /src/libstd/sys/unix/timer.rs
parentedfb83c9e28df2a8f326d688f3d5b1f6faa72db8 (diff)
parentca08540a0039e827114752d11166ea8cb1387068 (diff)
downloadrust-0047dbe59c41b951d34ce6324f3a8c0e15d523e9.tar.gz
rust-0047dbe59c41b951d34ce6324f3a8c0e15d523e9.zip
auto merge of #19027 : nick29581/rust/coercions-4, r=alexcrichton
The forwards compatible parts of #18645, rebased. Converts implicit coercions from `[T, ..n]` to `&[T]` into explicit references.
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 a1e6ac3db7e..184ef3adce1 100644
--- a/src/libstd/sys/unix/timer.rs
+++ b/src/libstd/sys/unix/timer.rs
@@ -193,7 +193,7 @@ fn helper(input: libc::c_int, messages: Receiver<Req>, _: ()) {
 
                 // drain the file descriptor
                 let mut buf = [0];
-                assert_eq!(fd.read(buf).ok().unwrap(), 1);
+                assert_eq!(fd.read(&mut buf).ok().unwrap(), 1);
             }
 
             -1 if os::errno() == libc::EINTR as uint => {}