berkus
/
actix-net
mirror of https://github.com/fafhrd91/actix-net
1
0
Fork 0
Code Issues Releases Wiki Activity

Update actix-testing to tokio 0.2

This commit is contained in:
Martell Malone 2019-11-28 02:50:46 -08:00
parent 99e0a45d0d
commit 77621e2d0e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actix-testing/src/lib.rs
View File

@ -7,8 +7,7 @@ use actix_server::{Server, ServerBuilder, ServiceFactory};
pub use actix_server_config::{Io, ServerConfig}; pub use actix_server_config::{Io, ServerConfig};
use net2::TcpBuilder; use net2::TcpBuilder;
use tokio::net::driver::Handle; use tokio::net::TcpStream;
use tokio::net::tcp::TcpStream;
#[cfg(not(test))] // Work around for rust-lang/rust#62127 #[cfg(not(test))] // Work around for rust-lang/rust#62127
pub use actix_macros::test; pub use actix_macros::test;
@ -141,7 +140,7 @@ impl TestServerRuntime {
/// Connect to server, return tokio TcpStream /// Connect to server, return tokio TcpStream
pub fn connect(&self) -> std::io::Result<TcpStream> { pub fn connect(&self) -> std::io::Result<TcpStream> {
TcpStream::from_std(net::TcpStream::connect(self.addr)?, &Handle::default()) TcpStream::from_std(net::TcpStream::connect(self.addr)?)
} }
} }