fix: deep code review pass 22 - README JSON, non_exhaustive, test assertions

- Update README JSON example to match actual serialization output
  (sys_up_time/first/last are u32 not Duration, field name is flowsets not sets)
- Add #[non_exhaustive] to 5 public types: NetflowPacket, ParseResult,
  TemplateEvent, TemplateProtocol, ScopingInfo
- Fix test_error_sample_size_bounded vacuous if-let (now panics on wrong variant)
- Tighten scoped parser test assertions from >= 2 to == 2
- Update match arms in examples/tests/doctests for non_exhaustive compatibility

Author: mikemiles-dev

README.md

@@ -82,39 +82,39 @@ println!("{}", json!(result.packets).to_string());
   {
     "V5": {
       "header": {
+        "version": 5,
         "count": 1,
-        "engine_id": 7,
-        "engine_type": 6,
-        "flow_sequence": 33752069,
-        "sampling_interval": 2057,
-        "sys_up_time": { "nanos": 672000000, "secs": 50332 },
-        "unix_nsecs": 134807553,
+        "sys_up_time": 50332672,
         "unix_secs": 83887623,
-        "version": 5
+        "unix_nsecs": 134807553,
+        "flow_sequence": 33752069,
+        "engine_type": 6,
+        "engine_id": 7,
+        "sampling_interval": 2057
       },
-      "sets": [
+      "flowsets": [
         {
-          "d_octets": 66051,
-          "d_pkts": 101124105,
+          "src_addr": "0.1.2.3",
           "dst_addr": "4.5.6.7",
-          "dst_as": 515,
-          "dst_mask": 5,
-          "dst_port": 1029,
-          "first": { "nanos": 87000000, "secs": 67438 },
-          "input": 515,
-          "last": { "nanos": 553000000, "secs": 134807 },
           "next_hop": "8.9.0.1",
+          "input": 515,
           "output": 1029,
+          "d_pkts": 101124105,
+          "d_octets": 66051,
+          "first": 67438087,
+          "last": 134807553,
+          "src_port": 515,
+          "dst_port": 1029,
           "pad1": 6,
-          "pad2": 1543,
+          "tcp_flags": 7,
           "protocol_number": 8,
           "protocol_type": "Egp",
-          "src_addr": "0.1.2.3",
+          "tos": 9,
           "src_as": 1,
+          "dst_as": 515,
           "src_mask": 4,
-          "src_port": 515,
-          "tcp_flags": 7,
-          "tos": 9
+          "dst_mask": 5,
+          "pad2": 1543
         }
       ]
     }

examples/netflow_pcap.rs

@@ -75,11 +75,8 @@ fn main() {
     for data in pcap_data.iter() {
         for result in parser.iter_packets(data) {
             match result {
-                Ok(packet) => match packet {
-                    NetflowPacket::V5(ref _v5) => parsed_packets.push(packet),
-                    NetflowPacket::V7(ref _v7) => parsed_packets.push(packet),
-                    NetflowPacket::V9(ref _v9) => parsed_packets.push(packet),
-                    NetflowPacket::IPFix(ref ipfix) => {
+                Ok(packet) => match &packet {
+                    NetflowPacket::IPFix(ipfix) => {
                         let has_no_template = ipfix
                             .flowsets
                             .iter()
@@ -90,6 +87,7 @@ fn main() {
                             parsed_packets.push(packet);
                         }
                     }
+                    _ => parsed_packets.push(packet),
                 },
                 Err(e) => println!("Error parsing packet: {:?}", e),
             }

examples/template_hooks.rs

@@ -52,6 +52,7 @@ fn demo_basic_hooks() {
                     template_id,
                     protocol,
                 } => println!("  ❌ Missing template {:?} ({:?})", template_id, protocol),
+                _ => {}
             }
             Ok(())
         })
@@ -195,6 +196,7 @@ fn demo_logging_hooks() {
                     "[ERROR] Missing template {:?} for protocol {:?}",
                     template_id, protocol
                 ),
+                _ => "[DEBUG] Unknown event".to_string(),
             };
             log_clone.lock().unwrap().push(log_entry);
             Ok(())

src/lib.rs

@@ -66,6 +66,7 @@ pub use variable_versions::v9::lookup::V9Field;
 pub use variable_versions::v9::{V9FieldPair, V9FlowRecord};
 
 /// Enum of supported Netflow Versions
+#[non_exhaustive]
 #[derive(Debug, PartialEq, Clone, Serialize)]
 pub enum NetflowPacket {
     /// Version 5
@@ -127,6 +128,7 @@ impl NetflowPacket {
 ///     eprintln!("Parsing stopped: {}", error);
 /// }
 /// ```
+#[non_exhaustive]
 #[derive(Debug, Clone, Serialize)]
 #[must_use = "parsing results should not be discarded; check .packets and .error"]
 pub struct ParseResult {

src/scoped_parser.rs

@@ -371,6 +371,7 @@ impl<K: Hash + Eq> RouterScopedParser<K> {
 }
 
 /// Information extracted from NetFlow packet headers for RFC-compliant scoping.
+#[non_exhaustive]
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum ScopingInfo {
     /// NetFlow v9 packet with source ID
@@ -443,6 +444,7 @@ pub struct V9SourceKey {
 ///     ScopingInfo::Unknown => {
 ///         println!("Invalid or truncated packet");
 ///     }
+///     _ => {}
 /// }
 /// ```
 pub fn extract_scoping_info(data: &[u8]) -> ScopingInfo {

src/template_events.rs

@@ -37,6 +37,7 @@
 use std::sync::Arc;
 
 /// Protocol type for template events.
+#[non_exhaustive]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
 pub enum TemplateProtocol {
     /// NetFlow v9 template
@@ -49,6 +50,7 @@ pub enum TemplateProtocol {
 ///
 /// These events are emitted during template cache operations and allow
 /// users to monitor and react to template state changes.
+#[non_exhaustive]
 #[derive(Debug, Clone)]
 pub enum TemplateEvent {
     /// A new template was learned and added to the cache.

tests/cache_collision.rs

@@ -39,7 +39,7 @@ fn test_auto_scoped_parser_template_isolation() {
     assert_eq!(result2_data.packets.len(), 1);
 
     // Source2 should have a miss, source1 should not
-    assert!(parser.source_count() >= 2);
+    assert_eq!(parser.source_count(), 2);
 }
 
 // Verify that a single NetflowParser produces consistent results across repeated V5 parses

tests/memory_bounds.rs

@@ -64,14 +64,19 @@ fn test_error_sample_size_bounded() {
     let garbage = vec![0xFFu8; 256];
     let result = parser.parse_bytes(&garbage);
 
-    if let Some(netflow_parser::NetflowError::UnsupportedVersion { sample, .. }) = result.error
-    {
-        assert!(
-            sample.len() <= max_sample,
-            "error sample {} bytes exceeds max {}",
-            sample.len(),
-            max_sample
-        );
+    match result.error {
+        Some(netflow_parser::NetflowError::UnsupportedVersion { sample, .. }) => {
+            assert!(
+                sample.len() <= max_sample,
+                "error sample {} bytes exceeds max {}",
+                sample.len(),
+                max_sample
+            );
+        }
+        other => panic!(
+            "expected UnsupportedVersion error, got {:?}",
+            other
+        ),
     }
 }
 

tests/scoped_parser.rs

@@ -47,7 +47,7 @@ fn test_auto_scoped_parser_multiple_sources() {
     let _ = parser.parse_from_source(source2, &v5_packet);
 
     // V5 packets create sources
-    assert!(parser.source_count() >= 2);
+    assert_eq!(parser.source_count(), 2);
 }
 
 // Verify that RouterScopedParser works with String keys for per-router parsing

tests/template_hooks.rs

@@ -211,6 +211,7 @@ fn test_hook_with_logging() {
                     template_id,
                     protocol,
                 } => format!("Missing template {:?} ({:?})", template_id, protocol),
+                _ => "Unknown event".to_string(),
             };
             log_clone.lock().unwrap().push(msg);
             Ok(())
@@ -256,6 +257,7 @@ fn test_hooks_fire_during_parsing() {
                 TemplateEvent::MissingTemplate { .. } => "MissingTemplate",
                 TemplateEvent::Evicted { .. } => "Evicted",
                 TemplateEvent::Expired { .. } => "Expired",
+                _ => "Unknown",
             };
             events_clone.lock().unwrap().push(name.to_string());
             Ok(())