apply clippy suggestions for nightly

Co-Authored-By: Eloi DEMOLIS <[email protected]>
sozu-proxy · Mar 1, 2024 · a9d4c3b · a9d4c3b
1 parent 0c57bd9
commit a9d4c3b
Show file tree

Hide file tree

Showing 22 changed files with 30 additions and 48 deletions.
diff --git a/bin/src/ctl/request_builder.rs b/bin/src/ctl/request_builder.rs
@@ -192,7 +192,7 @@ impl CommandManager {
                     }
 
                     let query_domain = QueryClusterByDomain {
-                        hostname: splitted.get(0).ok_or(CtlError::NeedClusterDomain)?.clone(),
+                        hostname: splitted.first().ok_or(CtlError::NeedClusterDomain)?.clone(),
                         path: splitted.get(1).cloned().map(|path| format!("/{path}")), // We add the / again because of the splitn removing it
                     };
 

diff --git a/bin/src/upgrade.rs b/bin/src/upgrade.rs
@@ -7,7 +7,7 @@ use std::{
     process::Command,
 };
 
-use libc::{self, pid_t};
+use libc::pid_t;
 use mio::net::UnixStream;
 use nix::{
     errno::Errno,

diff --git a/bin/src/util.rs b/bin/src/util.rs
@@ -10,7 +10,6 @@ use nix::{
     errno::Errno,
     fcntl::{fcntl, FcntlArg, FdFlag},
 };
-use thiserror;
 
 use sozu_command_lib::config::Config;
 use sozu_lib::metrics::{self, MetricError};

diff --git a/bin/src/worker.rs b/bin/src/worker.rs
@@ -12,12 +12,11 @@ use std::{
 
 #[cfg(target_os = "macos")]
 use libc::c_char;
-use libc::{self, pid_t};
+use libc::pid_t;
 #[cfg(target_os = "freebsd")]
 use libc::{sysctl, CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, PATH_MAX};
 use mio::net::UnixStream;
 use nix::{
-    self,
     errno::Errno,
     unistd::{fork, ForkResult},
 };

diff --git a/command/src/channel.rs b/command/src/channel.rs
@@ -2,7 +2,6 @@ use std::{
     cmp::min,
     fmt::Debug,
     io::{self, ErrorKind, Read, Write},
-    iter::Iterator,
     marker::PhantomData,
     os::unix::{
         io::{AsRawFd, FromRawFd, IntoRawFd, RawFd},

diff --git a/command/src/config.rs b/command/src/config.rs
@@ -57,8 +57,6 @@ use std::{
     path::PathBuf,
 };
 
-use toml;
-
 use crate::{
     certificate::split_certificate_chain,
     logging::AccessLogFormat,
@@ -517,7 +515,7 @@ impl ListenerBuilder {
                     .ok()
             })
             .map(split_certificate_chain)
-            .unwrap_or_else(Vec::new);
+            .unwrap_or_default();
 
         let (answer_404, answer_503) = self.get_404_503_answers()?;
 

diff --git a/command/src/logging/logs.rs b/command/src/logging/logs.rs
@@ -1,6 +1,6 @@
 use std::{
     cell::RefCell,
-    cmp::{self, Ord},
+    cmp,
     env,
     fmt::Arguments,
     fs::{File, OpenOptions},
@@ -11,7 +11,6 @@ use std::{
     str::FromStr,
 };
 
-use libc;
 use mio::net::UnixDatagram;
 use prost::{encoding::encoded_len_varint, Message};
 use rand::{distributions::Alphanumeric, thread_rng, Rng};

diff --git a/command/src/parser.rs b/command/src/parser.rs
@@ -1,5 +1,4 @@
 use nom::{
-    self,
     bytes::streaming::is_not,
     character::complete::char,
     combinator::map_res,

diff --git a/command/src/response.rs b/command/src/response.rs
@@ -1,4 +1,4 @@
-use std::{cmp::Ordering, collections::BTreeMap, default::Default, fmt, net::SocketAddr};
+use std::{cmp::Ordering, collections::BTreeMap, fmt, net::SocketAddr};
 
 use crate::{
     proto::command::{

diff --git a/command/src/scm_socket.rs b/command/src/scm_socket.rs
@@ -264,7 +264,7 @@ impl Listeners {
     }
 }
 
-fn parse_addresses(addresses: &Vec<String>) -> Result<Vec<SocketAddr>, ScmSocketError> {
+fn parse_addresses(addresses: &[String]) -> Result<Vec<SocketAddr>, ScmSocketError> {
     let mut parsed_addresses = Vec::new();
     for address in addresses {
         parsed_addresses.push(address.parse::<SocketAddr>().map_err(|error| {

diff --git a/command/src/state.rs b/command/src/state.rs
@@ -6,7 +6,7 @@ use std::{
     fs::File,
     hash::{Hash, Hasher},
     io::Write,
-    iter::{repeat, FromIterator},
+    iter::repeat,
     net::SocketAddr,
 };
 
@@ -382,7 +382,7 @@ impl ConfigState {
         let entry = self
             .certificates
             .entry(add.address.clone().into())
-            .or_insert_with(HashMap::new);
+            .or_default();
 
         let mut add = add.clone();
         add.certificate
@@ -464,7 +464,7 @@ impl ConfigState {
         let tcp_frontends = self
             .tcp_fronts
             .entry(front.cluster_id.clone())
-            .or_insert_with(Vec::new);
+            .or_default();
 
         let tcp_frontend = TcpFrontend {
             cluster_id: front.cluster_id.clone(),
@@ -514,7 +514,7 @@ impl ConfigState {
         let backends = self
             .backends
             .entry(backend.cluster_id.clone())
-            .or_insert_with(Vec::new);
+            .or_default();
 
         // we might be modifying the sticky id or load balancing parameters
         backends.retain(|b| b.backend_id != backend.backend_id || b.address != backend.address);

diff --git a/e2e/src/mock/https_client.rs b/e2e/src/mock/https_client.rs
@@ -1,7 +1,6 @@
 use std::{sync::Arc, time::SystemTime};
 
 use hyper::{
-    self,
     client::{connect::dns::GaiResolver, HttpConnector, ResponseFuture},
     StatusCode,
 };

diff --git a/e2e/src/mock/sync_backend.rs b/e2e/src/mock/sync_backend.rs
@@ -48,7 +48,7 @@ impl Backend {
         let timeout = Duration::from_millis(100);
         let timeout = libc::timeval {
             tv_sec: 0,
-            tv_usec: timeout.subsec_micros().try_into().unwrap(),
+            tv_usec: timeout.subsec_micros().into(),
         };
         let listener = unsafe {
             let fd = listener.into_raw_fd();

diff --git a/lib/src/backends.rs b/lib/src/backends.rs
@@ -213,7 +213,7 @@ impl BackendMap {
     pub fn add_backend(&mut self, cluster_id: &str, backend: Backend) {
         self.backends
             .entry(cluster_id.to_string())
-            .or_insert_with(BackendList::new)
+            .or_default()
             .add_backend(backend);
     }
 
@@ -351,7 +351,7 @@ impl BackendMap {
     pub fn get_or_create_backend_list_for_cluster(&mut self, cluster_id: &str) -> &mut BackendList {
         self.backends
             .entry(cluster_id.to_string())
-            .or_insert_with(BackendList::new)
+            .or_default()
     }
 }
 

diff --git a/lib/src/http.rs b/lib/src/http.rs
@@ -517,7 +517,7 @@ impl HttpProxy {
     }
 
     pub fn get_listener(&self, token: &Token) -> Option<Rc<RefCell<HttpListener>>> {
-        self.listeners.get(token).map(Clone::clone)
+        self.listeners.get(token).cloned()
     }
 
     pub fn remove_listener(&mut self, remove: RemoveListener) -> Result<(), ProxyError> {
@@ -869,7 +869,7 @@ impl ProxyConfiguration for HttpProxy {
         let listener = self
             .listeners
             .get(&Token(listener_token.0))
-            .map(Clone::clone)
+            .cloned()
             .ok_or(AcceptError::IoError)?;
 
         if let Err(e) = frontend_sock.set_nodelay(true) {

diff --git a/lib/src/metrics/local_drain.rs b/lib/src/metrics/local_drain.rs
@@ -121,14 +121,13 @@ enum MetricMeta {
 pub struct LocalClusterMetrics {
     /// metric_name -> metric value
     cluster: BTreeMap<String, AggregatedMetric>,
-    ///
     backends: Vec<LocalBackendMetrics>,
 }
 
 impl LocalClusterMetrics {
     fn to_filtered_metrics(
         &self,
-        metric_names: &Vec<String>,
+        metric_names: &[String],
     ) -> Result<ClusterMetrics, MetricError> {
         let cluster = self
             .cluster
@@ -182,7 +181,7 @@ pub struct LocalBackendMetrics {
 impl LocalBackendMetrics {
     fn to_filtered_metrics(
         &self,
-        metric_names: &Vec<String>,
+        metric_names: &[String],
     ) -> Result<BackendMetrics, MetricError> {
         let filtered_backend_metrics = self
             .metrics
@@ -306,7 +305,7 @@ impl LocalDrain {
 
     pub fn dump_all_metrics(
         &mut self,
-        metric_names: &Vec<String>,
+        metric_names: &[String],
     ) -> Result<WorkerMetrics, MetricError> {
         Ok(WorkerMetrics {
             proxy: self.dump_proxy_metrics(metric_names),
@@ -316,7 +315,7 @@ impl LocalDrain {
 
     pub fn dump_proxy_metrics(
         &mut self,
-        metric_names: &Vec<String>,
+        metric_names: &[String],
     ) -> BTreeMap<String, FilteredMetrics> {
         self.proxy_metrics
             .iter()
@@ -333,7 +332,7 @@ impl LocalDrain {
 
     pub fn dump_cluster_metrics(
         &mut self,
-        metric_names: &Vec<String>,
+        metric_names: &[String],
     ) -> Result<BTreeMap<String, ClusterMetrics>, MetricError> {
         let mut cluster_data = BTreeMap::new();
 
@@ -348,7 +347,7 @@ impl LocalDrain {
     fn metrics_of_one_cluster(
         &self,
         cluster_id: &str,
-        metric_names: &Vec<String>,
+        metric_names: &[String],
     ) -> Result<ClusterMetrics, MetricError> {
         let aggregated = self
             .cluster_metrics
@@ -363,7 +362,7 @@ impl LocalDrain {
     fn metrics_of_one_backend(
         &self,
         backend_id: &str,
-        metric_names: &Vec<String>,
+        metric_names: &[String],
     ) -> Result<BackendMetrics, MetricError> {
         for cluster_metrics in self.cluster_metrics.values() {
             if let Some(backend_metrics) = cluster_metrics
@@ -383,8 +382,8 @@ impl LocalDrain {
 
     fn query_clusters(
         &mut self,
-        cluster_ids: &Vec<String>,
-        metric_names: &Vec<String>,
+        cluster_ids: &[String],
+        metric_names: &[String],
     ) -> Result<WorkerMetrics, MetricError> {
         debug!("Querying cluster with ids: {:?}", cluster_ids);
         let mut clusters: BTreeMap<String, ClusterMetrics> = BTreeMap::new();
@@ -405,8 +404,8 @@ impl LocalDrain {
 
     fn query_backends(
         &mut self,
-        backend_ids: &Vec<String>,
-        metric_names: &Vec<String>,
+        backend_ids: &[String],
+        metric_names: &[String],
     ) -> Result<WorkerMetrics, MetricError> {
         let mut clusters: BTreeMap<String, ClusterMetrics> = BTreeMap::new();
 

diff --git a/lib/src/pool.rs b/lib/src/pool.rs
@@ -13,8 +13,6 @@ use std::{
     sync::atomic::{AtomicUsize, Ordering},
 };
 
-use poule;
-
 static BUFFER_COUNT: AtomicUsize = AtomicUsize::new(0);
 
 pub struct Pool {

diff --git a/lib/src/protocol/proxy_protocol/parser.rs b/lib/src/protocol/proxy_protocol/parser.rs
@@ -1,7 +1,4 @@
-use std::{
-    convert::From,
-    net::{Ipv4Addr, Ipv6Addr, SocketAddrV4, SocketAddrV6},
-};
+use std::net::{Ipv4Addr, Ipv6Addr, SocketAddrV4, SocketAddrV6};
 
 use nom::{
     bytes::streaming::{tag, take},

diff --git a/lib/src/retry.rs b/lib/src/retry.rs
@@ -1,6 +1,6 @@
 use std::{cmp, fmt::Debug, time};
 
-use rand::{self, Rng};
+use rand::Rng;
 
 #[derive(Debug, PartialEq, Eq)]
 pub enum RetryAction {

diff --git a/lib/src/server.rs b/lib/src/server.rs
@@ -2,7 +2,6 @@
 use std::{
     cell::RefCell,
     collections::{HashSet, VecDeque},
-    convert::TryFrom,
     io::Error as IoError,
     os::unix::io::{AsRawFd, FromRawFd},
     rc::Rc,

diff --git a/lib/src/timer.rs b/lib/src/timer.rs
@@ -12,7 +12,6 @@ use crate::server::TIMER;
 
 // Conversion utilities
 mod convert {
-    use std::convert::TryFrom;
     use time::Duration;
 
     /// Convert a `Duration` to milliseconds, rounding up and saturating at

diff --git a/lib/src/tls.rs b/lib/src/tls.rs
@@ -4,9 +4,7 @@
 //! [`CertifiedKey` format](https://docs.rs/rustls/latest/rustls/sign/struct.CertifiedKey.html),
 //! exposes them to the HTTPS listener for TLS handshakes.
 use std::{
-    borrow::ToOwned,
     collections::{HashMap, HashSet},
-    convert::From,
     fmt,
     io::BufReader,
     str::FromStr,
@@ -184,7 +182,7 @@ impl CertificateResolver {
 
             self.name_fingerprint_idx
                 .entry(new_name.to_owned())
-                .or_insert_with(HashSet::new)
+                .or_default()
                 .insert(cert_to_add.fingerprint.to_owned());
         }