From bbf90697b007f1e2794fce66ffa1dd8f3e563a47 Mon Sep 17 00:00:00 2001 From: fakeshadow <24548779@qq.com> Date: Fri, 15 Jan 2021 20:26:40 +0800 Subject: [PATCH] use Router::recognize_checked --- actix-http/tests/test_ws.rs | 7 ++----- src/app_service.rs | 2 +- src/scope.rs | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/actix-http/tests/test_ws.rs b/actix-http/tests/test_ws.rs index 6d45d2a59..7ed9b0df1 100644 --- a/actix-http/tests/test_ws.rs +++ b/actix-http/tests/test_ws.rs @@ -21,7 +21,7 @@ impl WsService { WsService(Arc::new(Mutex::new((PhantomData, Cell::new(false))))) } - fn set_polled(&mut self) { + fn set_polled(&self) { *self.0.lock().unwrap().1.get_mut() = true; } @@ -49,10 +49,7 @@ where Poll::Ready(Ok(())) } - fn call( - &mut self, - (req, mut framed): (Request, Framed), - ) -> Self::Future { + fn call(&self, (req, mut framed): (Request, Framed)) -> Self::Future { let fut = async move { let res = ws::handshake(req.head()).unwrap().message_body(()); diff --git a/src/app_service.rs b/src/app_service.rs index a3f7162f5..4e9dfef59 100644 --- a/src/app_service.rs +++ b/src/app_service.rs @@ -295,7 +295,7 @@ impl Service for AppRouting { actix_service::always_ready!(); fn call(&self, mut req: ServiceRequest) -> Self::Future { - let res = self.router.recognize_mut_checked(&mut req, |req, guards| { + let res = self.router.recognize_checked(&mut req, |req, guards| { if let Some(ref guards) = guards { for f in guards { if !f.check(req.head()) { diff --git a/src/scope.rs b/src/scope.rs index 82af73fcb..950fceb55 100644 --- a/src/scope.rs +++ b/src/scope.rs @@ -541,7 +541,7 @@ impl Service for ScopeService { actix_service::always_ready!(); fn call(&self, mut req: ServiceRequest) -> Self::Future { - let res = self.router.recognize_mut_checked(&mut req, |req, guards| { + let res = self.router.recognize_checked(&mut req, |req, guards| { if let Some(ref guards) = guards { for f in guards { if !f.check(req.head()) {