From 20cc6e210e0301f370d9c37fafb3fbbba7b18525 Mon Sep 17 00:00:00 2001
From: Jory Severijnse <jory@severijnse.eu>
Date: Tue, 17 Mar 2026 20:24:12 +0100
Subject: [PATCH] Fix all warnings previously generated by clippy

---
 default.nix       |  1 +
 src/lock.rs       |  2 +-
 src/main.rs       |  5 +++--
 src/render.rs     | 20 ++++----------------
 src/screenshot.rs |  8 ++++----
 src/system.rs     |  2 +-
 6 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/default.nix b/default.nix
index afa0150..44c867a 100644
--- a/default.nix
+++ b/default.nix
@@ -20,5 +20,6 @@ pkgs.rustPlatform.buildRustPackage {
     pkgs.pkg-config
     pkgs.rustPlatform.bindgenHook
     pkgs.rustfmt
+    pkgs.clippy
   ];
 }
diff --git a/src/lock.rs b/src/lock.rs
index 993a064..087228b 100644
--- a/src/lock.rs
+++ b/src/lock.rs
@@ -69,7 +69,7 @@ impl LockedSurface {
         use wayland_client::Proxy;
         self.wayland_surface
             .as_ref()
-            .map_or(false, |ws| ws.id() == surface.id())
+            .is_some_and(|ws| ws.id() == surface.id())
     }
 
     /// Update the surface state (called on each frame)
diff --git a/src/main.rs b/src/main.rs
index cd68c22..d40daef 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -160,7 +160,7 @@ impl WaylandLock {
         if let Some(info) = self.output_state.info(output) {
             if let Some(mode) = info.modes.first() {
                 let (w, h) = mode.dimensions;
-                return (w as i32, h as i32);
+                return (w, h);
             }
         }
         (1920, 1080)
@@ -587,6 +587,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     log::set_logger(&LOGGER).map(|()| log::set_max_level(log::LevelFilter::Debug))?;
 
     log::info!("Starting rustlock v{}", env!("CARGO_PKG_VERSION"));
+    #[allow(clippy::arc_with_non_send_sync)]
     let lock_manager = Arc::new(Mutex::new(LockManager::new(config.clone())));
     let ctrlc_exit = Arc::new(std::sync::atomic::AtomicBool::new(false));
 
@@ -626,7 +627,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         registry_state: RegistryState::new(&globals),
         session_lock_state: SessionLockState::new(&globals, &qh),
         seat_state: SeatState::new(&globals, &qh),
-        shm_state: shm_state,
+        shm_state,
         pool,
         session_lock: None,
         lock_surfaces: Vec::new(),
diff --git a/src/render.rs b/src/render.rs
index ba9f126..a25e213 100644
--- a/src/render.rs
+++ b/src/render.rs
@@ -499,8 +499,8 @@ impl Renderer {
             let art_size = 56.0;
             let spacing = 80.0;
 
-            if self.config.show_album_art {
-                if self.system_status.media_art_url != self.last_art_url {
+            if self.config.show_album_art
+                && self.system_status.media_art_url != self.last_art_url {
                     self.last_art_url = self.system_status.media_art_url.clone();
                     self.media_art_surface = None;
                     if let Some(ref data) = self.system_status.media_art_data {
@@ -526,7 +526,6 @@ impl Renderer {
                         }
                     }
                 }
-            }
 
             let has_art = self.config.show_album_art && self.media_art_surface.is_some();
             let text_x = if has_art {
@@ -654,25 +653,14 @@ impl Renderer {
                 self.context.move_to(text_x, y);
                 self.context.show_text(ssid).unwrap();
             } else {
-                let strength = self.system_status.wifi_strength.unwrap_or(0);
-                let icon = if strength > 75 {
-                    "📶"
-                } else if strength > 50 {
-                    "📶"
-                } else if strength > 25 {
-                    "📶"
-                } else {
-                    "📶"
-                };
-                let text = format!("{} {}", icon, ssid);
                 self.context.new_path();
                 self.context.set_source_rgba(1.0, 1.0, 1.0, self.fade_alpha);
                 self.context.set_font_size(16.0);
                 self.context.move_to(x, y);
-                self.context.show_text(&text).unwrap();
+                self.context.show_text(ssid).unwrap();
             }
         } else {
-            let text = "📵 No WiFi";
+            let text = "No WiFi";
             self.context.new_path();
             self.context
                 .set_source_rgba(1.0, 1.0, 1.0, self.fade_alpha * 0.5);
diff --git a/src/screenshot.rs b/src/screenshot.rs
index 20240d5..06deaeb 100644
--- a/src/screenshot.rs
+++ b/src/screenshot.rs
@@ -394,24 +394,24 @@ impl ScreenshotManager {
                 flipped[dst_offset..dst_offset + src_stride]
                     .copy_from_slice(&converted_data[src_offset..src_offset + src_stride]);
             }
-            return Ok(ImageSurface::create_for_data(
+            return ImageSurface::create_for_data(
                 flipped,
                 cairo::Format::ARgb32,
                 info.width as i32,
                 info.height as i32,
                 src_stride as i32,
             )
-            .context("Failed to create flipped Cairo surface")?);
+            .context("Failed to create flipped Cairo surface");
         }
 
-        Ok(ImageSurface::create_for_data(
+        ImageSurface::create_for_data(
             converted_data,
             cairo::Format::ARgb32,
             info.width as i32,
             info.height as i32,
             pixel_width as i32,
         )
-        .context("Failed to create Cairo surface")?)
+        .context("Failed to create Cairo surface")
     }
 }
 
diff --git a/src/system.rs b/src/system.rs
index b24c9b5..26b3bd8 100644
--- a/src/system.rs
+++ b/src/system.rs
@@ -230,7 +230,7 @@ impl SystemManager {
                                     )
                                 ).await;
 
-                                if let Err(_) = result {
+                                if result.is_err() {
                                     error!("System command {} timed out", method);
                                 }
                             }