From 2d56312b89ba407272b161290d563551efc896a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Tue, 20 Aug 2019 17:39:55 +0200 Subject: timer: introduce delay function shortcut (#1440) This commit adds a simple delay shortcut to avoid writing Delay::new everywhere and removes usages of Delay::new. --- tokio-test/tests/block_on.rs | 8 +++----- tokio-test/tests/clock.rs | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'tokio-test/tests') diff --git a/tokio-test/tests/block_on.rs b/tokio-test/tests/block_on.rs index 7d56ec62..f0a90d11 100644 --- a/tokio-test/tests/block_on.rs +++ b/tokio-test/tests/block_on.rs @@ -3,7 +3,7 @@ use std::time::{Duration, Instant}; use tokio_test::block_on; -use tokio_timer::Delay; +use tokio_timer::delay; #[test] fn async_block() { @@ -20,9 +20,7 @@ fn async_fn() { } #[test] -fn delay() { +fn test_delay() { let deadline = Instant::now() + Duration::from_millis(100); - let delay = Delay::new(deadline); - - assert_eq!((), block_on(delay)); + assert_eq!((), block_on(delay(deadline))); } diff --git a/tokio-test/tests/clock.rs b/tokio-test/tests/clock.rs index 915f6899..344c599b 100644 --- a/tokio-test/tests/clock.rs +++ b/tokio-test/tests/clock.rs @@ -6,7 +6,7 @@ use std::time::{Duration, Instant}; use tokio_test::clock::MockClock; use tokio_test::task::MockTask; use tokio_test::{assert_not_ready, assert_ready}; -use tokio_timer::Delay; +use tokio_timer::delay; #[test] fn clock() { @@ -14,7 +14,7 @@ fn clock() { mock.enter(|handle| { let deadline = Instant::now() + Duration::from_secs(1); - let mut delay = Delay::new(deadline); + let mut delay = delay(deadline); assert_not_ready!(delay.poll()); @@ -31,7 +31,7 @@ fn notify() { let mut task = MockTask::new(); mock.enter(|handle| { - let mut delay = Delay::new(deadline); + let mut delay = delay(deadline); task.enter(|| assert_not_ready!(delay.poll())); -- cgit v1.2.3