diff --git a/src/client/legacy/connect/dns.rs b/src/client/legacy/connect/dns.rs index 2a0b53f4..750262b6 100644 --- a/src/client/legacy/connect/dns.rs +++ b/src/client/legacy/connect/dns.rs @@ -21,7 +21,7 @@ //! }); //! ``` use std::error::Error; -use std::future::Future; +use std::future::{self, Future}; use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs}; use std::pin::Pin; use std::str::FromStr; @@ -294,7 +294,7 @@ pub(super) async fn resolve<R>(resolver: &mut R, name: Name) -> Result<R::Addrs, where R: Resolve, { - futures_util::future::poll_fn(|cx| resolver.poll_ready(cx)).await?; + future::poll_fn(|cx| resolver.poll_ready(cx)).await?; resolver.resolve(name).await } diff --git a/src/client/legacy/pool.rs b/src/client/legacy/pool.rs index c57b7ff9..30aa92f1 100644 --- a/src/client/legacy/pool.rs +++ b/src/client/legacy/pool.rs @@ -9,12 +9,11 @@ use std::hash::Hash; use std::ops::{Deref, DerefMut}; use std::pin::Pin; use std::sync::{Arc, Mutex, Weak}; -use std::task::{self, Poll}; +use std::task::{self, ready, Poll}; use std::time::{Duration, Instant}; use futures_channel::oneshot; -use futures_util::ready; use tracing::{debug, trace}; use hyper::rt::Sleep; diff --git a/src/server/conn/auto/mod.rs b/src/server/conn/auto/mod.rs index fdc377c7..18da5495 100644 --- a/src/server/conn/auto/mod.rs +++ b/src/server/conn/auto/mod.rs @@ -2,13 +2,12 @@ pub mod upgrade; -use futures_util::ready; use hyper::service::HttpService; use std::future::Future; use std::marker::PhantomPinned; use std::mem::MaybeUninit; use std::pin::Pin; -use std::task::{Context, Poll}; +use std::task::{ready, Context, Poll}; use std::{error::Error as StdError, io, time::Duration}; use bytes::Bytes; diff --git a/src/service/oneshot.rs b/src/service/oneshot.rs index 0c520772..848ee1f2 100644 --- a/src/service/oneshot.rs +++ b/src/service/oneshot.rs @@ -1,8 +1,7 @@ -use futures_util::ready; use pin_project_lite::pin_project; use std::future::Future; use std::pin::Pin; -use std::task::{Context, Poll}; +use std::task::{ready, Context, Poll}; use tower_service::Service; // Vendored from tower::util to reduce dependencies, the code is small enough. diff --git a/tests/test_utils/mod.rs b/tests/test_utils/mod.rs index df3a65d4..ee062b36 100644 --- a/tests/test_utils/mod.rs +++ b/tests/test_utils/mod.rs @@ -1,10 +1,10 @@ +use std::future::Future; use std::pin::Pin; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::Arc; +use std::task::{Context, Poll}; use futures_channel::mpsc; -use futures_util::task::{Context, Poll}; -use futures_util::Future; use futures_util::TryFutureExt; use hyper::Uri; use tokio::io::{self, AsyncRead, AsyncWrite, ReadBuf};