Appease clippy

libs/fast-nat/src/bimap.rs

@@ -63,6 +63,11 @@ where
     pub fn len(&self) -> usize {
         self.left_to_right.len()
     }
+
+    /// Check if the `BiHashMap` is empty
+    pub fn is_empty(&self) -> bool {
+        self.left_to_right.is_empty()
+    }
 }
 
 impl<Left, Right> Default for BiHashMap<Left, Right> {

libs/fast-nat/src/cpnat.rs

@@ -93,6 +93,12 @@ impl CrossProtocolNetworkAddressTable {
     pub fn len(&self) -> usize {
         self.addr_map.len()
     }
+
+    /// Check if the table is empty
+    #[must_use]
+    pub fn is_empty(&self) -> bool {
+        self.addr_map.is_empty()
+    }
 }
 
 impl Default for CrossProtocolNetworkAddressTable {
@@ -118,7 +124,8 @@ pub struct CrossProtocolNetworkAddressTableWithIpv4Pool {
 
 impl CrossProtocolNetworkAddressTableWithIpv4Pool {
     /// Construct a new Cross-protocol network address table with a given IPv4 pool
-    pub fn new<T: Into<u32> + Clone>(pool: Vec<(T, T)>, timeout: Duration) -> Self {
+    #[must_use]
+    pub fn new<T: Into<u32> + Clone>(pool: &[(T, T)], timeout: Duration) -> Self {
         Self {
             table: CrossProtocolNetworkAddressTable::default(),
             pool: pool

libs/protomask-metrics/src/lib.rs

@@ -3,6 +3,7 @@
 #![allow(clippy::module_name_repetitions)]
 #![allow(clippy::missing_errors_doc)]
 #![allow(clippy::missing_panics_doc)]
+#![allow(clippy::doc_markdown)]
 
 pub mod metrics;
 

src/protomask-clat.rs

@@ -110,7 +110,7 @@ pub async fn main() {
                     unsafe { embed_ipv4_addr_unchecked(*source, args.embed_prefix) },
                     unsafe { embed_ipv4_addr_unchecked(*dest, args.embed_prefix) },
                 )
-                .map(|output| Some(output))?)
+                .map(Some)?)
             },
             // IPv6 -> IPv4
             |packet, source, dest| {
@@ -119,7 +119,7 @@ pub async fn main() {
                     unsafe { extract_ipv4_addr_unchecked(*source, args.embed_prefix.prefix_len()) },
                     unsafe { extract_ipv4_addr_unchecked(*dest, args.embed_prefix.prefix_len()) },
                 )
-                .map(|output| Some(output))?)
+                .map(Some)?)
             },
         ) {
             // Write the packet if we get one back from the handler functions

src/protomask.rs

@@ -69,7 +69,7 @@ struct PoolArgs {
 impl PoolArgs {
     /// Read all pool prefixes from the chosen source
     pub fn prefixes(&self) -> Result<Vec<Ipv4Net>, Box<dyn std::error::Error>> {
-        match self.pool_prefixes.len() > 0 {
+        match !self.pool_prefixes.is_empty() {
             true => Ok(self.pool_prefixes.clone()),
             false => {
                 let mut prefixes = Vec::new();
@@ -139,7 +139,8 @@ pub async fn main() {
         pool_prefixes
             .iter()
             .map(|prefix| (u32::from(prefix.addr()), prefix.prefix_len() as u32))
-            .collect(),
+            .collect::<Vec<(u32, u32)>>()
+            .as_slice(),
         Duration::from_secs(args.reservation_timeout),
     ));
     for (v6_addr, v4_addr) in args.get_static_reservations().unwrap() {
@@ -166,7 +167,7 @@ pub async fn main() {
                     unsafe { embed_ipv4_addr_unchecked(*source, args.translation_prefix) },
                     new_destination.into(),
                 )
-                .map(|output| Some(output))?),
+                .map(Some)?),
                 None => {
                     protomask_metrics::metric!(PACKET_COUNTER, PROTOCOL_IPV4, STATUS_DROPPED);
                     Ok(None)
@@ -176,15 +177,12 @@ pub async fn main() {
             |packet, source, dest| {
                 Ok(translate_ipv6_to_ipv4(
                     packet,
-                    addr_table
-                        .borrow_mut()
-                        .get_or_create_ipv4(source.clone())?
-                        .into(),
+                    addr_table.borrow_mut().get_or_create_ipv4(*source)?.into(),
                     unsafe {
                         extract_ipv4_addr_unchecked(*dest, args.translation_prefix.prefix_len())
                     },
                 )
-                .map(|output| Some(output))?)
+                .map(Some)?)
             },
         ) {
             // Write the packet if we get one back from the handler functions