From 95130fcfd00a4344a44ebaccee54eb967098bf89 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Mon, 8 Mar 2021 20:32:19 +0000
Subject: [PATCH] address clippy warnings

---
 awc/src/ws.rs                  | 2 +-
 examples/basic.rs              | 2 +-
 examples/uds.rs                | 2 +-
 src/middleware/condition.rs    | 1 +
 src/middleware/err_handlers.rs | 2 ++
 tests/test_httpserver.rs       | 4 ++--
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/awc/src/ws.rs b/awc/src/ws.rs
index 1aa426ac7..f64e9e19a 100644
--- a/awc/src/ws.rs
+++ b/awc/src/ws.rs
@@ -382,7 +382,7 @@ impl WebsocketsRequest {
         if let Some(hdr_key) = head.headers.get(&header::SEC_WEBSOCKET_ACCEPT) {
             let encoded = ws::hash_key(key.as_ref());
 
-            if hdr_key.as_bytes() != &encoded {
+            if hdr_key.as_bytes() != encoded {
                 log::trace!(
                     "Invalid challenge response: expected: {:?} received: {:?}",
                     &encoded,
diff --git a/examples/basic.rs b/examples/basic.rs
index 99eef3ee1..796f002e8 100644
--- a/examples/basic.rs
+++ b/examples/basic.rs
@@ -30,7 +30,7 @@ async fn main() -> std::io::Result<()> {
             .service(
                 web::resource("/resource2/index.html")
                     .wrap(middleware::DefaultHeaders::new().header("X-Version-R2", "0.3"))
-                    .default_service(web::route().to(|| HttpResponse::MethodNotAllowed()))
+                    .default_service(web::route().to(HttpResponse::MethodNotAllowed))
                     .route(web::get().to(index_async)),
             )
             .service(web::resource("/test1.html").to(|| async { "Test\r\n" }))
diff --git a/examples/uds.rs b/examples/uds.rs
index 096781984..1db252fef 100644
--- a/examples/uds.rs
+++ b/examples/uds.rs
@@ -34,7 +34,7 @@ async fn main() -> std::io::Result<()> {
             .service(
                 web::resource("/resource2/index.html")
                     .wrap(middleware::DefaultHeaders::new().header("X-Version-R2", "0.3"))
-                    .default_service(web::route().to(|| HttpResponse::MethodNotAllowed()))
+                    .default_service(web::route().to(HttpResponse::MethodNotAllowed))
                     .route(web::get().to(index_async)),
             )
             .service(web::resource("/test1.html").to(|| async { "Test\r\n" }))
diff --git a/src/middleware/condition.rs b/src/middleware/condition.rs
index f0c344062..63a90c853 100644
--- a/src/middleware/condition.rs
+++ b/src/middleware/condition.rs
@@ -106,6 +106,7 @@ mod tests {
         HttpResponse,
     };
 
+    #[allow(clippy::unnecessary_wraps)]
     fn render_500<B>(mut res: ServiceResponse<B>) -> Result<ErrorHandlerResponse<B>> {
         res.response_mut()
             .headers_mut()
diff --git a/src/middleware/err_handlers.rs b/src/middleware/err_handlers.rs
index 4673ed4ce..06e88cefd 100644
--- a/src/middleware/err_handlers.rs
+++ b/src/middleware/err_handlers.rs
@@ -182,6 +182,7 @@ mod tests {
     use crate::test::{self, TestRequest};
     use crate::HttpResponse;
 
+    #[allow(clippy::unnecessary_wraps)]
     fn render_500<B>(mut res: ServiceResponse<B>) -> Result<ErrorHandlerResponse<B>> {
         res.response_mut()
             .headers_mut()
@@ -205,6 +206,7 @@ mod tests {
         assert_eq!(resp.headers().get(CONTENT_TYPE).unwrap(), "0001");
     }
 
+    #[allow(clippy::unnecessary_wraps)]
     fn render_500_async<B: 'static>(
         mut res: ServiceResponse<B>,
     ) -> Result<ErrorHandlerResponse<B>> {
diff --git a/tests/test_httpserver.rs b/tests/test_httpserver.rs
index 043159376..b6c0528dd 100644
--- a/tests/test_httpserver.rs
+++ b/tests/test_httpserver.rs
@@ -72,7 +72,7 @@ async fn test_start() {
 }
 
 #[cfg(feature = "openssl")]
-fn ssl_acceptor() -> std::io::Result<SslAcceptorBuilder> {
+fn ssl_acceptor() -> SslAcceptorBuilder {
     use openssl::{
         pkey::PKey,
         ssl::{SslAcceptor, SslMethod},
@@ -102,7 +102,7 @@ async fn test_start_ssl() {
 
     thread::spawn(move || {
         let sys = actix_rt::System::new();
-        let builder = ssl_acceptor().unwrap();
+        let builder = ssl_acceptor();
 
         let srv = HttpServer::new(|| {
             App::new().service(web::resource("/").route(web::to(|req: HttpRequest| {