Reorganize imports

Author: djc

tokio-imap/Cargo.toml

@@ -24,8 +24,4 @@ imap-proto = { version = "0.9", path = "../imap-proto" }
 native-tls = "0.2"
 nom = "5"
 tokio = "0.1"
-tokio-codec = "0.1"
 tokio-tls = "0.2"
-
-[dev-dependencies]
-tokio-current-thread = "0.1"

tokio-imap/examples/basic.rs

@@ -1,10 +1,11 @@
-use tokio_current_thread;
-
-use futures::future::Future;
-use futures_state_stream::StateStream;
 use std::error::Error;
 use std::fmt::{self, Display, Formatter};
 use std::io;
+
+use futures::future::Future;
+use futures_state_stream::StateStream;
+use tokio::runtime::current_thread;
+
 use tokio_imap::client::builder::{
     CommandBuilder, FetchBuilderAttributes, FetchBuilderMessages, FetchBuilderModifiers,
 };
@@ -54,7 +55,7 @@ fn imap_fetch(
         .and_then(move |tls_client| tls_client.call(CommandBuilder::close()).collect())
         .and_then(|_| Ok(()))
         .map_err(|e| ImapError::UidFetch { cause: e });
-    let res = tokio_current_thread::block_on_all({
+    let res = current_thread::block_on_all({
         eprintln!("Fetching messages...");
         fut_responses
     });

tokio-imap/src/client.rs

@@ -1,16 +1,14 @@
+use std::io;
+use std::net::ToSocketAddrs;
+
 use futures::sink::Send;
 use futures::stream::Stream;
 use futures::{Async, Future, Poll, Sink};
 use futures_state_stream::{StateStream, StreamEvent};
-
 use native_tls::TlsConnector;
-
-use std::io;
-use std::net::ToSocketAddrs;
-
+use tokio::codec::Decoder;
 use tokio::io::{AsyncRead, AsyncWrite};
 use tokio::net::tcp::{ConnectFuture, TcpStream};
-use tokio_codec::Decoder;
 use tokio_tls::{self, Connect, TlsStream};
 
 use crate::proto::{ImapCodec, ImapTransport, ResponseData};

tokio-imap/src/proto.rs

@@ -1,15 +1,13 @@
-use bytes::{BufMut, Bytes, BytesMut};
+use std::io;
+use std::mem;
 
+use bytes::{BufMut, Bytes, BytesMut};
 use nom::{self, Needed};
+use tokio::codec::{Decoder, Encoder, Framed};
 
 use imap_proto;
 use imap_proto::types::{Request, RequestId, Response};
 
-use std::io;
-use std::mem;
-
-use tokio::codec::{Decoder, Encoder, Framed};
-
 pub struct ImapCodec {
     decode_need_message_bytes: usize,
 }