oxwm

Diff

diff --git a/src/bar/bar.rs b/src/bar/bar.rs
index 255e501..3e1955f 100644
--- a/src/bar/bar.rs
+++ b/src/bar/bar.rs
@@ -158,11 +158,9 @@ impl Bar {
         for (i, block) in self.blocks.iter_mut().enumerate() {
             let elapsed = now.duration_since(self.block_last_updates[i]);
 
-            if elapsed >= block.interval() {
-                if block.content().is_ok() {
-                    self.block_last_updates[i] = now;
-                    changed = true;
-                }
+            if elapsed >= block.interval() && block.content().is_ok() {
+                self.block_last_updates[i] = now;
+                changed = true;
             }
         }
 
diff --git a/src/keyboard/handlers.rs b/src/keyboard/handlers.rs
index 4add040..fc52c77 100644
--- a/src/keyboard/handlers.rs
+++ b/src/keyboard/handlers.rs
@@ -146,10 +146,10 @@ impl KeyboardMapping {
     ) -> Option<Keycode> {
         for keycode in min_keycode..=max_keycode {
             let index = (keycode - self.min_keycode) as usize * self.keysyms_per_keycode as usize;
-            if let Some(&sym) = self.syms.get(index) {
-                if sym == keysym {
-                    return Some(keycode);
-                }
+            if let Some(&sym) = self.syms.get(index)
+                && sym == keysym
+            {
+                return Some(keycode);
             }
         }
         None
@@ -218,19 +218,18 @@ pub fn grab_keys(
         }
     }
 
-    if current_key > 0 {
-        if let Some(escape_keycode) =
+    if current_key > 0
+        && let Some(escape_keycode) =
             mapping.find_keycode(keysyms::XK_ESCAPE, min_keycode, max_keycode)
-        {
-            connection.grab_key(
-                true,
-                root,
-                ModMask::ANY,
-                escape_keycode,
-                GrabMode::ASYNC,
-                GrabMode::ASYNC,
-            )?;
-        }
+    {
+        connection.grab_key(
+            true,
+            root,
+            ModMask::ANY,
+            escape_keycode,
+            GrabMode::ASYNC,
+            GrabMode::ASYNC,
+        )?;
     }
 
     connection.flush()?;
diff --git a/src/layout/tiling.rs b/src/layout/tiling.rs
index 427ab61..43bb490 100644
--- a/src/layout/tiling.rs
+++ b/src/layout/tiling.rs
@@ -54,10 +54,8 @@ impl TilingLayout {
         for i in 0..window_count {
             if i < num_master {
                 master_total += (master_size as f32 / master_facts) as i32;
-            } else {
-                if stack_facts > 0.0 {
-                    stack_total += (stack_size as f32 / stack_facts) as i32;
-                }
+            } else if stack_facts > 0.0 {
+                stack_total += (stack_size as f32 / stack_facts) as i32;
             }
         }
 
@@ -108,11 +106,7 @@ impl Layout for TilingLayout {
 
         let num_master_usize = num_master.max(0) as usize;
         let master_count = window_count.min(num_master_usize);
-        let stack_count = if window_count > num_master_usize {
-            window_count - num_master_usize
-        } else {
-            0
-        };
+        let stack_count = window_count.saturating_sub(num_master_usize);
 
         let master_height = (screen_height as i32)
             - (2 * outer_gap_horizontal) as i32
diff --git a/src/lib.rs b/src/lib.rs
index a2c7069..ddbed3b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -43,15 +43,15 @@ impl WindowRule {
         let class_matches = self
             .class
             .as_ref()
-            .map_or(true, |c| class.contains(c.as_str()));
+            .is_none_or(|c| class.contains(c.as_str()));
         let instance_matches = self
             .instance
             .as_ref()
-            .map_or(true, |i| instance.contains(i.as_str()));
+            .is_none_or(|i| instance.contains(i.as_str()));
         let title_matches = self
             .title
             .as_ref()
-            .map_or(true, |t| title.contains(t.as_str()));
+            .is_none_or(|t| title.contains(t.as_str()));
         class_matches && instance_matches && title_matches
     }
 }
diff --git a/src/monitor.rs b/src/monitor.rs
index e7cac16..8f55a9c 100644
--- a/src/monitor.rs
+++ b/src/monitor.rs
@@ -102,7 +102,7 @@ pub fn detect_monitors(
         .xinerama_is_active()
         .ok()
         .and_then(|cookie| cookie.reply().ok())
-        .map_or(false, |reply| reply.state != 0);
+        .is_some_and(|reply| reply.state != 0);
 
     if xinerama_active {
         let Ok(xinerama_cookie) = connection.xinerama_query_screens() else {
diff --git a/src/overlay/keybind.rs b/src/overlay/keybind.rs
index a151bb0..6786a53 100644
--- a/src/overlay/keybind.rs
+++ b/src/overlay/keybind.rs
@@ -168,12 +168,12 @@ impl KeybindOverlay {
                 .filter(|kb| kb.func == action)
                 .min_by_key(|kb| kb.keys.len());
 
-            if let Some(binding) = binding {
-                if !binding.keys.is_empty() {
-                    let key_str = self.format_key_combo(&binding.keys[0]);
-                    let action_str = self.action_description(binding);
-                    result.push((key_str, action_str));
-                }
+            if let Some(binding) = binding
+                && !binding.keys.is_empty()
+            {
+                let key_str = self.format_key_combo(&binding.keys[0]);
+                let action_str = self.action_description(binding);
+                result.push((key_str, action_str));
             }
         }