From 50452e62b4df458d676fc95361b04ef2dd83aebf Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Mon, 4 Jan 2021 22:58:39 +0300 Subject: Update `tokio` to `1.0` --- futures/src/time.rs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'futures/src') diff --git a/futures/src/time.rs b/futures/src/time.rs index 5e9ea436..7458af06 100644 --- a/futures/src/time.rs +++ b/futures/src/time.rs @@ -67,8 +67,20 @@ where let start = tokio::time::Instant::now() + self.0; - tokio::time::interval_at(start, self.0) - .map(|_| std::time::Instant::now()) - .boxed() + let stream = { + #[cfg(feature = "tokio")] + { + futures::stream::unfold( + tokio::time::interval_at(start, self.0), + |mut interval| async move { + Some((interval.tick().await, interval)) + }, + ) + } + #[cfg(feature = "tokio_old")] + tokio::time::interval_at(start, self.0) + }; + + stream.map(|_| std::time::Instant::now()).boxed() } } -- cgit From 09ea73bd2a43ecbcae56cb281aa8d0cce2d5f55d Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 4 Jan 2021 23:19:15 +0100 Subject: Use `Instant::into_std` in `futures::time` --- futures/src/time.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'futures/src') diff --git a/futures/src/time.rs b/futures/src/time.rs index 7458af06..d015d2f0 100644 --- a/futures/src/time.rs +++ b/futures/src/time.rs @@ -81,6 +81,6 @@ where tokio::time::interval_at(start, self.0) }; - stream.map(|_| std::time::Instant::now()).boxed() + stream.map(tokio::time::Instant::into_std).boxed() } } -- cgit