Update dependencies

This bumps all dependencies, including Smithay.

Cargo.toml

@@ -40,5 +40,5 @@ serde_json = "1.0.85"
 serde = { version = "1.0.144", features = ["derive"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-udev = "0.8.0"
+udev = "0.9.1"
 indexmap = "2.5.0"

src/catacomb.rs

@@ -811,9 +811,7 @@ impl XdgActivationHandler for Catacomb {
         };
 
         Seat::from_resource(&seat).as_ref() == Some(&self.seat)
-            && keyboard
-                .last_enter()
-                .map_or(false, |last_enter| serial.is_no_older_than(&last_enter))
+            && keyboard.last_enter().is_some_and(|last_enter| serial.is_no_older_than(&last_enter))
     }
 
     fn request_activation(

src/input.rs

@@ -486,7 +486,7 @@ impl Catacomb {
             // Check if surface captures shortcuts.
             let inhibits_shortcuts = compositor::with_states(&input_surface.surface, |states| {
                 let data = states.data_map.get::<CatacombSurfaceData>();
-                data.map_or(false, |data| data.inhibits_shortcuts)
+                data.is_some_and(|data| data.inhibits_shortcuts)
             });
 
             // Check if there's a gesture for this touch event.
@@ -906,10 +906,10 @@ impl Catacomb {
         state: KeyState,
     ) -> FilterResult<InputAction> {
         // Check if focused surface inhibits shortcuts.
-        let inhibits_shortcuts = catacomb.last_focus().map_or(false, |surface| {
+        let inhibits_shortcuts = catacomb.last_focus().is_some_and(|surface| {
             compositor::with_states(surface, |states| {
                 let data = states.data_map.get::<CatacombSurfaceData>();
-                data.map_or(false, |data| data.inhibits_shortcuts)
+                data.is_some_and(|data| data.inhibits_shortcuts)
             })
         });
         if inhibits_shortcuts {

src/overview.rs

@@ -163,12 +163,12 @@ impl Overview {
                 };
 
                 // Check if click was within secondary window.
-                if layout.secondary().map_or(false, contains_point) {
+                if layout.secondary().is_some_and(contains_point) {
                     return Some(LayoutPosition::new(layout_index, true));
                 }
 
                 // Check if click was within primary window.
-                if layout.primary().map_or(false, contains_point) {
+                if layout.primary().is_some_and(contains_point) {
                     return Some(LayoutPosition::new(layout_index, false));
                 }
             }

src/windows/layout.rs

@@ -255,9 +255,9 @@ impl Layouts {
             let secondary = layout.secondary.as_deref().map(RefCell::borrow_mut);
 
             // Determine window which might need resizing.
-            let growing_window = if primary.as_ref().map_or(false, |win| &win.surface == surface) {
+            let growing_window = if primary.as_ref().is_some_and(|win| &win.surface == surface) {
                 secondary
-            } else if secondary.as_ref().map_or(false, |win| &win.surface == surface) {
+            } else if secondary.as_ref().is_some_and(|win| &win.surface == surface) {
                 primary
             } else {
                 continue;
@@ -621,7 +621,7 @@ impl Layout {
         let secondary = self.secondary.as_deref().map(RefCell::borrow_mut);
 
         if let Some(mut primary) = primary {
-            let secondary_alive = secondary.as_ref().map_or(false, |window| window.alive());
+            let secondary_alive = secondary.as_ref().is_some_and(|window| window.alive());
             let rectangle = output.primary_rectangle(secondary_alive);
             primary.set_dimensions(output.scale(), rectangle);
         }

src/windows/mod.rs

@@ -873,7 +873,7 @@ impl Windows {
             View::Fullscreen(window) => {
                 window.borrow().dirty() || self.layers.overlay().any(Window::dirty)
             },
-            View::Lock(window) => window.as_ref().map_or(false, |window| window.dirty()),
+            View::Lock(window) => window.as_ref().is_some_and(|window| window.dirty()),
             View::DragAndDrop(_) => false,
         }
     }

src/windows/window.rs

@@ -24,7 +24,7 @@ use smithay::wayland::compositor::{
 };
 use smithay::wayland::fractional_scale;
 use smithay::wayland::presentation::{
-    PresentationFeedbackCachedState, PresentationFeedbackCallback,
+    PresentationFeedbackCachedState, PresentationFeedbackCallback, Refresh,
 };
 use smithay::wayland::shell::wlr_layer::{
     Anchor, ExclusiveZone, KeyboardInteractivity, Layer, LayerSurfaceCachedState,
@@ -366,7 +366,7 @@ impl<S: Surface + 'static> Window<S> {
             return;
         }
 
-        let refresh = output.frame_interval();
+        let refresh = Refresh::Fixed(output.frame_interval());
         let output = output.smithay_output();
 
         // Try to get monitor clock.
@@ -386,7 +386,7 @@ impl<S: Surface + 'static> Window<S> {
 
         for PresentationCallback { callback, surface } in self.presentation_callbacks.drain(..) {
             // Set zero-copy flag if direct scanout was used.
-            let zero_copy = states.element_render_state(&surface).map_or(false, |states| {
+            let zero_copy = states.element_render_state(&surface).is_some_and(|states| {
                 states.presentation_state == RenderElementPresentationState::ZeroCopy
             });
             let flags = if zero_copy { FeedbackKind::ZeroCopy } else { flags };
@@ -743,10 +743,7 @@ impl<S: Surface + 'static> Window<S> {
         }
 
         for window in &mut self.popups {
-            popup = match window.add_popup(popup, parent) {
-                Some(popup) => popup,
-                None => return None,
-            };
+            popup = window.add_popup(popup, parent)?;
         }
 
         Some(popup)