diff --git a/actix-connect/src/ssl/openssl.rs b/actix-connect/src/ssl/openssl.rs index 6cbe3d62..184eb198 100644 --- a/actix-connect/src/ssl/openssl.rs +++ b/actix-connect/src/ssl/openssl.rs @@ -4,11 +4,11 @@ use std::pin::Pin; use std::task::{Context, Poll}; use std::{fmt, io}; +use actix_rt::net::TcpStream; use actix_codec::{AsyncRead, AsyncWrite}; use actix_service::{Service, ServiceFactory}; use futures::future::{err, ok, Either, FutureExt, LocalBoxFuture, Ready}; use open_ssl::ssl::SslConnector; -use tokio_net::tcp::TcpStream; use tokio_openssl::{HandshakeError, SslStream}; use trust_dns_resolver::AsyncResolver; diff --git a/actix-testing/Cargo.toml b/actix-testing/Cargo.toml index 97f0150a..46230e15 100644 --- a/actix-testing/Cargo.toml +++ b/actix-testing/Cargo.toml @@ -27,3 +27,4 @@ log = "0.4" net2 = "0.2" futures = "0.3.1" +tokio-net = { version = "=0.2.0-alpha.6" } diff --git a/actix-testing/src/lib.rs b/actix-testing/src/lib.rs index e2541404..410e42f0 100644 --- a/actix-testing/src/lib.rs +++ b/actix-testing/src/lib.rs @@ -2,13 +2,12 @@ use std::sync::mpsc; use std::{net, thread}; -use actix_rt::System; +use actix_rt::{net::TcpStream, System}; use actix_server::{Server, ServerBuilder, ServiceFactory}; pub use actix_server_config::{Io, ServerConfig}; use net2::TcpBuilder; use tokio_net::driver::Handle; -use tokio_net::tcp::TcpStream; #[cfg(not(test))] // Work around for rust-lang/rust#62127 pub use actix_macros::test;