fix warnings after upgrading to rustc 1.81

plabayo · Sep 6, 2024 · 7699b92 · 7699b92
1 parent 27df102
commit 7699b92
Show file tree

Hide file tree

Showing 20 changed files with 17 additions and 41 deletions.
diff --git a/rama-cli/src/main.rs b/rama-cli/src/main.rs
@@ -12,7 +12,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/rama-core/src/lib.rs b/rama-core/src/lib.rs
@@ -32,7 +32,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/rama-error/src/lib.rs b/rama-error/src/lib.rs
@@ -191,7 +191,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/rama-haproxy/src/protocol/v1/mod.rs b/rama-haproxy/src/protocol/v1/mod.rs
@@ -32,7 +32,7 @@ fn parse_header(header: &str) -> Result<Header, ParseError> {
     }
 
     let mut iterator = header
-        .splitn(PARTS, |c| c == SEPARATOR || c == CARRIAGE_RETURN)
+        .splitn(PARTS, [SEPARATOR, CARRIAGE_RETURN])
         .peekable();
 
     let prefix = iterator.next().ok_or(ParseError::MissingPrefix)?;

diff --git a/rama-http-backend/src/lib.rs b/rama-http-backend/src/lib.rs
@@ -23,7 +23,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/rama-http-types/src/lib.rs b/rama-http-types/src/lib.rs
@@ -25,7 +25,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/rama-http/src/lib.rs b/rama-http/src/lib.rs
@@ -25,7 +25,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/rama-http/src/service/web/endpoint/extract/body/form.rs b/rama-http/src/service/web/endpoint/extract/body/form.rs
@@ -113,9 +113,8 @@ mod test {
             age: u8,
         }
 
-        let service = WebService::default().post("/", |Form(_): Form<Input>| async move {
-            panic!("should not reach here");
-        });
+        let service =
+            WebService::default().post("/", |Form(_): Form<Input>| async move { StatusCode::OK });
 
         let req = Request::builder()
             .uri("/")
@@ -136,9 +135,8 @@ mod test {
             age: u8,
         }
 
-        let service = WebService::default().get("/", |Form(_): Form<Input>| async move {
-            panic!("should not reach here");
-        });
+        let service =
+            WebService::default().get("/", |Form(_): Form<Input>| async move { StatusCode::OK });
 
         let req = Request::builder()
             .uri("/")
@@ -181,9 +179,8 @@ mod test {
             age: u8,
         }
 
-        let service = WebService::default().get("/", |Form(_): Form<Input>| async move {
-            panic!("should not reach here");
-        });
+        let service =
+            WebService::default().get("/", |Form(_): Form<Input>| async move { StatusCode::OK });
 
         let req = Request::builder()
             .uri("/?name=Devan")

diff --git a/rama-http/src/service/web/endpoint/extract/body/json.rs b/rama-http/src/service/web/endpoint/extract/body/json.rs
@@ -108,9 +108,8 @@ mod test {
             _alive: Option<bool>,
         }
 
-        let service = WebService::default().post("/", |Json(_): Json<Input>| async move {
-            unreachable!("This endpoint should not be called");
-        });
+        let service =
+            WebService::default().post("/", |Json(_): Json<Input>| async move { StatusCode::OK });
 
         let req = http::Request::builder()
             .method(http::Method::POST)
@@ -130,9 +129,8 @@ mod test {
             _alive: Option<bool>,
         }
 
-        let service = WebService::default().post("/", |Json(_): Json<Input>| async move {
-            unreachable!("This endpoint should not be called");
-        });
+        let service =
+            WebService::default().post("/", |Json(_): Json<Input>| async move { StatusCode::OK });
 
         let req = http::Request::builder()
             .method(http::Method::POST)

diff --git a/rama-http/src/service/web/endpoint/extract/body/text.rs b/rama-http/src/service/web/endpoint/extract/body/text.rs
@@ -88,9 +88,8 @@ mod test {
 
     #[tokio::test]
     async fn test_text_missing_content_type() {
-        let service = WebService::default().post("/", |Text(_): Text| async move {
-            unreachable!();
-        });
+        let service =
+            WebService::default().post("/", |Text(_): Text| async move { StatusCode::OK });
 
         let req = Request::builder()
             .method(Method::POST)
@@ -102,9 +101,8 @@ mod test {
 
     #[tokio::test]
     async fn test_text_incorrect_content_type() {
-        let service = WebService::default().post("/", |Text(_): Text| async move {
-            unreachable!();
-        });
+        let service =
+            WebService::default().post("/", |Text(_): Text| async move { StatusCode::OK });
 
         let req = Request::builder()
             .method(Method::POST)
@@ -117,9 +115,8 @@ mod test {
 
     #[tokio::test]
     async fn test_text_invalid_utf8() {
-        let service = WebService::default().post("/", |Text(_): Text| async move {
-            unreachable!();
-        });
+        let service =
+            WebService::default().post("/", |Text(_): Text| async move { StatusCode::OK });
 
         let req = Request::builder()
             .method(Method::POST)

diff --git a/rama-macros/src/lib.rs b/rama-macros/src/lib.rs
@@ -18,7 +18,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/rama-net/src/lib.rs b/rama-net/src/lib.rs
@@ -24,7 +24,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/rama-proxy/src/lib.rs b/rama-proxy/src/lib.rs
@@ -254,7 +254,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/rama-socks5/src/lib.rs b/rama-socks5/src/lib.rs
@@ -25,7 +25,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/rama-tcp/src/lib.rs b/rama-tcp/src/lib.rs
@@ -25,7 +25,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/rama-tls/src/lib.rs b/rama-tls/src/lib.rs
@@ -25,7 +25,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/rama-ua/src/lib.rs b/rama-ua/src/lib.rs
@@ -63,7 +63,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/rama-udp/src/lib.rs b/rama-udp/src/lib.rs
@@ -25,7 +25,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/rama-utils/src/lib.rs b/rama-utils/src/lib.rs
@@ -29,7 +29,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,

diff --git a/src/lib.rs b/src/lib.rs
@@ -289,7 +289,6 @@
     clippy::needless_borrow,
     clippy::match_wildcard_for_single_variants,
     clippy::if_let_mutex,
-    clippy::mismatched_target_os,
     clippy::await_holding_lock,
     clippy::match_on_vec_items,
     clippy::imprecise_flops,