more clippy

wlx-overlay-s/src/backend/input.rs

@@ -287,7 +287,7 @@ pub enum PointerMode {
     Special,
 }
 
-fn update_focus(focus: &mut KeyboardFocus, overlay_keyboard_focus: &Option<KeyboardFocus>) {
+fn update_focus(focus: &mut KeyboardFocus, overlay_keyboard_focus: Option<KeyboardFocus>) {
     if let Some(f) = &overlay_keyboard_focus
         && *focus != *f
     {
@@ -378,7 +378,7 @@ where
     if pointer.now.grab && !pointer.before.grab && hovered_state.grabbable {
         update_focus(
             &mut app.hid_provider.keyboard_focus,
-            &hovered.config.keyboard_focus,
+            hovered.config.keyboard_focus,
         );
         pointer.start_grab(hit.overlay, hovered_state, &mut app.tasks);
         log::debug!("Hand {}: grabbed {}", hit.pointer, hovered.config.name);
@@ -400,7 +400,7 @@ where
         pointer.interaction.clicked_id = Some(hit.overlay);
         update_focus(
             &mut app.hid_provider.keyboard_focus,
-            &hovered.config.keyboard_focus,
+            hovered.config.keyboard_focus,
         );
         hovered.config.backend.on_pointer(app, &hit, true);
     } else if !pointer.now.click && pointer.before.click {
@@ -511,10 +511,10 @@ where
             id,
             &overlay_state.transform,
             overlay_state.curvature.as_ref(),
-        )
-            && hit.dist.is_finite() {
-                hits.push(hit);
-            }
+        ) && hit.dist.is_finite()
+        {
+            hits.push(hit);
+        }
     }
 
     hits.sort_by(|a, b| a.dist.total_cmp(&b.dist));

wlx-overlay-s/src/backend/openvr/manifest.rs

@@ -53,12 +53,16 @@ pub(super) fn install_manifest(app_mgr: &mut ApplicationsManager) -> anyhow::Res
     };
 
     let Ok(mut file) = File::create(&manifest_path) else {
-        bail!("Failed to create manifest file at {manifest_path:?}");
+        bail!(
+            "Failed to create manifest file at {}",
+            manifest_path.display()
+        );
     };
 
     if let Err(e) = manifest.write(&mut file) {
         bail!(
-            "Failed to write manifest file at {manifest_path:?}: {e:?}"
+            "Failed to write manifest file at {}: {e:?}",
+            manifest_path.display()
         );
     }
 

wlx-overlay-s/src/backend/wayvr/display.rs

@@ -2,13 +2,13 @@ use std::{cell::RefCell, rc::Rc, sync::Arc};
 
 use smithay::{
     backend::renderer::{
-        Bind, Color32F, Frame, Renderer,
         element::{
+            surface::{render_elements_from_surface_tree, WaylandSurfaceRenderElement},
             Kind,
-            surface::{WaylandSurfaceRenderElement, render_elements_from_surface_tree},
         },
-        gles::{GlesRenderer, GlesTexture, ffi},
+        gles::{ffi, GlesRenderer, GlesTexture},
         utils::draw_render_elements,
+        Bind, Color32F, Frame, Renderer,
     },
     input,
     utils::{Logical, Point, Rectangle, Size, Transform},
@@ -19,8 +19,8 @@ use wayvr_ipc::packet_server;
 use crate::{backend::wayvr::time::get_millis, gen_id, windowing::OverlayID};
 
 use super::{
-    BlitMethod, WayVRSignal, client::WayVRCompositor, comp::send_frames_surface_tree, egl_data,
-    event_queue::SyncEventQueue, process, smithay_wrapper, time, window,
+    client::WayVRCompositor, comp::send_frames_surface_tree, egl_data, event_queue::SyncEventQueue,
+    process, smithay_wrapper, time, window, BlitMethod, WayVRSignal,
 };
 
 fn generate_auth_key() -> String {
@@ -304,6 +304,7 @@ impl Display {
         }
     }
 
+    #[allow(clippy::significant_drop_tightening)]
     pub fn tick_render(&mut self, renderer: &mut GlesRenderer, time_ms: u64) -> anyhow::Result<()> {
         let mut gles_texture = self.gles_texture.clone();
         let mut target = renderer.bind(&mut gles_texture)?;

wlx-overlay-s/src/overlays/bar.rs

@@ -13,10 +13,7 @@ struct BarState {}
 #[allow(clippy::significant_drop_tightening)]
 #[allow(clippy::for_kv_map)] // TODO: remove later
 #[allow(clippy::match_same_arms)] // TODO: remove later
-pub fn create_bar<O>(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig>
-where
-    O: Default,
-{
+pub fn create_bar(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
     let state = BarState {};
     let mut panel = GuiPanel::new_from_template(app, "gui/bar.xml", state, None)?;
 

wlx-overlay-s/src/overlays/wayvr.rs

@@ -356,17 +356,17 @@ fn create_overlay(
         overlay.default_state.positioning = attach_to.get_positioning();
     }
 
-    let rot = if let Some(rot) = &conf_display.rotation {
-        glam::Quat::from_axis_angle(Vec3::from_slice(&rot.axis), f32::to_radians(rot.angle))
-    } else {
-        glam::Quat::IDENTITY
-    };
+    let rot = conf_display
+        .rotation
+        .as_ref()
+        .map_or(glam::Quat::IDENTITY, |rot| {
+            glam::Quat::from_axis_angle(Vec3::from_slice(&rot.axis), f32::to_radians(rot.angle))
+        });
 
-    let pos = if let Some(pos) = &conf_display.pos {
-        Vec3::from_slice(pos)
-    } else {
-        Vec3::NEG_Z
-    };
+    let pos = conf_display
+        .pos
+        .as_ref()
+        .map_or(Vec3::NEG_Z, |pos| Vec3::from_slice(pos));
 
     overlay.default_state.transform = Affine3A::from_rotation_translation(rot, pos);