From 16abcc66e13bfae22aead14a7b4da5f77bdd9dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?=
 <150025636+git-f0x@users.noreply.github.com>
Date: Sun, 5 Oct 2025 14:31:25 +0200
Subject: [PATCH] chore: clippy

---
 rustfmt.toml                   |  1 -
 src/fade_black.rs              | 42 +++++++++++++++++-----------------
 src/freedesktop_screensaver.rs | 16 ++++++-------
 src/main.rs                    |  2 +-
 4 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/rustfmt.toml b/rustfmt.toml
index 648e836..c3c8c37 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,2 +1 @@
-reorder_imports = true
 imports_granularity = "Crate"
diff --git a/src/fade_black.rs b/src/fade_black.rs
index cf45697..44b865a 100644
--- a/src/fade_black.rs
+++ b/src/fade_black.rs
@@ -101,12 +101,12 @@ impl Dispatch<zwlr_layer_surface_v1::ZwlrLayerSurfaceV1, ()> for State {
                 height,
             } => {
                 for output in &mut state.outputs {
-                    if let Some(fade_surface) = &mut output.fade_surface {
-                        if &fade_surface.layer_surface == obj {
-                            fade_surface.layer_surface.ack_configure(serial);
-                            fade_surface.configure(&state.inner, width, height);
-                            break;
-                        }
+                    if let Some(fade_surface) = &mut output.fade_surface
+                        && &fade_surface.layer_surface == obj
+                    {
+                        fade_surface.layer_surface.ack_configure(serial);
+                        fade_surface.configure(&state.inner, width, height);
+                        break;
                     }
                 }
             }
@@ -127,23 +127,23 @@ impl Dispatch<wl_callback::WlCallback, wl_surface::WlSurface> for State {
         match event {
             wl_callback::Event::Done { callback_data: _ } => {
                 for output in &mut state.outputs {
-                    if let Some(fade_surface) = &mut output.fade_surface {
-                        if &fade_surface.surface == surface {
-                            if fade_surface.is_done() {
-                                // All outputs are done fading
-                                if state
-                                    .outputs
-                                    .iter()
-                                    .flat_map(|o| o.fade_surface.as_ref())
-                                    .all(|s| s.is_done())
-                                {
-                                    state.fade_done();
-                                }
-                            } else {
-                                fade_surface.update(&state.inner);
+                    if let Some(fade_surface) = &mut output.fade_surface
+                        && &fade_surface.surface == surface
+                    {
+                        if fade_surface.is_done() {
+                            // All outputs are done fading
+                            if state
+                                .outputs
+                                .iter()
+                                .flat_map(|o| o.fade_surface.as_ref())
+                                .all(|s| s.is_done())
+                            {
+                                state.fade_done();
                             }
-                            break;
+                        } else {
+                            fade_surface.update(&state.inner);
                         }
+                        break;
                     }
                 }
             }
diff --git a/src/freedesktop_screensaver.rs b/src/freedesktop_screensaver.rs
index 8dc2ef3..182678c 100644
--- a/src/freedesktop_screensaver.rs
+++ b/src/freedesktop_screensaver.rs
@@ -99,14 +99,14 @@ pub async fn serve(event_sender: EventSender) -> zbus::Result<()> {
     let mut name_owner_stream = dbus.receive_name_owner_changed().await?;
     while let Some(event) = name_owner_stream.next().await {
         let args = event.args()?;
-        if args.new_owner.is_none() {
-            if let zbus::names::BusName::Unique(name) = args.name {
-                let mut inhibitors = inhibitors.lock().unwrap();
-                if !inhibitors.is_empty() {
-                    inhibitors.retain(|inhibitor| inhibitor.client != name);
-                    if inhibitors.is_empty() {
-                        let _ = event_sender.send(Event::ScreensaverInhibit(false));
-                    }
+        if args.new_owner.is_none()
+            && let zbus::names::BusName::Unique(name) = args.name
+        {
+            let mut inhibitors = inhibitors.lock().unwrap();
+            if !inhibitors.is_empty() {
+                inhibitors.retain(|inhibitor| inhibitor.client != name);
+                if inhibitors.is_empty() {
+                    let _ = event_sender.send(Event::ScreensaverInhibit(false));
                 }
             }
         }
diff --git a/src/main.rs b/src/main.rs
index 6065b6f..995de6f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -356,7 +356,7 @@ fn main() {
         })
         .unwrap();
 
-    while let Ok(_) = event_loop.dispatch(None, &mut state) {}
+    while event_loop.dispatch(None, &mut state).is_ok() {}
 }
 
 impl Dispatch<wl_registry::WlRegistry, GlobalListContents> for State {