From eed04f1d5cf6172d1d46fb08942816b1198c222c Mon Sep 17 00:00:00 2001
From: jasonwitty <jasonpwitty@proton.me>
Date: Thu, 4 Sep 2025 06:04:57 -0700
Subject: [PATCH] Fix remaining clippy warnings in socktop_agent

---
 socktop_agent/src/metrics.rs | 44 ++++++++++++++++++------------------
 socktop_agent/src/ws.rs      | 12 +++++-----
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/socktop_agent/src/metrics.rs b/socktop_agent/src/metrics.rs
index 91f8d9a..c8dacc3 100644
--- a/socktop_agent/src/metrics.rs
+++ b/socktop_agent/src/metrics.rs
@@ -74,11 +74,11 @@ fn cached_temp() -> Option<f32> {
 }
 
 fn set_temp(v: Option<f32>) {
-    if let Some(lock) = TEMP.get() {
-        if let Ok(mut c) = lock.lock() {
-            c.v = v;
-            c.at = Some(Instant::now());
-        }
+    if let Some(lock) = TEMP.get()
+        && let Ok(mut c) = lock.lock()
+    {
+        c.v = v;
+        c.at = Some(Instant::now());
     }
 }
 
@@ -98,11 +98,11 @@ fn cached_gpus() -> Option<Vec<crate::gpu::GpuMetrics>> {
 }
 
 fn set_gpus(v: Option<Vec<crate::gpu::GpuMetrics>>) {
-    if let Some(lock) = GPUC.get() {
-        if let Ok(mut c) = lock.lock() {
-            c.v = v.clone();
-            c.at = Some(Instant::now());
-        }
+    if let Some(lock) = GPUC.get()
+        && let Ok(mut c) = lock.lock()
+    {
+        c.v = v.clone();
+        c.at = Some(Instant::now());
     }
 }
 
@@ -116,10 +116,10 @@ pub async fn collect_fast_metrics(state: &AppState) -> Metrics {
     let ttl = StdDuration::from_millis(ttl_ms);
     {
         let cache = state.cache_metrics.lock().await;
-        if cache.is_fresh(ttl) {
-            if let Some(c) = cache.get() {
-                return c.clone();
-            }
+        if cache.is_fresh(ttl)
+            && let Some(c) = cache.get()
+        {
+            return c.clone();
         }
     }
     let mut sys = state.sys.lock().await;
@@ -278,10 +278,10 @@ pub async fn collect_disks(state: &AppState) -> Vec<DiskInfo> {
     let ttl = StdDuration::from_millis(ttl_ms);
     {
         let cache = state.cache_disks.lock().await;
-        if cache.is_fresh(ttl) {
-            if let Some(v) = cache.get() {
-                return v.clone();
-            }
+        if cache.is_fresh(ttl)
+            && let Some(v) = cache.get()
+        {
+            return v.clone();
         }
     }
     let mut disks_list = state.disks.lock().await;
@@ -347,10 +347,10 @@ pub async fn collect_processes_all(state: &AppState) -> ProcessesPayload {
     let ttl = StdDuration::from_millis(ttl_ms);
     {
         let cache = state.cache_processes.lock().await;
-        if cache.is_fresh(ttl) {
-            if let Some(c) = cache.get() {
-                return c.clone();
-            }
+        if cache.is_fresh(ttl)
+            && let Some(c) = cache.get()
+        {
+            return c.clone();
         }
     }
     // Reuse shared System to avoid reallocation; refresh processes fully.
diff --git a/socktop_agent/src/ws.rs b/socktop_agent/src/ws.rs
index 6ca99e1..9586f14 100644
--- a/socktop_agent/src/ws.rs
+++ b/socktop_agent/src/ws.rs
@@ -40,12 +40,12 @@ pub async fn ws_handler(
     Query(q): Query<HashMap<String, String>>,
 ) -> Response {
     // optional auth
-    if let Some(expected) = state.auth_token.as_ref() {
-        if q.get("token") != Some(expected) {
-            return ws.on_upgrade(|socket| async move {
-                let _ = socket.close().await;
-            });
-        }
+    if let Some(expected) = state.auth_token.as_ref()
+        && q.get("token") != Some(expected)
+    {
+        return ws.on_upgrade(|socket| async move {
+            let _ = socket.close().await;
+        });
     }
     ws.on_upgrade(move |socket| handle_socket(socket, state))
 }