📦📎-fixes, typo fixes

wlx-overlay-s/src/overlays/keyboard/mod.rs

@@ -204,10 +204,10 @@ fn handle_release(app: &mut AppState, key: &KeyState, keyboard: &mut KeyboardSta
                 .processes
                 .retain_mut(|child| !matches!(child.try_wait(), Ok(Some(_))));
 
-            if let Some(program) = release_program {
-                if let Ok(child) = Command::new(program).args(release_args).spawn() {
-                    keyboard.processes.push(child);
-                }
+            if let Some(program) = release_program
+                && let Ok(child) = Command::new(program).args(release_args).spawn()
+            {
+                keyboard.processes.push(child);
             }
             true
         }

wlx-overlay-s/src/overlays/screen/pw.rs

@@ -83,10 +83,10 @@ pub(super) fn select_pw_screen(
                 task::Poll::Pending => {
                     if Instant::now() >= print_at {
                         log::info!("{instructions}");
-                        if let Ok(sender) = DbusNotificationSender::new() {
-                            if let Ok(id) = sender.notify_send(instructions, "", 2, 0, 0, true) {
-                                notify = Some((sender, id));
-                            }
+                        if let Ok(sender) = DbusNotificationSender::new()
+                            && let Ok(id) = sender.notify_send(instructions, "", 2, 0, 0, true)
+                        {
+                            notify = Some((sender, id));
                         }
                         break;
                     }

wlx-overlay-s/src/overlays/screen/wl.rs

@@ -1,9 +1,9 @@
 use glam::vec2;
 use wlx_capture::{
+    WlxCapture,
     wayland::{WlxClient, WlxOutput},
     wlr_dmabuf::WlrDmabufCapture,
     wlr_screencopy::WlrScreencopyCapture,
-    WlxCapture,
 };
 
 use crate::{
@@ -13,10 +13,10 @@ use crate::{
 };
 
 use super::{
-    backend::ScreenBackend,
-    capture::{new_wlx_capture, MainThreadWlxCapture},
-    pw::{load_pw_token_config, save_pw_token_config},
     ScreenCreateData,
+    backend::ScreenBackend,
+    capture::{MainThreadWlxCapture, new_wlx_capture},
+    pw::{load_pw_token_config, save_pw_token_config},
 };
 
 impl ScreenBackend {
@@ -76,10 +76,10 @@ pub fn create_screen_renderer_wl(
             Ok((renderer, restore_token)) => {
                 capture = Some(renderer);
 
-                if let Some(token) = restore_token {
-                    if pw_token_store.arc_set(display_name.into(), token.clone()) {
-                        log::info!("Adding Pipewire token {token}");
-                    }
+                if let Some(token) = restore_token
+                    && pw_token_store.arc_set(display_name.into(), token.clone())
+                {
+                    log::info!("Adding Pipewire token {token}");
                 }
             }
             Err(e) => {

wlx-overlay-s/src/overlays/screen/x11.rs

@@ -2,9 +2,9 @@ use std::sync::Arc;
 
 use glam::vec2;
 use wlx_capture::{
+    WlxCapture,
     frame::Transform,
     xshm::{XshmCapture, XshmScreen},
-    WlxCapture,
 };
 
 use crate::{
@@ -13,9 +13,9 @@ use crate::{
 };
 
 use super::{
-    backend::ScreenBackend,
-    capture::{new_wlx_capture, MainThreadWlxCapture},
     ScreenCreateData,
+    backend::ScreenBackend,
+    capture::{MainThreadWlxCapture, new_wlx_capture},
 };
 
 #[cfg(feature = "pipewire")]
@@ -62,10 +62,10 @@ pub fn create_screens_x11pw(app: &mut AppState) -> anyhow::Result<ScreenCreateDa
         true,
     )?;
 
-    if let Some(restore_token) = select_screen_result.restore_token {
-        if pw_tokens.arc_set("x11".into(), restore_token.clone()) {
-            log::info!("Adding Pipewire token {restore_token}");
-        }
+    if let Some(restore_token) = select_screen_result.restore_token
+        && pw_tokens.arc_set("x11".into(), restore_token.clone())
+    {
+        log::info!("Adding Pipewire token {restore_token}");
     }
     if pw_tokens_copy != pw_tokens {
         // Token list changed, re-create token config file

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

@@ -809,10 +809,10 @@ where
     O: Default,
 {
     if let Some(display) = WayVR::get_display_by_name(&wayvr.data.state.displays, display_name) {
-        if let Some(overlay_id) = wayvr.display_handle_map.get(&display) {
-            if let Some(overlay) = overlays.mut_by_id(*overlay_id) {
-                overlay.state.want_visible = true;
-            }
+        if let Some(overlay_id) = wayvr.display_handle_map.get(&display)
+            && let Some(overlay) = overlays.mut_by_id(*overlay_id)
+        {
+            overlay.state.want_visible = true;
         }
 
         wayvr.data.state.set_display_visible(display, true);