diff --git a/actix-server/src/worker.rs b/actix-server/src/worker.rs index 279db4c9..ab8ee460 100644 --- a/actix-server/src/worker.rs +++ b/actix-server/src/worker.rs @@ -283,7 +283,7 @@ impl ServerWorker { 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 { factory: idx, service, diff --git a/actix-server/tests/test_server.rs b/actix-server/tests/test_server.rs index 908dc97d..b5cdcde5 100644 --- a/actix-server/tests/test_server.rs +++ b/actix-server/tests/test_server.rs @@ -5,8 +5,6 @@ use std::{net, thread, time::Duration}; use actix_rt::{net::TcpStream, time::sleep}; use actix_server::Server; use actix_service::fn_service; -use actix_utils::future::ok; -use futures_util::future::lazy; fn unused_addr() -> net::SocketAddr { let addr: net::SocketAddr = "127.0.0.1:0".parse().unwrap(); @@ -27,7 +25,9 @@ fn test_bind() { let server = Server::build() .workers(1) .disable_signals() - .bind("test", addr, move || fn_service(|_| ok::<_, ()>(()))) + .bind("test", addr, move || { + fn_service(|_| async { Ok::<_, ()>(()) }) + }) .unwrap() .run(); tx.send(server.handle()).unwrap();