about summary refs log tree commit diff
path: root/src/libstd/sys/unix/timer.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-02 08:54:58 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-02 08:54:58 -0800
commit5696ea58946f077f815dc5f74b883cf948c7e1ea (patch)
tree0ecc90224cb9e0d68bf276ebd447d61a6bd72a59 /src/libstd/sys/unix/timer.rs
parent71b46b18a274edc7f7fb60b490e5ebbb9c911462 (diff)
parent76e3bc23388e268438e4318b0580149619a9d1ac (diff)
downloadrust-5696ea58946f077f815dc5f74b883cf948c7e1ea.tar.gz
rust-5696ea58946f077f815dc5f74b883cf948c7e1ea.zip
rollup merge of #20157: alexcrichton/issue-20068
Diffstat (limited to 'src/libstd/sys/unix/timer.rs')
-rw-r--r--src/libstd/sys/unix/timer.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/unix/timer.rs b/src/libstd/sys/unix/timer.rs
index c0ef89666c0..c9160a032ec 100644
--- a/src/libstd/sys/unix/timer.rs
+++ b/src/libstd/sys/unix/timer.rs
@@ -46,19 +46,19 @@
 //!
 //! Note that all time units in this file are in *milliseconds*.
 
+use prelude::v1::*;
 use self::Req::*;
 
+use comm::{mod, channel, Sender, Receiver};
+use io::IoResult;
 use libc;
 use mem;
 use os;
 use ptr;
 use sync::atomic;
-use comm;
 use sys::c;
 use sys::fs::FileDesc;
 use sys_common::helper_thread::Helper;
-use prelude::*;
-use io::IoResult;
 
 helper_init! { static HELPER: Helper<Req> }