actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-06-28 21:10:37 +02:00
Code Issues Releases Wiki Activity

update actix-server and actix-testing to tokio 1.0 (#239)

Browse Source
This commit is contained in:
fakeshadow
2020-12-29 07:44:53 +08:00
committed by GitHub
parent a09f9abfcb
commit b7202db8fd
15 changed files with 1008 additions and 841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
actix-testing/Cargo.toml
View File

@ -18,10 +18,10 @@ name = "actix_testing"
path = "src/lib.rs"
[dependencies]
actix-rt = "1.0.0"
actix-rt = "2.0.0-beta.1"
actix-macros = "0.1.0"
actix-server = "1.0.0"
actix-service = "1.0.0"
actix-service = "2.0.0-beta.1"
log = "0.4"
socket2 = "0.3"

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

@ -83,7 +83,7 @@ impl TestServer {
// run server in separate thread
thread::spawn(move || {
let mut sys = System::new("actix-test-server");
let sys = System::new("actix-test-server");
let tcp = net::TcpListener::bind("127.0.0.1:0").unwrap();
let local_addr = tcp.local_addr().unwrap();
@ -94,9 +94,8 @@ impl TestServer {
.workers(1)
.disable_signals()
.start();
tx.send((System::current(), local_addr)).unwrap();
});
tx.send((System::current(), local_addr)).unwrap();
sys.run()
});