From e1b209410ecff0cc519869c849309be37ce294ac Mon Sep 17 00:00:00 2001 From: galister <22305755+galister@users.noreply.github.com> Date: Fri, 12 Dec 2025 20:43:31 +0900 Subject: [PATCH] clippy --- wlx-overlay-s/src/backend/openvr/mod.rs | 2 +- wlx-overlay-s/src/backend/openxr/mod.rs | 2 +- wlx-overlay-s/src/gui/panel/button.rs | 8 ++++---- wlx-overlay-s/src/gui/panel/helper.rs | 4 ++-- wlx-overlay-s/src/gui/panel/label.rs | 12 +++++------- wlx-overlay-s/src/subsystem/osc.rs | 2 +- wlx-overlay-s/src/windowing/manager.rs | 2 +- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/wlx-overlay-s/src/backend/openvr/mod.rs b/wlx-overlay-s/src/backend/openvr/mod.rs index 71d032ed..434b99ec 100644 --- a/wlx-overlay-s/src/backend/openvr/mod.rs +++ b/wlx-overlay-s/src/backend/openvr/mod.rs @@ -208,7 +208,7 @@ pub fn openvr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr overlays.handle_task(&mut app, task)?; } TaskType::Playspace(task) => { - playspace.handle_task(&mut app, &mut chaperone_mgr, task); + playspace.handle_task(&app, &mut chaperone_mgr, task); } TaskType::OpenVR(task) => match task { OpenVrTask::ColorGain(channel, value) => { diff --git a/wlx-overlay-s/src/backend/openxr/mod.rs b/wlx-overlay-s/src/backend/openxr/mod.rs index b0e78ed8..1659eaa9 100644 --- a/wlx-overlay-s/src/backend/openxr/mod.rs +++ b/wlx-overlay-s/src/backend/openxr/mod.rs @@ -490,7 +490,7 @@ pub fn openxr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr } TaskType::Playspace(task) => { if let (Some(playspace), Some(monado)) = (playspace.as_mut(), monado.as_mut()) { - playspace.handle_task(&mut app, monado, task); + playspace.handle_task(&app, monado, task); } } #[cfg(feature = "openvr")] diff --git a/wlx-overlay-s/src/gui/panel/button.rs b/wlx-overlay-s/src/gui/panel/button.rs index 93565cec..e2d63e0a 100644 --- a/wlx-overlay-s/src/gui/panel/button.rs +++ b/wlx-overlay-s/src/gui/panel/button.rs @@ -123,7 +123,7 @@ pub(super) fn setup_custom_button( for i in 0..5 { Toast::new( ToastTopic::System, - format!("Fixing floor in {}", 5 - i).into(), + format!("Fixing floor in {}", 5 - i), "Touch your controller to the floor!".into(), ) .with_timeout(1.) @@ -141,7 +141,7 @@ pub(super) fn setup_custom_button( Ok(EventResult::Consumed) }), "::ShellExec" => { - let state = Arc::new(ShellButtonState { + let state = Rc::new(ShellButtonState { button: button.clone(), exec: args.fold(String::new(), |c, n| c + " " + n), mut_state: RefCell::new(ShellButtonMutableState::default()), @@ -171,7 +171,7 @@ pub(super) fn setup_custom_button( "::OscSend" => { use crate::subsystem::osc::parse_osc_value; - let Some(address) = args.next().map(|s| s.to_string()) else { + let Some(address) = args.next().map(std::string::ToString::to_string) else { log::error!("{command} has missing arguments"); return; }; @@ -248,7 +248,7 @@ fn shell_on_action(state: &ShellButtonState) -> anyhow::Result<()> { mut_state.pid = Some(child.id()); mut_state.reader = Some(PipeReaderThread::new_from_child(child)); - return Ok(()); + Ok(()) } fn shell_on_tick(state: &ShellButtonState, common: &mut event::CallbackDataCommon, piped: bool) { diff --git a/wlx-overlay-s/src/gui/panel/helper.rs b/wlx-overlay-s/src/gui/panel/helper.rs index 17d2ea3a..63889d6a 100644 --- a/wlx-overlay-s/src/gui/panel/helper.rs +++ b/wlx-overlay-s/src/gui/panel/helper.rs @@ -58,7 +58,7 @@ impl PipeReaderThread { } c.wait() .inspect_err(|e| log::error!("Failed to wait for child process: {e:?}")) - .map_or(false, |c| c.success()) + .is_ok_and(|c| c.success()) } }); @@ -112,7 +112,7 @@ impl PipeReaderThread { self.handle.is_finished() } - pub fn is_success(self) -> bool { + pub fn check_success(self) -> bool { self.handle.join().unwrap_or(false) } } diff --git a/wlx-overlay-s/src/gui/panel/label.rs b/wlx-overlay-s/src/gui/panel/label.rs index 9225d899..fbad9b35 100644 --- a/wlx-overlay-s/src/gui/panel/label.rs +++ b/wlx-overlay-s/src/gui/panel/label.rs @@ -210,11 +210,10 @@ fn shell_on_tick( label.set_text(common, Translation::from_raw_text(&text)); } - if reader.is_finished() { - if !mut_state.reader.take().unwrap().is_success() { + if reader.is_finished() + && !mut_state.reader.take().unwrap().is_success() { mut_state.next_try = Instant::now() + Duration::from_secs(15); } - } return Ok(()); } else if mut_state.next_try > Instant::now() { return Ok(()); @@ -229,7 +228,7 @@ fn shell_on_tick( mut_state.reader = Some(PipeReaderThread::new_from_child(child)); - return Ok(()); + Ok(()) } struct FifoLabelState { @@ -303,11 +302,10 @@ fn fifo_on_tick( label.set_text(common, Translation::from_raw_text(&text)); } - if reader.is_finished() { - if !mut_state.reader.take().unwrap().is_success() { + if reader.is_finished() + && !mut_state.reader.take().unwrap().is_success() { mut_state.next_try = Instant::now() + Duration::from_secs(15); } - } } const BAT_LOW: drawing::Color = drawing::Color::new(0.69, 0.38, 0.38, 1.); diff --git a/wlx-overlay-s/src/subsystem/osc.rs b/wlx-overlay-s/src/subsystem/osc.rs index a7aa8ff4..b578bf91 100644 --- a/wlx-overlay-s/src/subsystem/osc.rs +++ b/wlx-overlay-s/src/subsystem/osc.rs @@ -204,7 +204,7 @@ pub fn parse_osc_value(s: &str) -> anyhow::Result { } } - anyhow::bail!("Unknown OSC type literal: {}", s) + anyhow::bail!("Unknown OSC type literal: {s}") } } } diff --git a/wlx-overlay-s/src/windowing/manager.rs b/wlx-overlay-s/src/windowing/manager.rs index 31ee9405..70dfabbd 100644 --- a/wlx-overlay-s/src/windowing/manager.rs +++ b/wlx-overlay-s/src/windowing/manager.rs @@ -189,7 +189,7 @@ where } OverlayTask::CleanupMirrors => { let mut ids_to_remove = vec![]; - for (oid, o) in self.overlays.iter() { + for (oid, o) in &self.overlays { if !matches!(o.config.category, OverlayCategory::Mirror) { continue; }