cargo fmt, clippy fixes

Author: Thea Rossman

Cargo.toml

@@ -4,7 +4,8 @@ members = [
     "datatypes",
     "examples/websites",
     "examples/port_count",
-    "examples/filter_stats",
+    # Exclude from compilation; many subscriptions takes a long time to compile
+    # "examples/filter_stats",
     "examples/protocols",
 ]
 resolver = "2"

core/src/filter/actions.rs

@@ -11,6 +11,7 @@
 /// Each filter stage returns a set of actions and a set of terminal actions.
 /// The terminal actions are the subset of actions that are maintained through
 /// the next filter stage.
+use std::fmt;
 use bitmask_enum::bitmask;
 
 #[bitmask]
@@ -280,7 +281,6 @@ use proc_macro2::{Ident, Span};
 use quote::{quote, ToTokens};
 use std::str::FromStr;
 
-#[allow(clippy::to_string_trait_impl)]
 impl FromStr for ActionData {
     type Err = core::fmt::Error;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
@@ -301,23 +301,23 @@ impl FromStr for ActionData {
     }
 }
 
-#[allow(clippy::to_string_trait_impl)]
-impl ToString for ActionData {
-    fn to_string(&self) -> String {
-        match *self {
-            ActionData::PacketContinue => "PacketContinue".into(),
-            ActionData::PacketDeliver => "PacketDeliver".into(),
-            ActionData::ProtoProbe => "ProtoProbe".into(),
-            ActionData::ProtoFilter => "ProtoFilter".into(),
-            ActionData::SessionFilter => "SessionFilter".into(),
-            ActionData::SessionDeliver => "SessionDeliver".into(),
-            ActionData::SessionTrack => "SessionTrack".into(),
-            ActionData::UpdatePDU => "UpdatePDU".into(),
-            ActionData::ReassembledUpdatePDU => "ReassembledUpdatePDU".into(),
-            ActionData::PacketTrack => "PacketTrack".into(),
-            ActionData::ConnDeliver => "ConnDeliver".into(),
+impl fmt::Display for ActionData {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let s = match *self {
+            ActionData::PacketContinue => "PacketContinue",
+            ActionData::PacketDeliver => "PacketDeliver",
+            ActionData::ProtoProbe => "ProtoProbe",
+            ActionData::ProtoFilter => "ProtoFilter",
+            ActionData::SessionFilter => "SessionFilter",
+            ActionData::SessionDeliver => "SessionDeliver",
+            ActionData::SessionTrack => "SessionTrack",
+            ActionData::UpdatePDU => "UpdatePDU",
+            ActionData::ReassembledUpdatePDU => "ReassembledUpdatePDU",
+            ActionData::PacketTrack => "PacketTrack",
+            ActionData::ConnDeliver => "ConnDeliver",
             _ => panic!("Unknown ActionData"),
-        }
+        };
+        write!(f, "{}", s)
     }
 }
 

examples/protocols/src/main.rs

@@ -1,7 +1,7 @@
-use retina_filtergen::{filter, retina_main};
-use retina_core::{CoreId, Runtime, FiveTuple};
 use retina_core::config::load_config;
+use retina_core::{CoreId, FiveTuple, Runtime};
 use retina_datatypes::*;
+use retina_filtergen::{filter, retina_main};
 
 use std::fs::File;
 use std::io::{BufRead, BufReader, BufWriter, Write};
@@ -163,7 +163,6 @@ fn combine_results(outfile: &PathBuf) {
     file.write_all(results.as_bytes()).unwrap();
 }
 
-
 #[retina_main(4)]
 fn main() {
     init();
@@ -186,4 +185,4 @@ fn main() {
     let mut runtime: Runtime<SubscribedWrapper> = Runtime::new(config, filter).unwrap();
     runtime.run();
     combine_results(&args.outfile);
-}
+}