From c1a638861445cf1aee36d5fd7130ea01b16e3eca Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Mon, 6 May 2024 06:03:44 +0100
Subject: [PATCH] refactor: address clippy warnings

---
 actix-http/src/h1/dispatcher.rs | 2 +-
 actix-http/src/h2/dispatcher.rs | 2 +-
 actix-multipart/src/form/mod.rs | 3 ++-
 actix-router/src/path.rs        | 8 ++------
 actix-web/src/config.rs         | 2 +-
 actix-web/src/resource.rs       | 2 +-
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/actix-http/src/h1/dispatcher.rs b/actix-http/src/h1/dispatcher.rs
index a24a6bb07..00b51360e 100644
--- a/actix-http/src/h1/dispatcher.rs
+++ b/actix-http/src/h1/dispatcher.rs
@@ -706,7 +706,7 @@ where
 
                             req.head_mut().peer_addr = *this.peer_addr;
 
-                            req.conn_data = this.conn_data.clone();
+                            req.conn_data.clone_from(this.conn_data);
 
                             match this.codec.message_type() {
                                 // request has no payload
diff --git a/actix-http/src/h2/dispatcher.rs b/actix-http/src/h2/dispatcher.rs
index 97ceb51e9..400476c88 100644
--- a/actix-http/src/h2/dispatcher.rs
+++ b/actix-http/src/h2/dispatcher.rs
@@ -126,7 +126,7 @@ where
                     head.headers = parts.headers.into();
                     head.peer_addr = this.peer_addr;
 
-                    req.conn_data = this.conn_data.clone();
+                    req.conn_data.clone_from(&this.conn_data);
 
                     let fut = this.flow.service.call(req);
                     let config = this.config.clone();
diff --git a/actix-multipart/src/form/mod.rs b/actix-multipart/src/form/mod.rs
index 67adfd4b2..451b103fd 100644
--- a/actix-multipart/src/form/mod.rs
+++ b/actix-multipart/src/form/mod.rs
@@ -313,7 +313,8 @@ where
                     let entry = field_limits
                         .entry(field.name().to_owned())
                         .or_insert_with(|| T::limit(field.name()));
-                    limits.field_limit_remaining = entry.to_owned();
+
+                    limits.field_limit_remaining.clone_from(entry);
 
                     T::handle_field(&req, field, &mut limits, &mut state).await?;
 
diff --git a/actix-router/src/path.rs b/actix-router/src/path.rs
index 467420cd3..9031ab763 100644
--- a/actix-router/src/path.rs
+++ b/actix-router/src/path.rs
@@ -154,15 +154,11 @@ impl<T: ResourcePath> Path<T> {
         None
     }
 
-    /// Get matched parameter by name.
+    /// Returns matched parameter by name.
     ///
     /// If keyed parameter is not available empty string is used as default value.
     pub fn query(&self, key: &str) -> &str {
-        if let Some(s) = self.get(key) {
-            s
-        } else {
-            ""
-        }
+        self.get(key).unwrap_or_default()
     }
 
     /// Return iterator to items in parameter container.
diff --git a/actix-web/src/config.rs b/actix-web/src/config.rs
index fba0c2717..5e8b056f1 100644
--- a/actix-web/src/config.rs
+++ b/actix-web/src/config.rs
@@ -148,7 +148,7 @@ impl AppConfig {
 
     #[cfg(test)]
     pub(crate) fn set_host(&mut self, host: &str) {
-        self.host = host.to_owned();
+        host.clone_into(&mut self.host);
     }
 }
 
diff --git a/actix-web/src/resource.rs b/actix-web/src/resource.rs
index 291d67460..00555b7b2 100644
--- a/actix-web/src/resource.rs
+++ b/actix-web/src/resource.rs
@@ -771,7 +771,7 @@ mod tests {
                              data3: web::Data<f64>| {
                                 assert_eq!(**data1, 10);
                                 assert_eq!(**data2, '*');
-                                let error = std::f64::EPSILON;
+                                let error = f64::EPSILON;
                                 assert!((**data3 - 1.0).abs() < error);
                                 HttpResponse::Ok()
                             },