Fix clippy warnings and enforce clippy in CI

Author: Str-Gen

.github/workflows/rust-clippy.yml

@@ -48,8 +48,7 @@ jobs:
           fi
 
       - name: Run rust-clippy
-        run: cargo clippy --all-features --message-format=json | clippy-sarif | tee rust-clippy-results.sarif | sarif-fmt
-        continue-on-error: true
+        run: cargo clippy -p rustiflow --all-targets --message-format=json -- -D warnings | clippy-sarif | tee rust-clippy-results.sarif | sarif-fmt
 
       - name: Upload analysis results to GitHub
         uses: github/codeql-action/upload-sarif@v3

.github/workflows/rust.yml

@@ -37,6 +37,9 @@ jobs:
     - name: Build userspace program
       run: cargo build --verbose
 
+    - name: Run Clippy
+      run: cargo clippy -p rustiflow --all-targets -- -D warnings
+
     - name: Fetch gh-pages branch
       run: git fetch origin gh-pages:gh-pages
 

common/src/lib.rs

@@ -25,6 +25,7 @@ pub struct EbpfEventIpv4 {
 }
 
 impl EbpfEventIpv4 {
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         timestamp_ns: u64,
         ipv4_destination: u32,
@@ -89,6 +90,7 @@ pub struct EbpfEventIpv6 {
 }
 
 impl EbpfEventIpv6 {
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         timestamp_ns: u64,
         ipv6_destination: u128,
@@ -150,10 +152,10 @@ impl NetworkHeader for TcpHdr {
         self.dest
     }
     fn window_size(&self) -> u16 {
-        self.window as u16
+        self.window
     }
     fn combined_flags(&self) -> u8 {
-        ((self.fin() as u8) << 0)
+        (self.fin() as u8)
             | ((self.syn() as u8) << 1)
             | ((self.rst() as u8) << 2)
             | ((self.psh() as u8) << 3)

rustiflow/src/args.rs

@@ -1,5 +1,6 @@
 use clap::{ArgGroup, Args, Parser, Subcommand};
 use serde::{Deserialize, Serialize};
+use std::fmt;
 use strum_macros::{EnumString, VariantNames};
 
 #[derive(Debug, Parser)]
@@ -79,17 +80,18 @@ pub enum Commands {
     },
 }
 
-impl ToString for Commands {
-    fn to_string(&self) -> String {
+impl fmt::Display for Commands {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Commands::Realtime {
                 interface,
                 ingress_only,
-            } => format!(
+            } => write!(
+                f,
                 "Realtime/Interface: {}/Ingress only: {}",
                 interface, ingress_only
             ),
-            Commands::Pcap { path } => format!("Pcap/Path: {}", path),
+            Commands::Pcap { path } => write!(f, "Pcap/Path: {}", path),
         }
     }
 }
@@ -155,6 +157,7 @@ pub enum ExportMethodType {
     Csv,
 }
 
+#[allow(clippy::upper_case_acronyms)]
 #[derive(Serialize, Deserialize, clap::ValueEnum, Clone, Debug, EnumString, VariantNames)]
 #[strum(serialize_all = "kebab_case")]
 pub enum FlowType {

rustiflow/src/flow_table.rs

@@ -200,7 +200,7 @@ where
     async fn check_and_export_expired_flows(&mut self, current_time_us: i64) {
         if self
             .next_check_time_us
-            .map_or(true, |next_check| current_time_us >= next_check)
+            .is_none_or(|next_check| current_time_us >= next_check)
         {
             self.export_expired_flows(current_time_us).await;
             self.next_check_time_us = Some(current_time_us + self.expiration_check_interval_us);

rustiflow/src/flow_tui.rs

@@ -80,15 +80,14 @@ async fn run_app<B: Backend>(
         tokio::select! {
             Ok(_) = packet_rx.changed() => {
                 let counts = packet_rx.borrow();
-                app.update_packet_data(&*counts);
+                app.update_packet_data(&counts);
             }
 
             poll_result = task::spawn_blocking(|| crossterm::event::poll(Duration::from_millis(100))) => {
                 if poll_result?? {
                     if let Event::Key(key) = event::read()? {
-                        match key.code {
-                            KeyCode::Char('q') => return Ok(()),
-                            _ => {}
+                        if let KeyCode::Char('q') = key.code {
+                            return Ok(());
                         }
                     }
                 }

rustiflow/src/flows/basic_flow.rs

@@ -300,7 +300,7 @@ impl Flow for BasicFlow {
         false
     }
 
-    fn close_flow(&mut self, _timestamp_us: i64, cause: FlowExpireCause) -> () {
+    fn close_flow(&mut self, _timestamp_us: i64, cause: FlowExpireCause) {
         self.flow_expire_cause = cause;
         self.update_tcp_close_style(cause);
     }
@@ -322,10 +322,9 @@ impl Flow for BasicFlow {
     }
 
     fn get_features() -> String {
-        format!(
-            "flow_id,source_ip,source_port,destination_ip,destination_port,protocol,\
+        "flow_id,source_ip,source_port,destination_ip,destination_port,protocol,\
             first_timestamp,last_timestamp,duration,flow_expire_cause"
-        )
+            .to_string()
     }
 
     fn dump_without_contamination(&self) -> String {
@@ -340,7 +339,7 @@ impl Flow for BasicFlow {
     }
 
     fn get_features_without_contamination() -> String {
-        format!("src_port_iana,dst_port_iana,protocol,duration,flow_expire_cause")
+        "src_port_iana,dst_port_iana,protocol,duration,flow_expire_cause".to_string()
     }
 
     fn get_first_timestamp_us(&self) -> i64 {

rustiflow/src/flows/custom_flow.rs

@@ -81,7 +81,7 @@ impl Flow for CustomFlow {
 
     fn get_features() -> String {
         // Add here the features of the custom flow.
-        format!("flow_id,icmp_type,icmp_code,icmp_echo_request_count,icmp_echo_reply_count,icmp_error_count,icmp_destination_unreachable_count")
+        "flow_id,icmp_type,icmp_code,icmp_echo_request_count,icmp_echo_reply_count,icmp_error_count,icmp_destination_unreachable_count".to_string()
     }
 
     fn dump_without_contamination(&self) -> String {
@@ -99,7 +99,7 @@ impl Flow for CustomFlow {
 
     fn get_features_without_contamination() -> String {
         // Add here the features of the custom flow without contaminant features.
-        format!("icmp_type,icmp_code,icmp_echo_request_count,icmp_echo_reply_count,icmp_error_count,icmp_destination_unreachable_count")
+        "icmp_type,icmp_code,icmp_echo_request_count,icmp_echo_reply_count,icmp_error_count,icmp_destination_unreachable_count".to_string()
     }
 
     fn get_first_timestamp_us(&self) -> i64 {

rustiflow/src/flows/features/bulk_stats.rs

@@ -116,7 +116,7 @@ impl FlowFeature for BulkStats {
         let current_ts = packet.timestamp_us / 1000;
         // 1. Skip zero-length packets
         let packet_len = packet.length;
-        if packet_len <= 0 {
+        if packet_len == 0 {
             return;
         }
 

rustiflow/src/flows/features/icmp_stats.rs

@@ -54,7 +54,7 @@ impl IcmpStats {
                     self.error_count += 1;
                     self.destination_unreachable_count += 1;
                 }
-                Some(2 | 3 | 4) => self.error_count += 1,
+                Some(2..=4) => self.error_count += 1,
                 _ => {}
             },
             _ => {}