diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-11-04 18:12:32 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-11-04 18:12:32 -0700 |
| commit | ffae1104989c0177b483d591a482e5cd877183c2 (patch) | |
| tree | 12f36afcf90ee22be0bfc41906bd628d0f07c6fa /components/util/time.rs | |
| parent | e483a189a3c24d0fe475cf2a8dedb11821f7ee21 (diff) | |
| parent | 10f7b49cf7dc8f77cf70750927a2c85650312033 (diff) | |
| download | servo-ffae1104989c0177b483d591a482e5cd877183c2.tar.gz servo-ffae1104989c0177b483d591a482e5cd877183c2.zip | |
auto merge of #3761 : pcwalton/servo/smooth-scrolling, r=larsbergstrom
r? @glennw @mbrubeck
Diffstat (limited to 'components/util/time.rs')
| -rw-r--r-- | components/util/time.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/util/time.rs b/components/util/time.rs index 232e73b3802..b4a60da36ef 100644 --- a/components/util/time.rs +++ b/components/util/time.rs @@ -4,13 +4,13 @@ //! Timing functions. -use std_time::precise_time_ns; use collections::treemap::TreeMap; use std::comm::{Sender, channel, Receiver}; use std::f64; -use std::iter::AdditiveIterator; use std::io::timer::sleep; +use std::iter::AdditiveIterator; use std::time::duration::Duration; +use std_time::precise_time_ns; use task::{spawn_named}; use url::Url; |