From c507ff833728e2979cf5519fc931ea97308ec876 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Fri, 3 May 2024 01:31:55 +0900 Subject: [PATCH] Tweak imports in tests --- futures/tests/future_join.rs | 4 ++-- futures/tests/future_try_join_all.rs | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/futures/tests/future_join.rs b/futures/tests/future_join.rs index f5df9d7775..0556a6e62c 100644 --- a/futures/tests/future_join.rs +++ b/futures/tests/future_join.rs @@ -1,5 +1,5 @@ use futures::executor::block_on; -use futures::future::Future; +use futures::future::{self, Future}; use std::task::Poll; /// This tests verifies (through miri) that self-referencing @@ -21,7 +21,7 @@ async fn trouble() { fn yield_now() -> impl Future { let mut yielded = false; - std::future::poll_fn(move |cx| { + future::poll_fn(move |cx| { if core::mem::replace(&mut yielded, true) { Poll::Ready(()) } else { diff --git a/futures/tests/future_try_join_all.rs b/futures/tests/future_try_join_all.rs index 9a824872f7..892e775920 100644 --- a/futures/tests/future_try_join_all.rs +++ b/futures/tests/future_try_join_all.rs @@ -1,8 +1,7 @@ use futures::executor::block_on; +use futures::future::{err, ok, try_join_all, Future, TryJoinAll}; use futures::pin_mut; -use futures_util::future::{err, ok, try_join_all, TryJoinAll}; use std::fmt::Debug; -use std::future::Future; #[track_caller] fn assert_done(actual_fut: impl Future, expected: T)