Fix new Clippy warnings

8 files changed, 21 insertions, 21 deletions

diff --git a/src/backend/tty.rs b/src/backend/tty.rs
index 1b5fa144..951ec4bd 100644
--- a/src/backend/tty.rs
+++ b/src/backend/tty.rs
@@ -1658,7 +1658,7 @@ impl Tty {
                     .unwrap_or_else(|| {
                         is_vrr_capable(&device.drm, connector.handle()) == Some(true)
                     });
-                let vrr_enabled = surface.map_or(false, |surface| surface.compositor.vrr_enabled());
+                let vrr_enabled = surface.is_some_and(|surface| surface.compositor.vrr_enabled());
 
                 let logical = niri
                     .global_space
diff --git a/src/handlers/mod.rs b/src/handlers/mod.rs
index f8cf1832..9d147df4 100644
--- a/src/handlers/mod.rs
+++ b/src/handlers/mod.rs
@@ -155,7 +155,7 @@ impl PointerConstraintsHandler for State {
         location: Point<f64, Logical>,
     ) {
         let is_constraint_active = with_pointer_constraint(surface, pointer, |constraint| {
-            constraint.map_or(false, |c| c.is_active())
+            constraint.is_some_and(|c| c.is_active())
         });
 
         if !is_constraint_active {
diff --git a/src/input/mod.rs b/src/input/mod.rs
index 2b0d1914..ae2c2b05 100644
--- a/src/input/mod.rs
+++ b/src/input/mod.rs
@@ -119,7 +119,7 @@ impl State {
             .niri
             .exit_confirm_dialog
             .as_ref()
-            .map_or(false, |d| d.is_open())
+            .is_some_and(|d| d.is_open())
             && should_hide_exit_confirm_dialog(&event);
 
         use InputEvent::*;
@@ -989,7 +989,7 @@ impl State {
                             .niri
                             .layout
                             .active_output()
-                            .map_or(false, |active| output.as_ref() == Some(active));
+                            .is_some_and(|active| output.as_ref() == Some(active));
 
                         if let Some(output) = output {
                             self.niri
@@ -1010,7 +1010,7 @@ impl State {
 
                             // If we focused the target window.
                             let new_focus = self.niri.layout.focus();
-                            if new_focus.map_or(false, |win| win.window == window) {
+                            if new_focus.is_some_and(|win| win.window == window) {
                                 self.maybe_warp_cursor_to_focus();
                             }
                         }
diff --git a/src/ipc/server.rs b/src/ipc/server.rs
index 8828ab1a..f8b661e1 100644
--- a/src/ipc/server.rs
+++ b/src/ipc/server.rs
@@ -523,7 +523,7 @@ impl State {
             }
 
             // Check if this workspace became active.
-            let is_active = mon.map_or(false, |mon| mon.active_workspace_idx() == ws_idx);
+            let is_active = mon.is_some_and(|mon| mon.active_workspace_idx() == ws_idx);
             if is_active && !ipc_ws.is_active {
                 events.push(Event::WorkspaceActivated { id, focused: false });
             }
@@ -546,7 +546,7 @@ impl State {
                         idx: u8::try_from(ws_idx + 1).unwrap_or(u8::MAX),
                         name: ws.name().cloned(),
                         output: mon.map(|mon| mon.output_name().clone()),
-                        is_active: mon.map_or(false, |mon| mon.active_workspace_idx() == ws_idx),
+                        is_active: mon.is_some_and(|mon| mon.active_workspace_idx() == ws_idx),
                         is_focused: Some(id) == focused_ws_id,
                         active_window_id: ws.active_window().map(|win| win.id().get()),
                     }
diff --git a/src/layout/mod.rs b/src/layout/mod.rs
index 2c241221..f2baa11d 100644
--- a/src/layout/mod.rs
+++ b/src/layout/mod.rs
@@ -1194,7 +1194,7 @@ impl<W: LayoutElement> Layout<W> {
                         mon.workspaces.iter().enumerate().find(|(_, w)| {
                             w.name
                                 .as_ref()
-                                .map_or(false, |name| name.eq_ignore_ascii_case(workspace_name))
+                                .is_some_and(|name| name.eq_ignore_ascii_case(workspace_name))
                         })
                     {
                         return Some((index, workspace));
@@ -1205,7 +1205,7 @@ impl<W: LayoutElement> Layout<W> {
                 if let Some((index, workspace)) = workspaces.iter().enumerate().find(|(_, w)| {
                     w.name
                         .as_ref()
-                        .map_or(false, |name| name.eq_ignore_ascii_case(workspace_name))
+                        .is_some_and(|name| name.eq_ignore_ascii_case(workspace_name))
                 }) {
                     return Some((index, workspace));
                 }
@@ -1229,7 +1229,7 @@ impl<W: LayoutElement> Layout<W> {
                 WorkspaceReference::Name(ref_name) => ws
                     .name
                     .as_ref()
-                    .map_or(false, |name| name.eq_ignore_ascii_case(ref_name)),
+                    .is_some_and(|name| name.eq_ignore_ascii_case(ref_name)),
                 WorkspaceReference::Id(id) => ws.id().get() == *id,
                 WorkspaceReference::Index(_) => unreachable!(),
             })
@@ -1657,7 +1657,7 @@ impl<W: LayoutElement> Layout<W> {
             monitor.workspaces.iter().any(|ws| {
                 ws.name
                     .as_ref()
-                    .map_or(false, |name| name.eq_ignore_ascii_case(workspace_name))
+                    .is_some_and(|name| name.eq_ignore_ascii_case(workspace_name))
             })
         })
     }
@@ -2427,7 +2427,7 @@ impl<W: LayoutElement> Layout<W> {
         };
 
         for mon in monitors {
-            if output.map_or(false, |output| mon.output != *output) {
+            if output.is_some_and(|output| mon.output != *output) {
                 continue;
             }
 
@@ -2510,7 +2510,7 @@ impl<W: LayoutElement> Layout<W> {
         let Some(InteractiveMoveState::Moving(move_)) = self.interactive_move.take() else {
             unreachable!()
         };
-        if output.map_or(false, |out| &move_.output != out) {
+        if output.is_some_and(|out| &move_.output != out) {
             self.interactive_move = Some(InteractiveMoveState::Moving(move_));
             return;
         }
@@ -4980,7 +4980,7 @@ mod tests {
                                     if ws
                                         .name
                                         .as_ref()
-                                        .map_or(false, |name| name.eq_ignore_ascii_case(&ws_name))
+                                        .is_some_and(|name| name.eq_ignore_ascii_case(&ws_name))
                                     {
                                         ws_id = Some(ws.id());
                                     }
@@ -4998,7 +4998,7 @@ mod tests {
                                 if ws
                                     .name
                                     .as_ref()
-                                    .map_or(false, |name| name.eq_ignore_ascii_case(&ws_name))
+                                    .is_some_and(|name| name.eq_ignore_ascii_case(&ws_name))
                                 {
                                     ws_id = Some(ws.id());
                                 }
diff --git a/src/layout/monitor.rs b/src/layout/monitor.rs
index 70009d67..8bb92a33 100644
--- a/src/layout/monitor.rs
+++ b/src/layout/monitor.rs
@@ -165,7 +165,7 @@ impl<W: LayoutElement> Monitor<W> {
         self.workspaces.iter().find(|ws| {
             ws.name
                 .as_ref()
-                .map_or(false, |name| name.eq_ignore_ascii_case(workspace_name))
+                .is_some_and(|name| name.eq_ignore_ascii_case(workspace_name))
         })
     }
 
@@ -173,7 +173,7 @@ impl<W: LayoutElement> Monitor<W> {
         self.workspaces.iter().position(|ws| {
             ws.name
                 .as_ref()
-                .map_or(false, |name| name.eq_ignore_ascii_case(workspace_name))
+                .is_some_and(|name| name.eq_ignore_ascii_case(workspace_name))
         })
     }
 
@@ -1074,7 +1074,7 @@ impl<W: LayoutElement> Monitor<W> {
             return false;
         };
 
-        if is_touchpad.map_or(false, |x| gesture.is_touchpad != x) {
+        if is_touchpad.is_some_and(|x| gesture.is_touchpad != x) {
             return false;
         }
 
diff --git a/src/layout/scrolling.rs b/src/layout/scrolling.rs
index e54beccb..84ad835e 100644
--- a/src/layout/scrolling.rs
+++ b/src/layout/scrolling.rs
@@ -2469,7 +2469,7 @@ impl<W: LayoutElement> ScrollingSpace<W> {
             return false;
         };
 
-        if is_touchpad.map_or(false, |x| gesture.is_touchpad != x) {
+        if is_touchpad.is_some_and(|x| gesture.is_touchpad != x) {
             return false;
         }
 
@@ -3034,7 +3034,7 @@ impl TileData {
         self.interactively_resizing_by_left_edge = tile
             .window()
             .interactive_resize_data()
-            .map_or(false, |data| data.edges.contains(ResizeEdge::LEFT));
+            .is_some_and(|data| data.edges.contains(ResizeEdge::LEFT));
     }
 }
 
diff --git a/src/niri.rs b/src/niri.rs
index 78b1c3d6..a64c33dc 100644
--- a/src/niri.rs
+++ b/src/niri.rs
@@ -3556,7 +3556,7 @@ impl Niri {
             .borrow()
             .outputs
             .find(name)
-            .map_or(false, |output| output.is_vrr_on_demand());
+            .is_some_and(|output| output.is_vrr_on_demand());
         if !on_demand {
             return;
         }