Merge pull request #1111 from sozu-proxy/devel/fdubois/chore/apply-clippy

chore: apply cargo clippy

Author: FlorentinDUBOIS

command/src/config.rs

@@ -1364,10 +1364,12 @@ impl ConfigBuilder {
                                         })
                                     {
                                         //println!("using listener certificate for {:}", frontend.address);
-                                        frontend.certificate = https_listener.certificate.clone();
+                                        frontend
+                                            .certificate
+                                            .clone_from(&https_listener.certificate);
                                         frontend.certificate_chain =
                                             Some(https_listener.certificate_chain.clone());
-                                        frontend.key = https_listener.key.clone();
+                                        frontend.key.clone_from(&https_listener.key);
                                     }
                                     if frontend.certificate.is_none() {
                                         debug!("known addresses: {:#?}", self.known_addresses);

command/src/logging/logs.rs

@@ -764,6 +764,12 @@ macro_rules! _prompt_log {
 pub struct LogLineCachedState(u8);
 const LOG_LINE_ENABLED: u8 = 1 << 7;
 
+impl Default for LogLineCachedState {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl LogLineCachedState {
     pub const fn new() -> Self {
         Self(0)

command/src/state.rs

@@ -2195,13 +2195,13 @@ mod tests {
             certificates_found_by_fingerprint
         );
 
-        assert!(certificates_found_by_fingerprint.len() >= 1);
+        assert!(!certificates_found_by_fingerprint.is_empty());
 
         let certificate_found_by_domain_name = state.get_certificates(QueryCertificatesFilters {
             domain: Some("lolcatho.st".to_string()),
             fingerprint: None,
         });
 
-        assert!(certificate_found_by_domain_name.len() >= 1);
+        assert!(!certificate_found_by_domain_name.is_empty());
     }
 }

e2e/src/sozu/command_id.rs

@@ -17,7 +17,7 @@ impl CommandID {
 
     pub fn next(&mut self) -> String {
         let id = format!("{}{}", self.prefix, self.id);
-        self.last = id.to_owned();
+        id.clone_into(&mut self.last);
         self.id += 1;
         id
     }

e2e/src/tests/mod.rs

@@ -92,7 +92,7 @@ pub fn setup_test<S: Into<String>>(
             RequestType::AddBackend(Worker::default_backend(
                 "cluster_0",
                 format!("cluster_0-{i}"),
-                back_address.into(),
+                back_address,
                 if should_stick {
                     Some(format!("sticky_cluster_0-{i}"))
                 } else {

e2e/src/tests/tests.rs

@@ -362,13 +362,13 @@ pub fn try_tls_endpoint() -> State {
     let mut worker = Worker::start_new_worker("TLS-ENDPOINT", config, &listeners, state);
 
     worker.send_proxy_request_type(RequestType::AddHttpsListener(
-        ListenerBuilder::new_https(front_address.clone().into())
+        ListenerBuilder::new_https(front_address.clone())
             .to_tls(None)
             .unwrap(),
     ));
 
     worker.send_proxy_request_type(RequestType::ActivateListener(ActivateListener {
-        address: front_address.clone().into(),
+        address: front_address.clone(),
         proxy: ListenerType::Https.into(),
         from_scm: false,
     }));
@@ -391,7 +391,7 @@ pub fn try_tls_endpoint() -> State {
         names: vec![],
     };
     let add_certificate = AddCertificate {
-        address: front_address.into(),
+        address: front_address,
         certificate: certificate_and_key,
         expired_at: None,
     };
@@ -1062,7 +1062,7 @@ pub fn try_blue_geen() -> State {
     worker.send_proxy_request_type(RequestType::AddBackend(Worker::default_backend(
         "cluster_0",
         "cluster_0-0",
-        primary_address.into(),
+        primary_address,
         None,
     )));
     worker.read_to_last();
@@ -1081,7 +1081,7 @@ pub fn try_blue_geen() -> State {
     worker.send_proxy_request_type(RequestType::AddBackend(Worker::default_backend(
         "cluster_0",
         "cluster_0-1",
-        secondary_address.into(),
+        secondary_address,
         None,
     )));
     worker.read_to_last();
@@ -1138,7 +1138,7 @@ pub fn try_keep_alive() -> State {
 
     let mut backend = backends.pop().unwrap();
     let mut client = Client::new(
-        format!("client"),
+        "client".to_string(),
         front_address,
         "GET /api HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n",
     );
@@ -1220,7 +1220,7 @@ pub fn try_stick() -> State {
     let mut backend2 = backends.pop().unwrap();
     let mut backend1 = backends.pop().unwrap();
     let mut client = Client::new(
-        format!("client"),
+        "client".to_string(),
         front_address,
         "GET /api HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\nCookie: foo=bar\r\n\r\n",
     );
@@ -1423,7 +1423,7 @@ pub fn try_head() -> State {
     let mut client = Client::new(
         "client",
         front_address,
-        http_request("HEAD", "/api", format!("ping"), "localhost"),
+        http_request("HEAD", "/api", "ping".to_string(), "localhost"),
     );
 
     client.connect();
@@ -1559,13 +1559,13 @@ fn try_wildcard() -> State {
     let mut backend0 = SyncBackend::new(
         "BACKEND_0",
         back_address,
-        http_ok_response(format!("pong0")),
+        http_ok_response("pong0".to_string()),
     );
 
     let mut client = Client::new(
         "client",
         front_address,
-        http_request("POST", "/api", format!("ping"), "www.sozu.io"),
+        http_request("POST", "/api", "ping".to_string(), "www.sozu.io"),
     );
 
     backend0.connect();
@@ -1604,7 +1604,7 @@ fn try_wildcard() -> State {
     let mut backend1 = SyncBackend::new(
         "BACKEND_1",
         back_address,
-        http_ok_response(format!("pong1")),
+        http_ok_response("pong1".to_string()),
     );
 
     worker.read_to_last();

lib/src/backends.rs

@@ -405,8 +405,9 @@ impl BackendList {
             // keeping connection retry state
             Some(old_backend) => {
                 let mut b = old_backend.borrow_mut();
-                b.sticky_id = backend.sticky_id.clone();
-                b.load_balancing_parameters = backend.load_balancing_parameters.clone();
+                b.sticky_id.clone_from(&backend.sticky_id);
+                b.load_balancing_parameters
+                    .clone_from(&backend.load_balancing_parameters);
                 b.backup = backend.backup;
             }
         }

lib/src/lib.rs

@@ -860,7 +860,13 @@ impl Display for Readiness {
         display_ready(r, self.event);
         display_ready(mixed, self.interest & self.event);
 
-        write!(f, "I({:?})&R({:?})=M({:?})", String::from_utf8_lossy(i), String::from_utf8_lossy(r), String::from_utf8_lossy(mixed))
+        write!(
+            f,
+            "I({:?})&R({:?})=M({:?})",
+            String::from_utf8_lossy(i),
+            String::from_utf8_lossy(r),
+            String::from_utf8_lossy(mixed)
+        )
     }
 }
 

lib/src/load_balancing.rs

@@ -246,6 +246,6 @@ mod test {
         backends.remove(1);
 
         let backend2 = roundrobin.next_available_backend(&mut backends);
-        assert_eq!(backend2.as_ref(), backends.get(0));
+        assert_eq!(backend2.as_ref(), backends.first());
     }
 }

lib/src/metrics/local_drain.rs

@@ -610,7 +610,7 @@ mod tests {
             local_drain
                 .metrics_of_one_backend(
                     "test-backend-1",
-                    &["connections_per_backend".to_string()].to_vec(),
+                    ["connections_per_backend".to_string()].as_ref(),
                 )
                 .expect("could not query metrics for this backend")
         )
@@ -645,7 +645,7 @@ mod tests {
         };
 
         let returned_cluster_metrics = local_drain
-            .metrics_of_one_cluster("test-cluster", &["http_errors".to_string()].to_vec())
+            .metrics_of_one_cluster("test-cluster", ["http_errors".to_string()].as_ref())
             .expect("could not query metrics for this cluster");
 
         assert_eq!(expected_cluster_metrics, returned_cluster_metrics);