From 764c25846f6f0d1f55f862ec2b1d9468846dbfe7 Mon Sep 17 00:00:00 2001
From: jasonwitty <jasonpwitty@proton.me>
Date: Thu, 4 Sep 2025 05:58:17 -0700
Subject: [PATCH] Fix clippy warnings: collapse nested if statements using
 let-else patterns

---
 socktop/src/app.rs    | 24 +++++++++++-------------
 socktop/src/main.rs   | 36 ++++++++++++++++++------------------
 socktop/src/ui/cpu.rs | 40 ++++++++++++++++++++--------------------
 3 files changed, 49 insertions(+), 51 deletions(-)

diff --git a/socktop/src/app.rs b/socktop/src/app.rs
index af6c606..716a98a 100644
--- a/socktop/src/app.rs
+++ b/socktop/src/app.rs
@@ -269,16 +269,15 @@ impl App {
                         // Processes table: sort by column on header click
                         if let (Some(mm), Some(p_area)) =
                             (self.last_metrics.as_ref(), self.last_procs_area)
-                        {
-                            if let Some(new_sort) = processes_handle_mouse(
+                            && let Some(new_sort) = processes_handle_mouse(
                                 &mut self.procs_scroll_offset,
                                 &mut self.procs_drag,
                                 m,
                                 p_area,
                                 mm.top_processes.len(),
-                            ) {
-                                self.procs_sort_by = new_sort;
-                            }
+                            )
+                        {
+                            self.procs_sort_by = new_sort;
                         }
                     }
                     Event::Resize(_, _) => {}
@@ -299,21 +298,20 @@ impl App {
                 if self.last_procs_poll.elapsed() >= self.procs_interval {
                     if let Ok(AgentResponse::Processes(procs)) =
                         ws.request(AgentRequest::Processes).await
+                        && let Some(mm) = self.last_metrics.as_mut()
                     {
-                        if let Some(mm) = self.last_metrics.as_mut() {
-                            mm.top_processes = procs.top_processes;
-                            mm.process_count = Some(procs.process_count);
-                        }
+                        mm.top_processes = procs.top_processes;
+                        mm.process_count = Some(procs.process_count);
                     }
                     self.last_procs_poll = Instant::now();
                 }
 
                 // Only poll disks every 5s
                 if self.last_disks_poll.elapsed() >= self.disks_interval {
-                    if let Ok(AgentResponse::Disks(disks)) = ws.request(AgentRequest::Disks).await {
-                        if let Some(mm) = self.last_metrics.as_mut() {
-                            mm.disks = disks;
-                        }
+                    if let Ok(AgentResponse::Disks(disks)) = ws.request(AgentRequest::Disks).await
+                        && let Some(mm) = self.last_metrics.as_mut()
+                    {
+                        mm.disks = disks;
                     }
                     self.last_disks_poll = Instant::now();
                 }
diff --git a/socktop/src/main.rs b/socktop/src/main.rs
index 00ee907..428976c 100644
--- a/socktop/src/main.rs
+++ b/socktop/src/main.rs
@@ -71,17 +71,17 @@ pub(crate) fn parse_args<I: IntoIterator<Item = String>>(args: I) -> Result<Pars
                 processes_interval_ms = it.next().and_then(|v| v.parse().ok());
             }
             _ if arg.starts_with("--tls-ca=") => {
-                if let Some((_, v)) = arg.split_once('=') {
-                    if !v.is_empty() {
-                        tls_ca = Some(v.to_string());
-                    }
+                if let Some((_, v)) = arg.split_once('=')
+                    && !v.is_empty()
+                {
+                    tls_ca = Some(v.to_string());
                 }
             }
             _ if arg.starts_with("--profile=") => {
-                if let Some((_, v)) = arg.split_once('=') {
-                    if !v.is_empty() {
-                        profile = Some(v.to_string());
-                    }
+                if let Some((_, v)) = arg.split_once('=')
+                    && !v.is_empty()
+                {
+                    profile = Some(v.to_string());
                 }
             }
             _ if arg.starts_with("--metrics-interval-ms=") => {
@@ -416,16 +416,16 @@ fn spawn_demo_agent(port: u16) -> Result<DemoGuard, Box<dyn std::error::Error>>
     })
 }
 fn find_agent_executable() -> std::path::PathBuf {
-    if let Ok(exe) = std::env::current_exe() {
-        if let Some(parent) = exe.parent() {
-            #[cfg(windows)]
-            let name = "socktop_agent.exe";
-            #[cfg(not(windows))]
-            let name = "socktop_agent";
-            let candidate = parent.join(name);
-            if candidate.exists() {
-                return candidate;
-            }
+    if let Ok(exe) = std::env::current_exe()
+        && let Some(parent) = exe.parent()
+    {
+        #[cfg(windows)]
+        let name = "socktop_agent.exe";
+        #[cfg(not(windows))]
+        let name = "socktop_agent";
+        let candidate = parent.join(name);
+        if candidate.exists() {
+            return candidate;
         }
     }
     std::path::PathBuf::from("socktop_agent")
diff --git a/socktop/src/ui/cpu.rs b/socktop/src/ui/cpu.rs
index 9c0195d..bd2e3a1 100644
--- a/socktop/src/ui/cpu.rs
+++ b/socktop/src/ui/cpu.rs
@@ -180,28 +180,28 @@ pub fn per_core_handle_scrollbar_mouse(
             }
         }
         MouseEventKind::Drag(MouseButton::Left) => {
-            if let Some(mut d) = drag.take() {
-                if d.active {
-                    let dy = (mouse.row as i32) - (d.start_y as i32);
-                    let new_top = (d.start_top as i32 + dy)
-                        .clamp(0, (track.saturating_sub(thumb_len)) as i32)
-                        as usize;
-                    // Inverse mapping top -> offset
-                    if track > thumb_len {
-                        let denom = track - thumb_len;
-                        offset = if max_off == 0 {
-                            0
-                        } else {
-                            (new_top * max_off + denom / 2) / denom
-                        };
+            if let Some(mut d) = drag.take()
+                && d.active
+            {
+                let dy = (mouse.row as i32) - (d.start_y as i32);
+                let new_top = (d.start_top as i32 + dy)
+                    .clamp(0, (track.saturating_sub(thumb_len)) as i32)
+                    as usize;
+                // Inverse mapping top -> offset
+                if track > thumb_len {
+                    let denom = track - thumb_len;
+                    offset = if max_off == 0 {
+                        0
                     } else {
-                        offset = 0;
-                    }
-                    // Keep dragging
-                    d.start_top = new_top;
-                    d.start_y = mouse.row;
-                    *drag = Some(d);
+                        (new_top * max_off + denom / 2) / denom
+                    };
+                } else {
+                    offset = 0;
                 }
+                // Keep dragging
+                d.start_top = new_top;
+                d.start_y = mouse.row;
+                *drag = Some(d);
             }
         }
         MouseEventKind::Up(MouseButton::Left) => {