diff options
author | Carl Lerche <me@carllerche.com> | 2019-11-06 23:53:46 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-06 23:53:46 -0800 |
commit | 7e35922a1d282b1e3dadf037cd237be336b331fb (patch) | |
tree | e82a816ee44f6c333a32f263940e80a1c1680943 | |
parent | 4dbe6af0a1a1c8e579b92ec8ffc1d419244e0944 (diff) |
time: rename `tokio::timer` -> `tokio::time` (#1745)
-rw-r--r-- | tokio-test/src/clock.rs | 13 | ||||
-rw-r--r-- | tokio-test/src/io.rs | 2 | ||||
-rw-r--r-- | tokio-test/tests/block_on.rs | 2 | ||||
-rw-r--r-- | tokio-test/tests/clock.rs | 2 | ||||
-rw-r--r-- | tokio/Cargo.toml | 8 | ||||
-rw-r--r-- | tokio/src/clock.rs | 14 | ||||
-rw-r--r-- | tokio/src/future.rs | 8 | ||||
-rw-r--r-- | tokio/src/lib.rs | 7 | ||||
-rw-r--r-- | tokio/src/runtime/builder.rs | 4 | ||||
-rw-r--r-- | tokio/src/runtime/timer.rs | 6 | ||||
-rw-r--r-- | tokio/src/stream.rs | 10 | ||||
-rw-r--r-- | tokio/src/time/atomic.rs (renamed from tokio/src/timer/atomic.rs) | 0 | ||||
-rw-r--r-- | tokio/src/time/clock/mod.rs (renamed from tokio/src/timer/clock/mod.rs) | 2 | ||||
-rw-r--r-- | tokio/src/time/clock/now.rs (renamed from tokio/src/timer/clock/now.rs) | 0 | ||||
-rw-r--r-- | tokio/src/time/deadline.rs (renamed from tokio/src/timer/deadline.rs) | 0 | ||||
-rw-r--r-- | tokio/src/time/delay.rs (renamed from tokio/src/timer/delay.rs) | 2 | ||||
-rw-r--r-- | tokio/src/time/delay_queue.rs (renamed from tokio/src/timer/delay_queue.rs) | 43 | ||||
-rw-r--r-- | tokio/src/time/error.rs (renamed from tokio/src/timer/error.rs) | 0 | ||||
-rw-r--r-- | tokio/src/time/interval.rs (renamed from tokio/src/timer/interval.rs) | 6 | ||||
-rw-r--r-- | tokio/src/time/mod.rs (renamed from tokio/src/timer/mod.rs) | 10 | ||||
-rw-r--r-- | tokio/src/time/throttle.rs (renamed from tokio/src/timer/throttle.rs) | 2 | ||||
-rw-r--r-- | tokio/src/time/timeout.rs (renamed from tokio/src/timer/timeout.rs) | 6 | ||||
-rw-r--r-- | tokio/src/time/timer/atomic_stack.rs (renamed from tokio/src/timer/timer/atomic_stack.rs) | 4 | ||||
-rw-r--r-- | tokio/src/time/timer/entry.rs (renamed from tokio/src/timer/timer/entry.rs) | 6 | ||||
-rw-r--r-- | tokio/src/time/timer/handle.rs (renamed from tokio/src/timer/timer/handle.rs) | 6 | ||||
-rw-r--r-- | tokio/src/time/timer/mod.rs (renamed from tokio/src/timer/timer/mod.rs) | 16 | ||||
-rw-r--r-- | tokio/src/time/timer/now.rs (renamed from tokio/src/timer/timer/now.rs) | 0 | ||||
-rw-r--r-- | tokio/src/time/timer/registration.rs (renamed from tokio/src/timer/timer/registration.rs) | 6 | ||||
-rw-r--r-- | tokio/src/time/timer/stack.rs (renamed from tokio/src/timer/timer/stack.rs) | 4 | ||||
-rw-r--r-- | tokio/src/time/wheel/level.rs (renamed from tokio/src/timer/wheel/level.rs) | 2 | ||||
-rw-r--r-- | tokio/src/time/wheel/mod.rs (renamed from tokio/src/timer/wheel/mod.rs) | 0 | ||||
-rw-r--r-- | tokio/src/time/wheel/stack.rs (renamed from tokio/src/timer/wheel/stack.rs) | 0 | ||||
-rw-r--r-- | tokio/tests/clock.rs | 6 | ||||
-rw-r--r-- | tokio/tests/rt_common.rs | 6 | ||||
-rw-r--r-- | tokio/tests/timer_clock.rs | 4 | ||||
-rw-r--r-- | tokio/tests/timer_delay.rs | 4 | ||||
-rw-r--r-- | tokio/tests/timer_hammer.rs | 2 | ||||
-rw-r--r-- | tokio/tests/timer_interval.rs | 2 | ||||
-rw-r--r-- | tokio/tests/timer_queue.rs | 2 | ||||
-rw-r--r-- | tokio/tests/timer_rt.rs | 4 | ||||
-rw-r--r-- | tokio/tests/timer_throttle.rs | 2 | ||||
-rw-r--r-- | tokio/tests/timer_timeout.rs | 2 |
42 files changed, 101 insertions, 124 deletions
diff --git a/tokio-test/src/clock.rs b/tokio-test/src/clock.rs index 38417539..d2f29249 100644 --- a/tokio-test/src/clock.rs +++ b/tokio-test/src/clock.rs @@ -1,10 +1,9 @@ -//! A mocked clock for use with `tokio::timer` based futures. +//! A mocked clock for use with `tokio::time` based futures. //! //! # Example //! //! ``` -//! use tokio::clock; -//! use tokio::timer::delay; +//! use tokio::time::{clock, delay}; //! use tokio_test::{assert_ready, assert_pending, task}; //! //! use std::time::Duration; @@ -23,8 +22,8 @@ //! ``` use tokio::runtime::{Park, Unpark}; -use tokio::timer::clock::{Clock, Now}; -use tokio::timer::Timer; +use tokio::time::clock::{Clock, Now}; +use tokio::time::Timer; use std::marker::PhantomData; use std::rc::Rc; @@ -125,13 +124,13 @@ impl MockClock { where F: FnOnce(&mut Handle) -> R, { - tokio::timer::clock::with_default(&self.clock, || { + tokio::time::clock::with_default(&self.clock, || { let park = self.time.mock_park(); let timer = Timer::new(park); let handle = timer.handle(); let time = self.time.clone(); - let _timer = tokio::timer::set_default(&handle); + let _timer = tokio::time::set_default(&handle); let mut handle = Handle::new(timer, time); f(&mut handle) // lazy(|| Ok::<_, ()>(f(&mut handle))).wait().unwrap() diff --git a/tokio-test/src/io.rs b/tokio-test/src/io.rs index afd1c423..a073193c 100644 --- a/tokio-test/src/io.rs +++ b/tokio-test/src/io.rs @@ -18,7 +18,7 @@ use tokio::io::{AsyncRead, AsyncWrite}; use tokio::sync::mpsc; -use tokio::timer::{clock, timer, Delay}; +use tokio::time::{clock, timer, Delay}; use bytes::Buf; use futures_core::ready; diff --git a/tokio-test/tests/block_on.rs b/tokio-test/tests/block_on.rs index 6d5f481a..c361d500 100644 --- a/tokio-test/tests/block_on.rs +++ b/tokio-test/tests/block_on.rs @@ -1,6 +1,6 @@ #![warn(rust_2018_idioms)] -use tokio::timer::delay; +use tokio::time::delay; use tokio_test::block_on; use std::time::{Duration, Instant}; diff --git a/tokio-test/tests/clock.rs b/tokio-test/tests/clock.rs index abb61e23..d9d2fcfc 100644 --- a/tokio-test/tests/clock.rs +++ b/tokio-test/tests/clock.rs @@ -1,6 +1,6 @@ #![warn(rust_2018_idioms)] -use tokio::timer::delay; +use tokio::time::delay; use tokio_test::clock::MockClock; use tokio_test::task; use tokio_test::{assert_pending, assert_ready}; diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 58d7cecc..df284172 100644 --- a/tokio/Cargo.toml +++ b/tokio/Cargo.toml @@ -33,7 +33,7 @@ default = [ "rt-full", "signal", "sync", - "timer", + "time", ] executor-core = [] @@ -47,7 +47,7 @@ net-full = ["tcp", "udp", "uds"] net-driver = ["io-traits", "mio", "blocking", "lazy_static"] rt-current-thread = [ "executor-core", - "timer", + "time", "sync", "net-driver", ] @@ -58,7 +58,7 @@ rt-full = [ "net-full", "rt-current-thread", "sync", - "timer", + "time", ] signal = [ "lazy_static", @@ -71,7 +71,7 @@ signal = [ ] sync = ["fnv"] tcp = ["io", "net-driver"] -timer = ["executor-core", "sync", "slab"] +time = ["executor-core", "sync", "slab"] udp = ["io", "net-driver"] uds = ["io", "net-driver", "mio-uds", "libc"] process = [ diff --git a/tokio/src/clock.rs b/tokio/src/clock.rs deleted file mode 100644 index d574af85..00000000 --- a/tokio/src/clock.rs +++ /dev/null @@ -1,14 +0,0 @@ -//! A configurable source of time. -//! -//! This module provides the [`now`][n] function, which returns an `Instant` -//! representing "now". The source of time used by this function is configurable -//! and allows mocking out the source of time in tests or performing caching -//! operations to reduce the number of syscalls. -//! -//! Note that, because the source of time is configurable, it is possible to -//! observe non-monotonic behavior when calling [`now`][n] from different -//! executors. -//! -//! [n]: fn.now.html - -pub use crate::timer::clock::now; diff --git a/tokio/src/future.rs b/tokio/src/future.rs index 2a714a3e..f6b7e4a7 100644 --- a/tokio/src/future.rs +++ b/tokio/src/future.rs @@ -1,9 +1,9 @@ //! Asynchronous values. -#[cfg(feature = "timer")] -use crate::timer::Timeout; +#[cfg(feature = "time")] +use crate::time::Timeout; -#[cfg(feature = "timer")] +#[cfg(feature = "time")] use std::time::Duration; #[doc(inline)] @@ -57,7 +57,7 @@ pub trait FutureExt: Future { /// } /// # } /// ``` - #[cfg(feature = "timer")] + #[cfg(feature = "time")] fn timeout(self, timeout: Duration) -> Timeout<Self> where Self: Sized, diff --git a/tokio/src/lib.rs b/tokio/src/lib.rs index b7b99ac6..8f9736ea 100644 --- a/tokio/src/lib.rs +++ b/tokio/src/lib.rs @@ -85,9 +85,6 @@ macro_rules! thread_local { ($($tts:tt)+) => { loom::thread_local!{ $($tts)+ } } } -#[cfg(feature = "timer")] -pub mod clock; - #[cfg(feature = "fs")] pub mod fs; @@ -117,8 +114,8 @@ pub mod stream; #[cfg(feature = "sync")] pub mod sync; -#[cfg(feature = "timer")] -pub mod timer; +#[cfg(feature = "time")] +pub mod time; #[cfg(feature = "rt-full")] mod util; diff --git a/tokio/src/runtime/builder.rs b/tokio/src/runtime/builder.rs index 6081c10e..3a81af3e 100644 --- a/tokio/src/runtime/builder.rs +++ b/tokio/src/runtime/builder.rs @@ -22,7 +22,7 @@ use std::fmt; /// /// ``` /// use tokio::runtime::Builder; -/// use tokio::timer::clock::Clock; +/// use tokio::time::clock::Clock; /// /// fn main() { /// // build Runtime @@ -324,7 +324,7 @@ impl Builder { #[cfg(feature = "rt-full")] fn build_threadpool(&mut self) -> io::Result<Runtime> { use crate::runtime::{Kind, ThreadPool}; - use crate::timer::clock; + use crate::time::clock; use std::sync::Mutex; let mut net_handles = Vec::new(); diff --git a/tokio/src/runtime/timer.rs b/tokio/src/runtime/timer.rs index 987324cd..03e501ce 100644 --- a/tokio/src/runtime/timer.rs +++ b/tokio/src/runtime/timer.rs @@ -1,9 +1,9 @@ pub(crate) use self::variant::*; -#[cfg(feature = "timer")] +#[cfg(feature = "time")] mod variant { use crate::runtime::io; - use crate::timer::{clock, timer}; + use crate::time::{clock, timer}; pub(crate) type Clock = clock::Clock; pub(crate) type Driver = timer::Timer<io::Driver>; @@ -23,7 +23,7 @@ mod variant { } } -#[cfg(not(feature = "timer"))] +#[cfg(not(feature = "time"))] mod variant { use crate::runtime::io; diff --git a/tokio/src/stream.rs b/tokio/src/stream.rs index e4f5a1b1..0a597a58 100644 --- a/tokio/src/stream.rs +++ b/tokio/src/stream.rs @@ -1,10 +1,10 @@ //! A sequence of asynchronous values. -#[cfg(feature = "timer")] +#[cfg(feature = "time")] use std::time::Duration; -#[cfg(feature = "timer")] -use crate::timer::{throttle::Throttle, Timeout}; +#[cfg(feature = "time")] +use crate::time::{throttle::Throttle, Timeout}; #[doc(inline)] pub use futures_core::Stream; @@ -29,7 +29,7 @@ pub trait StreamExt: Stream { /// Throttle down the stream by enforcing a fixed delay between items. /// /// Errors are also delayed. - #[cfg(feature = "timer")] + #[cfg(feature = "time")] fn throttle(self, duration: Duration) -> Throttle<Self> where Self: Sized, @@ -66,7 +66,7 @@ pub trait StreamExt: Stream { /// } /// # } /// ``` - #[cfg(feature = "timer")] + #[cfg(feature = "time")] fn timeout(self, timeout: Duration) -> Timeout<Self> where Self: Sized, diff --git a/tokio/src/timer/atomic.rs b/tokio/src/time/atomic.rs index 206954fc..206954fc 100644 --- a/tokio/src/timer/atomic.rs +++ b/tokio/src/time/atomic.rs diff --git a/tokio/src/timer/clock/mod.rs b/tokio/src/time/clock/mod.rs index df2f2133..17cbe2f9 100644 --- a/tokio/src/timer/clock/mod.rs +++ b/tokio/src/time/clock/mod.rs @@ -56,7 +56,7 @@ thread_local! { /// # Examples /// /// ``` -/// # use tokio::timer::clock; +/// # use tokio::time::clock; /// let now = clock::now(); /// ``` pub fn now() -> Instant { diff --git a/tokio/src/timer/clock/now.rs b/tokio/src/time/clock/now.rs index f6b11b70..f6b11b70 100644 --- a/tokio/src/timer/clock/now.rs +++ b/tokio/src/time/clock/now.rs diff --git a/tokio/src/timer/deadline.rs b/tokio/src/time/deadline.rs index 9df67da6..9df67da6 100644 --- a/tokio/src/timer/deadline.rs +++ b/tokio/src/time/deadline.rs diff --git a/tokio/src/timer/delay.rs b/tokio/src/time/delay.rs index a4e9e325..e79f9c34 100644 --- a/tokio/src/timer/delay.rs +++ b/tokio/src/time/delay.rs @@ -1,4 +1,4 @@ -use crate::timer::timer::{HandlePriv, Registration}; +use crate::time::timer::{HandlePriv, Registration}; use futures_core::ready; use std::future::Future; diff --git a/tokio/src/timer/delay_queue.rs b/tokio/src/time/delay_queue.rs index 70cc74e5..38d04940 100644 --- a/tokio/src/timer/delay_queue.rs +++ b/tokio/src/time/delay_queue.rs @@ -4,10 +4,10 @@ //! //! [`DelayQueue`]: struct.DelayQueue.html -use crate::timer::clock::now; -use crate::timer::timer::Handle; -use crate::timer::wheel::{self, Wheel}; -use crate::timer::{Delay, Error}; +use crate::time::clock::now; +use crate::time::timer::Handle; +use crate::time::wheel::{self, Wheel}; +use crate::time::{Delay, Error}; use futures_core::ready; use slab::Slab; @@ -70,7 +70,7 @@ use std::time::{Duration, Instant}; /// Using `DelayQueue` to manage cache entries. /// /// ```rust,no_run -/// use tokio::timer::{delay_queue, DelayQueue, Error}; +/// use tokio::time::{delay_queue, DelayQueue, Error}; /// /// use futures_core::ready; /// use std::collections::HashMap; @@ -217,7 +217,7 @@ impl<T> DelayQueue<T> { /// # Examples /// /// ```rust - /// # use tokio::timer::DelayQueue; + /// # use tokio::time::DelayQueue; /// let delay_queue: DelayQueue<u32> = DelayQueue::new(); /// ``` pub fn new() -> DelayQueue<T> { @@ -231,8 +231,8 @@ impl<T> DelayQueue<T> { /// # Examples /// /// ```rust,no_run - /// # use tokio::timer::DelayQueue; - /// use tokio::timer::timer::Handle; + /// # use tokio::time::DelayQueue; + /// use tokio::time::timer::Handle; /// /// let handle = Handle::default(); /// let delay_queue: DelayQueue<u32> = DelayQueue::with_capacity_and_handle(0, &handle); @@ -258,7 +258,7 @@ impl<T> DelayQueue<T> { /// # Examples /// /// ```rust - /// # use tokio::timer::DelayQueue; + /// # use tokio::time::DelayQueue; /// # use std::time::Duration; /// let mut delay_queue = DelayQueue::with_capacity(10); /// @@ -302,7 +302,7 @@ impl<T> DelayQueue<T> { /// Basic usage /// /// ```rust - /// use tokio::timer::DelayQueue; + /// use tokio::time::DelayQueue; /// use std::time::{Instant, Duration}; /// /// let mut delay_queue = DelayQueue::new(); @@ -403,7 +403,7 @@ impl<T> DelayQueue<T> { /// Basic usage /// /// ```rust - /// use tokio::timer::DelayQueue; + /// use tokio::time::DelayQueue; /// use std::time::Duration; /// /// let mut delay_queue = DelayQueue::new(); @@ -453,7 +453,7 @@ impl<T> DelayQueue<T> { /// Basic usage /// /// ```rust - /// use tokio::timer::DelayQueue; + /// use tokio::time::DelayQueue; /// use std::time::Duration; /// /// let mut delay_queue = DelayQueue::new(); @@ -464,7 +464,7 @@ impl<T> DelayQueue<T> { /// assert_eq!(*item.get_ref(), "foo"); /// ``` pub fn remove(&mut self, key: &Key) -> Expired<T> { - use crate::timer::wheel::Stack; + use crate::time::wheel::Stack; // Special case the `expired` queue if self.slab[key.index].expired { @@ -501,7 +501,7 @@ impl<T> DelayQueue<T> { /// Basic usage /// /// ```rust - /// use tokio::timer::DelayQueue; + /// use tokio::time::DelayQueue; /// use std::time::{Duration, Instant}; /// /// let mut delay_queue = DelayQueue::new(); @@ -555,7 +555,7 @@ impl<T> DelayQueue<T> { /// Basic usage /// /// ```rust - /// use tokio::timer::DelayQueue; + /// use tokio::time::DelayQueue; /// use std::time::Duration; /// /// let mut delay_queue = DelayQueue::new(); @@ -582,7 +582,7 @@ impl<T> DelayQueue<T> { /// # Examples /// /// ```rust - /// use tokio::timer::DelayQueue; + /// use tokio::time::DelayQueue; /// use std::time::Duration; /// /// let mut delay_queue = DelayQueue::new(); @@ -607,7 +607,7 @@ impl<T> DelayQueue<T> { /// # Examples /// /// ```rust - /// use tokio::timer::DelayQueue; + /// use tokio::time::DelayQueue; /// /// let delay_queue: DelayQueue<i32> = DelayQueue::with_capacity(10); /// assert_eq!(delay_queue.capacity(), 10); @@ -636,7 +636,7 @@ impl<T> DelayQueue<T> { /// # Examples /// /// ``` - /// use tokio::timer::DelayQueue; + /// use tokio::time::DelayQueue; /// use std::time::Duration; /// /// let mut delay_queue = DelayQueue::new(); @@ -658,7 +658,7 @@ impl<T> DelayQueue<T> { /// # Examples /// /// ``` - /// use tokio::timer::DelayQueue; + /// use tokio::time::DelayQueue; /// use std::time::Duration; /// /// let mut delay_queue = DelayQueue::new(); @@ -690,8 +690,7 @@ impl<T> DelayQueue<T> { ready!(Pin::new(&mut *delay).poll(cx)); } - let now = - crate::timer::ms(delay.deadline() - self.start, crate::timer::Round::Down); + let now = crate::time::ms(delay.deadline() - self.start, crate::time::Round::Down); self.poll = wheel::Poll::new(now); } @@ -714,7 +713,7 @@ impl<T> DelayQueue<T> { let when = if when < self.start { 0 } else { - crate::timer::ms(when - self.start, crate::timer::Round::Up) + crate::time::ms(when - self.start, crate::time::Round::Up) }; cmp::max(when, self.wheel.elapsed()) diff --git a/tokio/src/timer/error.rs b/tokio/src/time/error.rs index 994eec1f..994eec1f 100644 --- a/tokio/src/timer/error.rs +++ b/tokio/src/time/error.rs diff --git a/tokio/src/timer/interval.rs b/tokio/src/time/interval.rs index de0c1ba5..f517b23f 100644 --- a/tokio/src/timer/interval.rs +++ b/tokio/src/time/interval.rs @@ -1,4 +1,4 @@ -use crate::timer::{clock, Delay}; +use crate::time::{clock, Delay}; use futures_core::ready; use futures_util::future::poll_fn; @@ -39,7 +39,7 @@ impl Interval { /// Creates new `Interval` that yields with interval of `duration`. /// - /// The function is shortcut for `Interval::new(tokio::timer::clock::now() + duration, duration)`. + /// The function is shortcut for `Interval::new(tokio::time::clock::now() + duration, duration)`. /// /// The `duration` argument must be a non-zero duration. /// @@ -76,7 +76,7 @@ impl Interval { /// # Examples /// /// ``` - /// use tokio::timer::Interval; + /// use tokio::time::Interval; /// /// use std::time::Duration; /// diff --git a/tokio/src/timer/mod.rs b/tokio/src/time/mod.rs index 5af95924..d6f1e0de 100644 --- a/tokio/src/timer/mod.rs +++ b/tokio/src/time/mod.rs @@ -21,16 +21,14 @@ //! involving time. //! //! These types must be used from within the context of the -//! [`Runtime`][runtime] or a timer context must be setup explicitly. See the -//! [`tokio-timer`][tokio-timer] crate for more details on how to setup a timer -//! context. +//! [`Runtime`][runtime]. //! //! # Examples //! //! Wait 100ms and print "Hello World!" //! //! ``` -//! use tokio::timer::delay_for; +//! use tokio::time::delay_for; //! //! use std::time::Duration; //! @@ -66,7 +64,6 @@ //! ``` //! //! [runtime]: ../runtime/struct.Runtime.html -//! [tokio-timer]: https://docs.rs/tokio-timer //! [ext]: ../util/trait.FutureExt.html#method.timeout //! [Timeout]: struct.Timeout.html //! [Delay]: struct.Delay.html @@ -82,7 +79,6 @@ pub use self::delay_queue::DelayQueue; pub mod throttle; // TODO: clean this up -#[allow(clippy::module_inception)] pub mod timer; pub use timer::{set_default, Timer}; @@ -112,7 +108,7 @@ pub fn delay(deadline: Instant) -> Delay { /// Create a Future that completes in `duration` from now. /// -/// Equivalent to `delay(tokio::timer::clock::now() + duration)`. Analogous to `std::thread::sleep`. +/// Equivalent to `delay(tokio::time::clock::now() + duration)`. Analogous to `std::thread::sleep`. pub fn delay_for(duration: Duration) -> Delay { delay(clock::now() + duration) } diff --git a/tokio/src/timer/throttle.rs b/tokio/src/time/throttle.rs index 5c46adde..5572c0b8 100644 --- a/tokio/src/timer/throttle.rs +++ b/tokio/src/time/throttle.rs @@ -1,6 +1,6 @@ //! Slow down a stream by enforcing a delay between items. -use crate::timer::{clock, Delay}; +use crate::time::{clock, Delay}; use futures_core::ready; use futures_core::Stream; diff --git a/tokio/src/timer/timeout.rs b/tokio/src/time/timeout.rs index 7d028aa6..e1fdb252 100644 --- a/tokio/src/timer/timeout.rs +++ b/tokio/src/time/timeout.rs @@ -4,8 +4,8 @@ //! //! [`Timeout`]: struct.Timeout.html -use crate::timer::clock::now; -use crate::timer::Delay; +use crate::time::clock::now; +use crate::time::Delay; use futures_core::ready; use std::fmt; @@ -95,7 +95,7 @@ impl<T> Timeout<T> { /// Create a new `Timeout` set to expire in 10 milliseconds. /// /// ```rust - /// use tokio::timer::Timeout; + /// use tokio::time::Timeout; /// use tokio::sync::oneshot; /// /// use std::time::Duration; diff --git a/tokio/src/timer/timer/atomic_stack.rs b/tokio/src/time/timer/atomic_stack.rs index 849e79a3..fc73943b 100644 --- a/tokio/src/timer/timer/atomic_stack.rs +++ b/tokio/src/time/timer/atomic_stack.rs @@ -1,5 +1,5 @@ -use super::Entry; -use crate::timer::Error; +use crate::time::timer::Entry; +use crate::time::Error; use std::ptr; use std::sync::atomic::AtomicPtr; diff --git a/tokio/src/timer/timer/entry.rs b/tokio/src/time/timer/entry.rs index 7c653ad9..b189b2f6 100644 --- a/tokio/src/timer/timer/entry.rs +++ b/tokio/src/time/timer/entry.rs @@ -1,7 +1,7 @@ use crate::sync::AtomicWaker; -use crate::timer::atomic::AtomicU64; -use crate::timer::timer::{HandlePriv, Inner}; -use crate::timer::Error; +use crate::time::atomic::AtomicU64; +use crate::time::timer::{HandlePriv, Inner}; +use crate::time::Error; use std::cell::UnsafeCell; use std::ptr; diff --git a/tokio/src/timer/timer/handle.rs b/tokio/src/time/timer/handle.rs index 515cc877..044c4aba 100644 --- a/tokio/src/timer/timer/handle.rs +++ b/tokio/src/time/timer/handle.rs @@ -1,6 +1,6 @@ -use crate::timer::clock::now; -use crate::timer::timer::Inner; -use crate::timer::{Delay, Error, Timeout}; +use crate::time::clock::now; +use crate::time::timer::Inner; +use crate::time::{Delay, Error, Timeout}; use std::cell::RefCell; use std::fmt; diff --git a/tokio/src/timer/timer/mod.rs b/tokio/src/time/timer/mod.rs index cce30b66..e79f1f37 100644 --- a/tokio/src/timer/timer/mod.rs +++ b/tokio/src/time/timer/mod.rs @@ -42,10 +42,10 @@ mod stack; use self::stack::Stack; use crate::runtime::{Park, Unpark}; -use crate::timer::atomic::AtomicU64; -use crate::timer::clock::Clock; -use crate::timer::wheel; -use crate::timer::Error; +use crate::time::atomic::AtomicU64; +use crate::time::clock::Clock; +use crate::time::wheel; +use crate::time::Error; use std::sync::atomic::AtomicUsize; use std::sync::atomic::Ordering::SeqCst; @@ -257,9 +257,9 @@ where /// Run timer related logic fn process(&mut self) { - let now = crate::timer::ms( + let now = crate::time::ms( self.clock.now() - self.inner.start, - crate::timer::Round::Down, + crate::time::Round::Down, ); let mut poll = wheel::Poll::new(now); @@ -311,7 +311,7 @@ where /// /// Returns `None` if the entry was fired. fn add_entry(&mut self, entry: Arc<Entry>, when: u64) { - use crate::timer::wheel::InsertError; + use crate::time::wheel::InsertError; entry.set_when_internal(Some(when)); @@ -466,7 +466,7 @@ impl Inner { return 0; } - crate::timer::ms(deadline - self.start, crate::timer::Round::Up) + crate::time::ms(deadline - self.start, crate::time::Round::Up) } } diff --git a/tokio/src/timer/timer/now.rs b/tokio/src/time/timer/now.rs index 8e412b5e..8e412b5e 100644 --- a/tokio/src/timer/timer/now.rs +++ b/tokio/src/time/timer/now.rs diff --git a/tokio/src/timer/timer/registration.rs b/tokio/src/time/timer/registration.rs index 9dceb3c6..1911fd52 100644 --- a/tokio/src/timer/timer/registration.rs +++ b/tokio/src/time/timer/registration.rs @@ -1,5 +1,5 @@ -use crate::timer::timer::{Entry, HandlePriv}; -use crate::timer::Error; +use crate::time::timer::{Entry, HandlePriv}; +use crate::time::Error; use std::sync::Arc; use std::task::{self, Poll}; @@ -47,7 +47,7 @@ impl Registration { // Used by `Timeout<Stream>` pub(crate) fn reset_timeout(&mut self) { - let deadline = crate::clock::now() + self.entry.time_ref().duration; + let deadline = crate::time::clock::now() + self.entry.time_ref().duration; unsafe { self.entry.time_mut().deadline = deadline; } diff --git a/tokio/src/timer/timer/stack.rs b/tokio/src/time/timer/stack.rs index 41ae33ed..763aa0ab 100644 --- a/tokio/src/timer/timer/stack.rs +++ b/tokio/src/time/timer/stack.rs @@ -1,5 +1,5 @@ -use crate::timer::timer::Entry; -use crate::timer::wheel; +use crate::time::timer::Entry; +use crate::time::wheel; use std::ptr; use std::sync::Arc; diff --git a/tokio/src/timer/wheel/level.rs b/tokio |