From f8860bb4e9969eb54f7bf09a1175aa0030b652ab Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Fri, 8 Apr 2022 13:40:55 +0100
Subject: [PATCH] fix clippy

---
 actix-http/benches/uninit-headers.rs |  1 +
 actix-http/src/h1/payload.rs         |  5 +--
 actix-web/src/route.rs               | 32 +++++++++--------
 actix-web/tests/test_server.rs       | 54 ++++++++++++++--------------
 4 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/actix-http/benches/uninit-headers.rs b/actix-http/benches/uninit-headers.rs
index 5dfd3bc11..a06c2f56f 100644
--- a/actix-http/benches/uninit-headers.rs
+++ b/actix-http/benches/uninit-headers.rs
@@ -119,6 +119,7 @@ mod _original {
         let mut headers: [HeaderIndex; MAX_HEADERS] =
             unsafe { MaybeUninit::uninit().assume_init() };
 
+        #[allow(invalid_value)]
         let mut parsed: [httparse::Header<'_>; MAX_HEADERS] =
             unsafe { MaybeUninit::uninit().assume_init() };
 
diff --git a/actix-http/src/h1/payload.rs b/actix-http/src/h1/payload.rs
index 5a93e9051..6058fd317 100644
--- a/actix-http/src/h1/payload.rs
+++ b/actix-http/src/h1/payload.rs
@@ -263,10 +263,7 @@ mod tests {
     assert_not_impl_any!(Payload: Send, Sync, UnwindSafe, RefUnwindSafe);
 
     assert_impl_all!(Inner: Unpin, Send, Sync);
-    #[rustversion::before(1.60)]
-    assert_not_impl_any!(Inner: UnwindSafe, RefUnwindSafe);
-    #[rustversion::since(1.60)]
-    assert_impl_all!(Inner: UnwindSafe, RefUnwindSafe);
+    // assert_not_impl_any!(Inner: UnwindSafe, RefUnwindSafe);
 
     #[actix_rt::test]
     async fn test_unread_data() {
diff --git a/actix-web/src/route.rs b/actix-web/src/route.rs
index 9447b919c..b37128f2c 100644
--- a/actix-web/src/route.rs
+++ b/actix-web/src/route.rs
@@ -357,21 +357,23 @@ mod tests {
     #[actix_rt::test]
     async fn route_middleware() {
         let srv = init_service(
-            App::new().service(
-                web::resource("/test")
-                    .route(web::get().to(HttpResponse::Ok))
-                    .route(
-                        web::post()
-                            .to(HttpResponse::Created)
-                            .wrap(DefaultHeaders::new().add(("x-test", "x-posted"))),
-                    )
-                    .route(
-                        web::delete()
-                            .to(HttpResponse::Accepted)
-                            // logger changes body type, proving Compat is not needed
-                            .wrap(Logger::default()),
-                    ),
-            ),
+            App::new()
+                .route("/", web::get().to(HttpResponse::Ok).wrap(Logger::default()))
+                .service(
+                    web::resource("/test")
+                        .route(web::get().to(HttpResponse::Ok))
+                        .route(
+                            web::post()
+                                .to(HttpResponse::Created)
+                                .wrap(DefaultHeaders::new().add(("x-test", "x-posted"))),
+                        )
+                        .route(
+                            web::delete()
+                                .to(HttpResponse::Accepted)
+                                // logger changes body type, proving Compat is not needed
+                                .wrap(Logger::default()),
+                        ),
+                ),
         )
         .await;
 
diff --git a/actix-web/tests/test_server.rs b/actix-web/tests/test_server.rs
index bd8934061..270223d69 100644
--- a/actix-web/tests/test_server.rs
+++ b/actix-web/tests/test_server.rs
@@ -799,34 +799,36 @@ async fn test_server_cookies() {
     let res = req.send().await.unwrap();
     assert!(res.status().is_success());
 
-    let first_cookie = Cookie::build("first", "first_value")
-        .http_only(true)
-        .finish();
-    let second_cookie = Cookie::new("second", "first_value");
+    {
+        let first_cookie = Cookie::build("first", "first_value")
+            .http_only(true)
+            .finish();
+        let second_cookie = Cookie::new("second", "first_value");
 
-    let cookies = res.cookies().expect("To have cookies");
-    assert_eq!(cookies.len(), 3);
-    if cookies[0] == first_cookie {
-        assert_eq!(cookies[1], second_cookie);
-    } else {
-        assert_eq!(cookies[0], second_cookie);
-        assert_eq!(cookies[1], first_cookie);
-    }
+        let cookies = res.cookies().expect("To have cookies");
+        assert_eq!(cookies.len(), 3);
+        if cookies[0] == first_cookie {
+            assert_eq!(cookies[1], second_cookie);
+        } else {
+            assert_eq!(cookies[0], second_cookie);
+            assert_eq!(cookies[1], first_cookie);
+        }
 
-    let first_cookie = first_cookie.to_string();
-    let second_cookie = second_cookie.to_string();
-    // Check that we have exactly two instances of raw cookie headers
-    let cookies = res
-        .headers()
-        .get_all(http::header::SET_COOKIE)
-        .map(|header| header.to_str().expect("To str").to_string())
-        .collect::<Vec<_>>();
-    assert_eq!(cookies.len(), 3);
-    if cookies[0] == first_cookie {
-        assert_eq!(cookies[1], second_cookie);
-    } else {
-        assert_eq!(cookies[0], second_cookie);
-        assert_eq!(cookies[1], first_cookie);
+        let first_cookie = first_cookie.to_string();
+        let second_cookie = second_cookie.to_string();
+        // Check that we have exactly two instances of raw cookie headers
+        let cookies = res
+            .headers()
+            .get_all(http::header::SET_COOKIE)
+            .map(|header| header.to_str().expect("To str").to_string())
+            .collect::<Vec<_>>();
+        assert_eq!(cookies.len(), 3);
+        if cookies[0] == first_cookie {
+            assert_eq!(cookies[1], second_cookie);
+        } else {
+            assert_eq!(cookies[0], second_cookie);
+            assert_eq!(cookies[1], first_cookie);
+        }
     }
 
     srv.stop().await;