Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/client/legacy/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

use std::error::Error as StdError;
use std::fmt;
use std::future::{Future, poll_fn};
use std::future::poll_fn;
use std::pin::Pin;
use std::task::{self, Poll};
use std::time::Duration;
Expand Down
3 changes: 0 additions & 3 deletions src/client/legacy/connect/dns.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
//! });
//! ```
use std::error::Error;
use std::future::Future;
use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs};
use std::pin::Pin;
use std::str::FromStr;
Expand Down Expand Up @@ -251,7 +250,6 @@ impl Iterator for SocketAddrs {
}

mod sealed {
use std::future::Future;
use std::task::{self, Poll};

use super::{Name, SocketAddr};
Expand Down Expand Up @@ -298,7 +296,6 @@ where
#[cfg(test)]
mod tests {
use super::*;
use std::net::{Ipv4Addr, Ipv6Addr};

#[test]
fn test_ip_addrs_split_by_preference() {
Expand Down
1 change: 0 additions & 1 deletion src/client/legacy/connect/http.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::error::Error as StdError;
use std::fmt;
use std::future::Future;
use std::io;
use std::marker::PhantomData;
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
Expand Down
3 changes: 1 addition & 2 deletions src/client/legacy/connect/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
//! Or, fully written out:
//!
//! ```
//! use std::{future::Future, net::SocketAddr, pin::Pin, task::{self, Poll}};
//! use std::{net::SocketAddr, pin::Pin, task::{self, Poll}};
//! use http::Uri;
//! use tokio::net::TcpStream;
//! use tower_service::Service;
Expand Down Expand Up @@ -302,7 +302,6 @@ where

pub(super) mod sealed {
use std::error::Error as StdError;
use std::future::Future;

use ::http::Uri;
use hyper::rt::{Read, Write};
Expand Down
1 change: 0 additions & 1 deletion src/client/legacy/connect/proxy/socks/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ mod v4;
pub use v4::{SocksV4, SocksV4Error};

use pin_project_lite::pin_project;
use std::future::Future;
use std::pin::Pin;
use std::task::{Context, Poll};

Expand Down
3 changes: 1 addition & 2 deletions src/client/legacy/connect/proxy/tunnel.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::error::Error as StdError;
use std::future::Future;
use std::marker::{PhantomData, Unpin};
use std::marker::PhantomData;
use std::pin::Pin;
use std::task::{self, Poll, ready};

Expand Down
2 changes: 0 additions & 2 deletions src/client/legacy/pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use std::collections::{HashMap, HashSet, VecDeque};
use std::convert::Infallible;
use std::error::Error as StdError;
use std::fmt::{self, Debug};
use std::future::Future;
use std::hash::Hash;
use std::ops::{Deref, DerefMut};
use std::pin::Pin;
Expand Down Expand Up @@ -841,7 +840,6 @@ impl<T> WeakOpt<T> {
#[cfg(test)]
mod tests {
use std::fmt::Debug;
use std::future::Future;
use std::hash::Hash;
use std::pin::Pin;
use std::task::{self, Poll};
Expand Down
4 changes: 0 additions & 4 deletions src/client/pool/cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ pub use self::internal::Cached;
mod internal {
use std::collections::VecDeque;
use std::fmt;
use std::future::Future;
use std::pin::Pin;
use std::sync::{Arc, Mutex, Weak};
use std::task::{self, Poll, Waker, ready};
Expand Down Expand Up @@ -631,7 +630,6 @@ mod tests {
// (FIFO), so a waiter cannot be starved by later arrivals.
#[tokio::test]
async fn test_waiters_woken_in_fifo_order() {
use std::future::Future;
use std::task::{Context, Poll, Waker};

let (mock, mut handle) = tower_test::mock::pair::<u32, &'static str>();
Expand Down Expand Up @@ -697,7 +695,6 @@ mod tests {

#[tokio::test]
async fn dropped_racing_future_cancels_waiter() {
use std::future::Future;
use std::task::{Context, Poll, Waker};

let (mock, mut handle) = tower_test::mock::pair::<u32, &'static str>();
Expand Down Expand Up @@ -825,7 +822,6 @@ mod tests {

#[tokio::test]
async fn idle_return_wakes_pending_poll_ready() {
use std::future::Future;
use std::sync::atomic::AtomicBool;
use std::task::{Context, Waker};

Expand Down
1 change: 0 additions & 1 deletion src/client/pool/negotiate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ pub use self::internal::Negotiate;
pub use self::internal::Negotiated;

mod internal {
use std::future::Future;
use std::pin::Pin;
use std::sync::{Arc, Mutex};
use std::task::{self, Poll, ready};
Expand Down
2 changes: 0 additions & 2 deletions src/client/pool/singleton.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ where
/// local to the future that was dropped.
mod internal {
use std::fmt;
use std::future::Future;
use std::pin::Pin;
use std::sync::{Arc, Mutex, Weak};
use std::task::{self, Poll, Waker};
Expand Down Expand Up @@ -507,7 +506,6 @@ mod internal {
#[cfg(test)]
mod tests {
use std::error::Error;
use std::future::Future;
use std::pin::Pin;
use std::task::Poll;

Expand Down
1 change: 0 additions & 1 deletion src/common/exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

use hyper::rt::Executor;
use std::fmt;
use std::future::Future;
use std::pin::Pin;
use std::sync::Arc;

Expand Down
1 change: 0 additions & 1 deletion src/common/lazy.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use pin_project_lite::pin_project;

use std::future::Future;
use std::pin::Pin;
use std::task::{self, Poll};

Expand Down
1 change: 0 additions & 1 deletion src/rt/io.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use std::marker::Unpin;
use std::pin::Pin;
use std::task::{Poll, ready};

Expand Down
1 change: 0 additions & 1 deletion src/rt/tokio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
//! [tokio-async-docs]: https://docs.rs/tokio/latest/tokio/#asynchronous-io

use std::{
future::Future,
pin::Pin,
task::{Context, Poll},
time::{Duration, Instant},
Expand Down
1 change: 0 additions & 1 deletion src/server/conn/auto/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
pub mod upgrade;

use hyper::service::HttpService;
use std::future::Future;
use std::marker::PhantomPinned;
use std::mem::MaybeUninit;
use std::pin::Pin;
Expand Down
1 change: 0 additions & 1 deletion src/server/graceful.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

use std::{
fmt::{self, Debug},
future::Future,
pin::Pin,
task::{self, Poll},
};
Expand Down
1 change: 0 additions & 1 deletion src/service/glue.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use pin_project_lite::pin_project;
use std::{
future::Future,
pin::Pin,
task::{Context, Poll},
};
Expand Down
1 change: 0 additions & 1 deletion src/service/oneshot.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use pin_project_lite::pin_project;
use std::future::Future;
use std::pin::Pin;
use std::task::{Context, Poll, ready};
use tower_service::Service;
Expand Down
1 change: 0 additions & 1 deletion tests/test_utils/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use std::future::Future;
use std::pin::Pin;
use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
Expand Down
Loading