Downgrade to tokio alpha

Cargo.toml

@@ -13,15 +13,16 @@ edition = "2018"
 
 [features]
 default = ["connect"]
-connect = ["stream", "tokio/net"]
+connect = ["stream", "tokio-net"]
 tls = ["native-tls", "tokio-tls", "stream", "tungstenite/tls"]
 stream = []
 
 [dependencies]
 log = "0.4"
-futures = "0.3"
+futures-preview = "0.3.0-alpha.19"
 pin-project = "0.4"
-tokio = "0.2"
+tokio-io = { version = "0.2.0-alpha.6", features = ["util"] }
+tokio-net = { version = "0.2.0-alpha.6", optional = true, features = ["tcp"] }
 
 [dependencies.tungstenite]
 version = "0.9.2"
@@ -33,9 +34,9 @@ version = "0.2.0"
 
 [dependencies.tokio-tls]
 optional = true
-version = "0.3"
+version = "0.3.0-alpha.6"
 
 [dev-dependencies]
-tokio = { version = "0.2", features = ["net", "macros", "rt-threaded", "io-std", "io-util"] }
-url = "2.0.0"
+tokio = "=0.2.0-alpha.6"
+url = "2.0"
 env_logger = "0.6"

examples/autobahn-server.rs

@@ -1,7 +1,7 @@
 use futures::{SinkExt, StreamExt};
 use log::*;
 use std::net::{SocketAddr, ToSocketAddrs};
-use tokio::net::{TcpListener, TcpStream};
+use tokio::net::tcp::{TcpListener, TcpStream};
 use tokio_tungstenite::accept_async;
 
 async fn accept_connection(peer: SocketAddr, stream: TcpStream) {

examples/client.rs

@@ -17,7 +17,7 @@ use futures::{SinkExt, StreamExt};
 use log::*;
 use tungstenite::protocol::Message;
 
-use tokio::io::AsyncReadExt;
+use tokio_io::AsyncReadExt;
 use tokio_tungstenite::connect_async;
 
 #[tokio::main]

examples/server.rs

@@ -24,7 +24,7 @@ use futures::channel::mpsc::{UnboundedReceiver, UnboundedSender};
 use futures::{SinkExt, StreamExt};
 use log::*;
 use std::net::{SocketAddr, ToSocketAddrs};
-use tokio::net::{TcpListener, TcpStream};
+use tokio_net::tcp::{TcpListener, TcpStream};
 use tungstenite::protocol::Message;
 
 struct Connection {

examples/split-client.rs

@@ -17,7 +17,7 @@ use futures::{SinkExt, StreamExt};
 use log::*;
 use tungstenite::protocol::Message;
 
-use tokio::io::AsyncReadExt;
+use tokio_io::AsyncReadExt;
 use tokio_tungstenite::connect_async;
 
 #[tokio::main]

src/compat.rs

@@ -5,7 +5,7 @@ use std::task::{Context, Poll};
 
 use futures::task;
 use std::sync::Arc;
-use tokio::io::{AsyncRead, AsyncWrite};
+use tokio_io::{AsyncRead, AsyncWrite};
 use tungstenite::Error as WsError;
 
 pub(crate) enum ContextWaker {

src/connect.rs

@@ -1,6 +1,6 @@
 //! Connection helper.
-use tokio::io::{AsyncRead, AsyncWrite};
-use tokio::net::TcpStream;
+use tokio_io::{AsyncRead, AsyncWrite};
+use tokio_net::tcp::TcpStream;
 
 use tungstenite::client::url_mode;
 use tungstenite::handshake::client::Response;
@@ -13,7 +13,7 @@ pub(crate) mod encryption {
     use native_tls::TlsConnector;
     use tokio_tls::{TlsConnector as TokioTlsConnector, TlsStream};
 
-    use tokio::io::{AsyncRead, AsyncWrite};
+    use tokio_io::{AsyncRead, AsyncWrite};
 
     use tungstenite::stream::Mode;
     use tungstenite::Error;
@@ -54,7 +54,7 @@ pub use self::encryption::MaybeTlsStream;
 
 #[cfg(not(feature = "tls"))]
 pub(crate) mod encryption {
-    use tokio::io::{AsyncRead, AsyncWrite};
+    use tokio_io::{AsyncRead, AsyncWrite};
 
     use tungstenite::stream::Mode;
     use tungstenite::Error;

src/handshake.rs

@@ -6,7 +6,7 @@ use std::future::Future;
 use std::io::{Read, Write};
 use std::pin::Pin;
 use std::task::{Context, Poll};
-use tokio::io::{AsyncRead, AsyncWrite};
+use tokio_io::{AsyncRead, AsyncWrite};
 use tungstenite::handshake::client::Response;
 use tungstenite::handshake::server::Callback;
 use tungstenite::handshake::{HandshakeError as Error, HandshakeRole, MidHandshake as WsHandshake};

src/lib.rs

@@ -32,7 +32,7 @@ use futures::{Sink, SinkExt, Stream};
 use log::*;
 use std::pin::Pin;
 use std::task::{Context, Poll};
-use tokio::io::{AsyncRead, AsyncWrite};
+use tokio_io::{AsyncRead, AsyncWrite};
 
 use tungstenite::{
     error::Error as WsError,
@@ -322,7 +322,7 @@ mod tests {
     use crate::connect::encryption::AutoStream;
     use crate::WebSocketStream;
     use std::io::{Read, Write};
-    use tokio::io::{AsyncReadExt, AsyncWriteExt};
+    use tokio_io::{AsyncReadExt, AsyncWriteExt};
 
     fn is_read<T: Read>() {}
     fn is_write<T: Write>() {}
@@ -332,16 +332,16 @@ mod tests {
 
     #[test]
     fn web_socket_stream_has_traits() {
-        is_read::<AllowStd<tokio::net::TcpStream>>();
-        is_write::<AllowStd<tokio::net::TcpStream>>();
+        is_read::<AllowStd<tokio_net::tcp::TcpStream>>();
+        is_write::<AllowStd<tokio_net::tcp::TcpStream>>();
 
         #[cfg(feature = "connect")]
-        is_async_read::<AutoStream<tokio::net::TcpStream>>();
+        is_async_read::<AutoStream<tokio_net::tcp::TcpStream>>();
         #[cfg(feature = "connect")]
-        is_async_write::<AutoStream<tokio::net::TcpStream>>();
+        is_async_write::<AutoStream<tokio_net::tcp::TcpStream>>();
 
-        is_unpin::<WebSocketStream<tokio::net::TcpStream>>();
+        is_unpin::<WebSocketStream<tokio_net::tcp::TcpStream>>();
         #[cfg(feature = "connect")]
-        is_unpin::<WebSocketStream<AutoStream<tokio::net::TcpStream>>>();
+        is_unpin::<WebSocketStream<AutoStream<tokio_net::tcp::TcpStream>>>();
     }
 }

src/stream.rs

@@ -7,7 +7,7 @@ use pin_project::{pin_project, project};
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-use tokio::io::{AsyncRead, AsyncWrite};
+use tokio_io::{AsyncRead, AsyncWrite};
 
 /// Stream, either plain TCP or TLS.
 #[pin_project]

tests/handshakes.rs

@@ -1,5 +1,5 @@
 use std::net::ToSocketAddrs;
-use tokio::net::{TcpListener, TcpStream};
+use tokio_net::tcp::{TcpListener, TcpStream};
 use tokio_tungstenite::{accept_async, client_async};
 
 #[tokio::test]