Clean up library imports

Author: djc

src/client.rs

@@ -1,9 +1,15 @@
-use super::*;
-use crate::common::IoSession;
+use std::io;
 #[cfg(unix)]
 use std::os::unix::io::{AsRawFd, RawFd};
 #[cfg(windows)]
 use std::os::windows::io::{AsRawSocket, RawSocket};
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+use rustls::ClientConnection;
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
+
+use crate::common::{IoSession, Stream, TlsState};
 
 /// A wrapper around an underlying raw stream which implements the TLS or SSL
 /// protocol.

src/common/handshake.rs

@@ -1,12 +1,14 @@
-use crate::common::{Stream, TlsState};
-use rustls::{ConnectionCommon, SideData};
 use std::future::Future;
 use std::ops::{Deref, DerefMut};
 use std::pin::Pin;
 use std::task::{Context, Poll};
 use std::{io, mem};
+
+use rustls::{ConnectionCommon, SideData};
 use tokio::io::{AsyncRead, AsyncWrite};
 
+use crate::common::{Stream, TlsState};
+
 pub(crate) trait IoSession {
     type Io;
     type Session;

src/common/mod.rs

@@ -1,13 +1,14 @@
-mod handshake;
-
-pub(crate) use handshake::{IoSession, MidHandshake};
-use rustls::{ConnectionCommon, SideData};
 use std::io::{self, IoSlice, Read, Write};
 use std::ops::{Deref, DerefMut};
 use std::pin::Pin;
 use std::task::{Context, Poll};
+
+use rustls::{ConnectionCommon, SideData};
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 
+mod handshake;
+pub(crate) use handshake::{IoSession, MidHandshake};
+
 #[derive(Debug)]
 pub enum TlsState {
     #[cfg(feature = "early-data")]

src/common/test_stream.rs

@@ -1,12 +1,14 @@
-use super::Stream;
-use futures_util::future::poll_fn;
-use futures_util::task::noop_waker_ref;
-use rustls::{ClientConnection, Connection, ServerConnection};
 use std::io::{self, Cursor, Read, Write};
 use std::pin::Pin;
 use std::task::{Context, Poll};
+
+use futures_util::future::poll_fn;
+use futures_util::task::noop_waker_ref;
+use rustls::{ClientConnection, Connection, ServerConnection};
 use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, ReadBuf};
 
+use super::Stream;
+
 struct Good<'a>(&'a mut Connection);
 
 impl<'a> AsyncRead for Good<'a> {

src/lib.rs

@@ -36,6 +36,20 @@
 //!
 //! see <https://github.com/tokio-rs/tls/issues/41>
 
+use std::future::Future;
+use std::io;
+#[cfg(unix)]
+use std::os::unix::io::{AsRawFd, RawFd};
+#[cfg(windows)]
+use std::os::windows::io::{AsRawSocket, RawSocket};
+use std::pin::Pin;
+use std::sync::Arc;
+use std::task::{Context, Poll};
+
+pub use rustls;
+use rustls::{ClientConfig, ClientConnection, CommonState, ServerConfig, ServerConnection};
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
+
 macro_rules! ready {
     ( $e:expr ) => {
         match $e {
@@ -47,23 +61,9 @@ macro_rules! ready {
 
 pub mod client;
 mod common;
+use common::{MidHandshake, TlsState};
 pub mod server;
 
-use common::{MidHandshake, Stream, TlsState};
-use rustls::{ClientConfig, ClientConnection, CommonState, ServerConfig, ServerConnection};
-use std::future::Future;
-use std::io;
-#[cfg(unix)]
-use std::os::unix::io::{AsRawFd, RawFd};
-#[cfg(windows)]
-use std::os::windows::io::{AsRawSocket, RawSocket};
-use std::pin::Pin;
-use std::sync::Arc;
-use std::task::{Context, Poll};
-use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
-
-pub use rustls;
-
 /// A wrapper around a `rustls::ClientConfig`, providing an async `connect` method.
 #[derive(Clone)]
 pub struct TlsConnector {

src/server.rs

@@ -1,10 +1,15 @@
+use std::io;
 #[cfg(unix)]
 use std::os::unix::io::{AsRawFd, RawFd};
 #[cfg(windows)]
 use std::os::windows::io::{AsRawSocket, RawSocket};
+use std::pin::Pin;
+use std::task::{Context, Poll};
 
-use super::*;
-use crate::common::IoSession;
+use rustls::ServerConnection;
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
+
+use crate::common::{IoSession, Stream, TlsState};
 
 /// A wrapper around an underlying raw stream which implements the TLS or SSL
 /// protocol.