From 36e73fd9ede6580024d8980ef8978fa552e256af Mon Sep 17 00:00:00 2001
From: jasonwitty <jasonpwitty@proton.me>
Date: Sat, 16 Aug 2025 01:25:03 -0700
Subject: [PATCH] cargo fmt

---
 socktop/src/main.rs       |  1 -
 socktop/src/ws.rs         |  2 +-
 socktop/tests/cli_args.rs | 32 +++++++++++++++++++++++++-------
 socktop_agent/src/main.rs | 19 +++++++++++++++----
 socktop_agent/src/tls.rs  |  4 +++-
 5 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/socktop/src/main.rs b/socktop/src/main.rs
index c2c6d54..e1caaa7 100644
--- a/socktop/src/main.rs
+++ b/socktop/src/main.rs
@@ -52,7 +52,6 @@ fn parse_args<I: IntoIterator<Item = String>>(args: I) -> Result<(String, Option
     }
 }
 
-
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     // Reuse the same parsing logic for testability
diff --git a/socktop/src/ws.rs b/socktop/src/ws.rs
index 41af2ac..57065cb 100644
--- a/socktop/src/ws.rs
+++ b/socktop/src/ws.rs
@@ -6,13 +6,13 @@ use rustls::{ClientConfig, RootCertStore};
 use rustls_pemfile::Item;
 use std::io::Read;
 use std::{fs::File, io::BufReader, sync::Arc};
-use url::Url;
 use tokio::net::TcpStream;
 use tokio::time::{interval, Duration};
 use tokio_tungstenite::{
     connect_async, connect_async_tls_with_config, tungstenite::client::IntoClientRequest,
     tungstenite::Message, Connector, MaybeTlsStream, WebSocketStream,
 };
+use url::Url;
 
 use crate::types::{DiskInfo, Metrics, ProcessesPayload};
 
diff --git a/socktop/tests/cli_args.rs b/socktop/tests/cli_args.rs
index c88e622..53433e1 100644
--- a/socktop/tests/cli_args.rs
+++ b/socktop/tests/cli_args.rs
@@ -11,8 +11,15 @@ fn test_help_mentions_short_and_long_flags() {
         .arg("--help")
         .output()
         .expect("run socktop --help");
-    let text = format!("{}{}", String::from_utf8_lossy(&output.stdout), String::from_utf8_lossy(&output.stderr));
-    assert!(text.contains("--tls-ca") && text.contains("-t"), "help text missing --tls-ca/-t\n{text}");
+    let text = format!(
+        "{}{}",
+        String::from_utf8_lossy(&output.stdout),
+        String::from_utf8_lossy(&output.stderr)
+    );
+    assert!(
+        text.contains("--tls-ca") && text.contains("-t"),
+        "help text missing --tls-ca/-t\n{text}"
+    );
 }
 
 #[test]
@@ -21,18 +28,29 @@ fn test_tlc_ca_arg_long_and_short_parsed() {
     let exe = env!("CARGO_BIN_EXE_socktop");
     // Long form with help
     let out = Command::new(exe)
-        .args(["--tls-ca", "/tmp/cert.pem", "--help"]) 
+        .args(["--tls-ca", "/tmp/cert.pem", "--help"])
         .output()
         .expect("run socktop");
-    assert!(out.status.success(), "socktop --tls-ca … --help did not succeed");
-    let text = format!("{}{}", String::from_utf8_lossy(&out.stdout), String::from_utf8_lossy(&out.stderr));
+    assert!(
+        out.status.success(),
+        "socktop --tls-ca … --help did not succeed"
+    );
+    let text = format!(
+        "{}{}",
+        String::from_utf8_lossy(&out.stdout),
+        String::from_utf8_lossy(&out.stderr)
+    );
     assert!(text.contains("Usage:"));
     // Short form with help
     let out2 = Command::new(exe)
-        .args(["-t", "/tmp/cert.pem", "--help"]) 
+        .args(["-t", "/tmp/cert.pem", "--help"])
         .output()
         .expect("run socktop");
     assert!(out2.status.success(), "socktop -t … --help did not succeed");
-    let text2 = format!("{}{}", String::from_utf8_lossy(&out2.stdout), String::from_utf8_lossy(&out2.stderr));
+    let text2 = format!(
+        "{}{}",
+        String::from_utf8_lossy(&out2.stdout),
+        String::from_utf8_lossy(&out2.stderr)
+    );
     assert!(text2.contains("Usage:"));
 }
diff --git a/socktop_agent/src/main.rs b/socktop_agent/src/main.rs
index 3f16f31..7d4a22d 100644
--- a/socktop_agent/src/main.rs
+++ b/socktop_agent/src/main.rs
@@ -99,7 +99,9 @@ mod tests_cli_agent {
                 "--port" => long = it.next(),
                 "-p" => short = it.next(),
                 _ if a.starts_with("--port=") => {
-                    if let Some((_, v)) = a.split_once('=') { long = Some(v.to_string()); }
+                    if let Some((_, v)) = a.split_once('=') {
+                        long = Some(v.to_string());
+                    }
                 }
                 _ => {}
             }
@@ -111,9 +113,18 @@ mod tests_cli_agent {
 
     #[test]
     fn port_long_short_and_assign() {
-        assert_eq!(parse_port(vec!["agent".into(), "--port".into(), "9001".into()], 8443), 9001);
-        assert_eq!(parse_port(vec!["agent".into(), "-p".into(), "9002".into()], 8443), 9002);
-        assert_eq!(parse_port(vec!["agent".into(), "--port=9003".into()], 8443), 9003);
+        assert_eq!(
+            parse_port(vec!["agent".into(), "--port".into(), "9001".into()], 8443),
+            9001
+        );
+        assert_eq!(
+            parse_port(vec!["agent".into(), "-p".into(), "9002".into()], 8443),
+            9002
+        );
+        assert_eq!(
+            parse_port(vec!["agent".into(), "--port=9003".into()], 8443),
+            9003
+        );
         assert_eq!(parse_port(vec!["agent".into()], 8443), 8443);
     }
 }
diff --git a/socktop_agent/src/tls.rs b/socktop_agent/src/tls.rs
index 4586db2..12d876d 100644
--- a/socktop_agent/src/tls.rs
+++ b/socktop_agent/src/tls.rs
@@ -3,7 +3,9 @@ use openssl::hash::MessageDigest;
 use openssl::nid::Nid;
 use openssl::pkey::PKey;
 use openssl::rsa::Rsa;
-use openssl::x509::extension::{BasicConstraints, ExtendedKeyUsage, KeyUsage, SubjectAlternativeName};
+use openssl::x509::extension::{
+    BasicConstraints, ExtendedKeyUsage, KeyUsage, SubjectAlternativeName,
+};
 use openssl::x509::{X509NameBuilder, X509};
 use std::{
     fs,