From 917b5f20487be7aee72214e40030ba6b3a708656 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Thu, 11 Dec 2025 07:26:07 +0000
Subject: [PATCH] chore: address clippy lints

---
 actix-files/src/range.rs          | 9 ++-------
 actix-http/src/h1/payload.rs      | 8 ++------
 actix-multipart-derive/src/lib.rs | 9 ++-------
 awc/src/request.rs                | 5 +----
 4 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/actix-files/src/range.rs b/actix-files/src/range.rs
index 528911ae0..87be8363d 100644
--- a/actix-files/src/range.rs
+++ b/actix-files/src/range.rs
@@ -294,16 +294,11 @@ mod tests {
 
             let res = HttpRange::parse(header, size);
 
-            if res.is_err() {
+            if let Err(err) = res {
                 if expected.is_empty() {
                     continue;
                 } else {
-                    panic!(
-                        "parse({}, {}) returned error {:?}",
-                        header,
-                        size,
-                        res.unwrap_err()
-                    );
+                    panic!("parse({header}, {size}) returned error {err:?}");
                 }
             }
 
diff --git a/actix-http/src/h1/payload.rs b/actix-http/src/h1/payload.rs
index d478c677a..92875a9db 100644
--- a/actix-http/src/h1/payload.rs
+++ b/actix-http/src/h1/payload.rs
@@ -176,11 +176,7 @@ impl Inner {
     /// Register future waiting data from payload.
     /// Waker would be used in `Inner::wake`
     fn register(&mut self, cx: &Context<'_>) {
-        if self
-            .task
-            .as_ref()
-            .map_or(true, |w| !cx.waker().will_wake(w))
-        {
+        if self.task.as_ref().is_none_or(|w| !cx.waker().will_wake(w)) {
             self.task = Some(cx.waker().clone());
         }
     }
@@ -191,7 +187,7 @@ impl Inner {
         if self
             .io_task
             .as_ref()
-            .map_or(true, |w| !cx.waker().will_wake(w))
+            .is_none_or(|w| !cx.waker().will_wake(w))
         {
             self.io_task = Some(cx.waker().clone());
         }
diff --git a/actix-multipart-derive/src/lib.rs b/actix-multipart-derive/src/lib.rs
index 7aed4c5e6..5b5e28254 100644
--- a/actix-multipart-derive/src/lib.rs
+++ b/actix-multipart-derive/src/lib.rs
@@ -16,19 +16,14 @@ use proc_macro2::Ident;
 use quote::quote;
 use syn::{parse_macro_input, Type};
 
-#[derive(FromMeta)]
+#[derive(Default, FromMeta)]
 enum DuplicateField {
+    #[default]
     Ignore,
     Deny,
     Replace,
 }
 
-impl Default for DuplicateField {
-    fn default() -> Self {
-        Self::Ignore
-    }
-}
-
 #[derive(FromDeriveInput, Default)]
 #[darling(attributes(multipart), default)]
 struct MultipartFormAttrs {
diff --git a/awc/src/request.rs b/awc/src/request.rs
index 5f42f67ec..71ea2ef1e 100644
--- a/awc/src/request.rs
+++ b/awc/src/request.rs
@@ -309,10 +309,7 @@ impl ClientRequest {
     /// Freeze request builder and construct `FrozenClientRequest`,
     /// which could be used for sending same request multiple times.
     pub fn freeze(self) -> Result<FrozenClientRequest, FreezeRequestError> {
-        let slf = match self.prep_for_sending() {
-            Ok(slf) => slf,
-            Err(err) => return Err(err.into()),
-        };
+        let slf = self.prep_for_sending()?;
 
         let request = FrozenClientRequest {
             head: Rc::new(slf.head),