diff --git a/actix-server-config/Cargo.toml b/actix-server-config/Cargo.toml index 708071d2..376330e4 100644 --- a/actix-server-config/Cargo.toml +++ b/actix-server-config/Cargo.toml @@ -23,7 +23,7 @@ rustls = ["tokio-rustls"] [dependencies] actix-codec = "0.2.0-alpha.1" -tokio-net = { version = "=0.2.0-alpha.6", features = ["tcp", "uds"] } -tokio-openssl = { version = "0.4.0-alpha.6", optional = true } +tokio = { version = "0.2", features = ["net", "uds"] } +tokio-openssl = { version = "0.4.0", optional = true } #tokio-rustls = { version = "0.12.0-alpha.8", optional = true } tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true } diff --git a/actix-server-config/src/lib.rs b/actix-server-config/src/lib.rs index 5b9a7dbe..6fe84d1b 100644 --- a/actix-server-config/src/lib.rs +++ b/actix-server-config/src/lib.rs @@ -6,7 +6,7 @@ use std::rc::Rc; use std::{fmt, io, net, ops, time}; use actix_codec::{AsyncRead, AsyncWrite}; -use tokio_net::tcp::TcpStream; +use tokio::net::TcpStream; #[derive(Debug, Clone)] pub struct ServerConfig { @@ -226,7 +226,7 @@ impl IoStream for tokio_rustls::server::TlsStream { } #[cfg(unix)] -impl IoStream for tokio_net::uds::UnixStream { +impl IoStream for tokio::net::UnixStream { #[inline] fn peer_addr(&self) -> Option { None