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

fix build

This commit is contained in:
fakeshadow 2021-04-28 07:20:09 +08:00
parent eda2e83a62
commit af94cf763d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actix-server/src/worker.rs
View File

@ -283,7 +283,7 @@ impl ServerWorker {
io::Error::new(io::ErrorKind::Other, "Can not start worker service") io::Error::new(io::ErrorKind::Other, "Can not start worker service")
})?; })?;
assert_eq!(token, services.len()); assert_eq!(token.0, services.len());
services.push(WorkerService { services.push(WorkerService {
factory: idx, factory: idx,
service, service,

6
actix-server/tests/test_server.rs
View File

@ -5,8 +5,6 @@ use std::{net, thread, time::Duration};
use actix_rt::{net::TcpStream, time::sleep}; use actix_rt::{net::TcpStream, time::sleep};
use actix_server::Server; use actix_server::Server;
use actix_service::fn_service; use actix_service::fn_service;
use actix_utils::future::ok;
use futures_util::future::lazy;
fn unused_addr() -> net::SocketAddr { fn unused_addr() -> net::SocketAddr {
let addr: net::SocketAddr = "127.0.0.1:0".parse().unwrap(); let addr: net::SocketAddr = "127.0.0.1:0".parse().unwrap();
@ -27,7 +25,9 @@ fn test_bind() {
let server = Server::build() let server = Server::build()
.workers(1) .workers(1)
.disable_signals() .disable_signals()
.bind("test", addr, move || fn_service(|_| ok::<_, ()>(()))) .bind("test", addr, move || {
fn_service(|_| async { Ok::<_, ()>(()) })
})
.unwrap() .unwrap()
.run(); .run();
tx.send(server.handle()).unwrap(); tx.send(server.handle()).unwrap();