use actix deps instead of tokio

actix-server/Cargo.toml

@@ -24,12 +24,13 @@ path = "src/lib.rs"
 default = []
 nativetls = ["native-tls", "tokio-tls"]
 openssl = ["open-ssl", "tokio-openssl", "actix-server-config/openssl"]
-#rustls = ["rust-tls", "tokio-rustls", "webpki", "webpki-roots", "actix-server-config/rustls"]
+rustls = ["rust-tls", "tokio-rustls", "webpki", "webpki-roots", "actix-server-config/rustls"]
 
 [dependencies]
-actix-rt = "1.0.0-alpha.1"
 actix-service = "1.0.0-alpha.1"
 actix-server-config = "0.3.0-alpha.1"
+actix-rt = "1.0.0-alpha.1"
+actix-codec = "0.2.0-alpha.1"
 
 log = "0.4"
 num_cpus = "1.0"
@@ -37,11 +38,7 @@ mio = "0.6.19"
 net2 = "0.2"
 futures = "0.3.1"
 slab = "0.4"
-
-tokio = "0.2.0-alpha.6"
-tokio-io = "0.2.0-alpha.6"
 tokio-net = { version = "0.2.0-alpha.6", features = ["signal", "tcp", "uds"] }
-tokio-timer = "0.3.0-alpha.6"
 
 # unix domain sockets
 mio-uds = { version = "0.6.7" }

actix-server/src/accept.rs

@@ -2,11 +2,11 @@ use std::sync::mpsc as sync_mpsc;
 use std::time::{Duration, Instant};
 use std::{io, thread};
 
+use actix_rt::time::delay;
 use actix_rt::System;
 use futures::FutureExt;
 use log::{error, info};
 use slab::Slab;
-use tokio_timer::delay;
 
 use crate::server::Server;
 use crate::socket::{SocketAddr, SocketListener, StdListener};

actix-server/src/builder.rs

@@ -3,7 +3,7 @@ use std::task::{Context, Poll};
 use std::time::{Duration, Instant};
 use std::{io, mem, net};
 
-use actix_rt::{spawn, Arbiter, System};
+use actix_rt::{spawn, time::delay, Arbiter, System};
 use futures::channel::mpsc::{unbounded, UnboundedReceiver};
 use futures::future::ready;
 use futures::stream::FuturesUnordered;
@@ -12,7 +12,6 @@ use log::{error, info};
 use net2::TcpBuilder;
 use num_cpus;
 use tokio_net::tcp::TcpStream;
-use tokio_timer::delay;
 
 use crate::accept::{AcceptLoop, AcceptNotify, Command};
 use crate::config::{ConfiguredService, ServiceConfig};

actix-server/src/socket.rs

@@ -1,6 +1,6 @@
 use std::{fmt, io, net};
 
-use tokio_io::{AsyncRead, AsyncWrite};
+use actix_codec::{AsyncRead, AsyncWrite};
 use tokio_net::driver::Handle;
 use tokio_net::tcp::TcpStream;
 

actix-server/src/ssl/nativetls.rs

@@ -2,10 +2,10 @@ use std::convert::Infallible;
 use std::marker::PhantomData;
 use std::task::{Context, Poll};
 
+use actix_codec::{AsyncRead, AsyncWrite};
 use actix_service::{Service, ServiceFactory};
 use futures::future::{self, FutureExt as _, LocalBoxFuture, TryFutureExt as _};
 use native_tls::Error;
-use tokio::io::{AsyncRead, AsyncWrite};
 use tokio_tls::{TlsAcceptor, TlsStream};
 
 use crate::counter::Counter;

actix-server/src/ssl/openssl.rs

@@ -3,10 +3,10 @@ use std::marker::PhantomData;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
+use actix_codec::{AsyncRead, AsyncWrite};
 use actix_service::{Service, ServiceFactory};
 use futures::future::{ok, FutureExt, LocalBoxFuture, Ready};
 use open_ssl::ssl::SslAcceptor;
-use tokio_io::{AsyncRead, AsyncWrite};
 use tokio_openssl::{HandshakeError, SslStream};
 
 use crate::counter::{Counter, CounterGuard};

actix-server/src/ssl/rustls.rs

@@ -5,10 +5,10 @@ use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{Context, Poll};
 
+use actix_codec::{AsyncRead, AsyncWrite};
 use actix_service::{Service, ServiceFactory};
 use futures::future::{ok, Ready};
 use rust_tls::ServerConfig;
-use tokio_io::{AsyncRead, AsyncWrite};
 use tokio_rustls::{server::TlsStream, Accept, TlsAcceptor};
 
 use crate::counter::{Counter, CounterGuard};

actix-server/src/worker.rs

@@ -4,13 +4,13 @@ use std::sync::Arc;
 use std::task::{Context, Poll};
 use std::{mem, time};
 
+use actix_rt::time::{delay, Delay};
 use actix_rt::{spawn, Arbiter};
 use futures::channel::mpsc::{UnboundedReceiver, UnboundedSender};
 use futures::channel::oneshot;
 use futures::future::{join_all, LocalBoxFuture, MapOk};
 use futures::{Future, FutureExt, Stream, TryFutureExt};
 use log::{error, info, trace};
-use tokio_timer::{delay, Delay};
 
 use crate::accept::AcceptNotify;
 use crate::counter::Counter;