From 0f56d214b9ceaa53ca12ef6ce7043e07626bb42c Mon Sep 17 00:00:00 2001 From: Hojjat Date: Fri, 4 Sep 2026 07:46:03 -0600 Subject: [PATCH] chore: clippy fixes --- src/input/tablet_emu.rs | 48 ++++++++++----------- src/shell/element/stack.rs | 38 ++++++++-------- src/shell/element/window.rs | 26 +++++------ src/shell/grabs/moving.rs | 2 +- src/shell/layout/tiling/grabs/resize.rs | 2 +- src/wayland/handlers/decoration.rs | 21 +++++---- src/wayland/handlers/pointer_constraints.rs | 1 - 7 files changed, 66 insertions(+), 72 deletions(-) diff --git a/src/input/tablet_emu.rs b/src/input/tablet_emu.rs index 94d31d89..6ab17924 100644 --- a/src/input/tablet_emu.rs +++ b/src/input/tablet_emu.rs @@ -105,19 +105,17 @@ impl TabletToolGrab for PointerEmulationGrab { InputTime::now(), true, ); - } else { - if let Some(pointer) = self.seat.get_pointer() { - pointer.motion( - data, - focus, - &pointer::MotionEvent { - location: event.location, - serial: SERIAL_COUNTER.next_serial(), - time: InputTime::now(), - }, - ); - pointer.frame(data); - } + } else if let Some(pointer) = self.seat.get_pointer() { + pointer.motion( + data, + focus, + &pointer::MotionEvent { + location: event.location, + serial: SERIAL_COUNTER.next_serial(), + time: InputTime::now(), + }, + ); + pointer.frame(data); } } @@ -179,19 +177,17 @@ impl TabletToolGrab for PointerEmulationGrab { InputTime::now(), true, ); - } else { - if let Some(pointer) = self.seat.get_pointer() { - pointer.motion( - data, - focus, - &pointer::MotionEvent { - location: event.location, - serial: SERIAL_COUNTER.next_serial(), - time: InputTime::now(), - }, - ); - pointer.frame(data); - } + } else if let Some(pointer) = self.seat.get_pointer() { + pointer.motion( + data, + focus, + &pointer::MotionEvent { + location: event.location, + serial: SERIAL_COUNTER.next_serial(), + time: InputTime::now(), + }, + ); + pointer.frame(data); } } diff --git a/src/shell/element/stack.rs b/src/shell/element/stack.rs index c973b189..f4a37bfe 100644 --- a/src/shell/element/stack.rs +++ b/src/shell/element/stack.rs @@ -1724,12 +1724,12 @@ impl PointerTarget for CosmicStack { state.common.config.cosmic_conf.edge_snap_threshold, false, ); - if let Some((grab, focus)) = res { - if let GrabType::Pointer = grab.grab_type() { - seat.get_pointer() - .unwrap() - .set_grab(state, grab, serial, focus); - } + if let Some((grab, focus)) = res + && let GrabType::Pointer = grab.grab_type() + { + seat.get_pointer() + .unwrap() + .set_grab(state, grab, serial, focus); } }); } @@ -1785,12 +1785,12 @@ impl PointerTarget for CosmicStack { &state.common.event_loop_handle, false, ); - if let Some((grab, focus)) = res { - if let GrabType::Pointer = grab.grab_type() { - seat.get_pointer() - .unwrap() - .set_grab(state, grab, serial, focus); - } + if let Some((grab, focus)) = res + && let GrabType::Pointer = grab.grab_type() + { + seat.get_pointer() + .unwrap() + .set_grab(state, grab, serial, focus); } }); } @@ -1999,13 +1999,13 @@ impl TabletToolTarget for CosmicStack { state.common.config.cosmic_conf.edge_snap_threshold, false, ); - if let Some((grab, focus)) = res { - if let GrabType::TabletTool = grab.grab_type() { - seat.tablet_seat() - .get_tool(grab.tool().unwrap()) - .unwrap() - .set_grab(state, grab, InputTime::now(), serial, focus); - } + if let Some((grab, focus)) = res + && let GrabType::TabletTool = grab.grab_type() + { + seat.tablet_seat() + .get_tool(grab.tool().unwrap()) + .unwrap() + .set_grab(state, grab, InputTime::now(), serial, focus); } }); } diff --git a/src/shell/element/window.rs b/src/shell/element/window.rs index 91423ca5..fa4a1872 100644 --- a/src/shell/element/window.rs +++ b/src/shell/element/window.rs @@ -1112,12 +1112,12 @@ impl PointerTarget for CosmicWindow { false, ); - if let Some((grab, focus)) = res { - if let GrabType::Pointer = grab.grab_type() { - seat.get_pointer() - .unwrap() - .set_grab(state, grab, serial, focus) - } + if let Some((grab, focus)) = res + && let GrabType::Pointer = grab.grab_type() + { + seat.get_pointer() + .unwrap() + .set_grab(state, grab, serial, focus) } }); } @@ -1315,13 +1315,13 @@ impl TabletToolTarget for CosmicWindow { false, ); - if let Some((grab, focus)) = res { - if let GrabType::TabletTool = grab.grab_type() { - seat.tablet_seat() - .get_tool(grab.tool().unwrap()) - .unwrap() - .set_grab(state, grab, InputTime::now(), serial, focus) - } + if let Some((grab, focus)) = res + && let GrabType::TabletTool = grab.grab_type() + { + seat.tablet_seat() + .get_tool(grab.tool().unwrap()) + .unwrap() + .set_grab(state, grab, InputTime::now(), serial, focus) } }); } diff --git a/src/shell/grabs/moving.rs b/src/shell/grabs/moving.rs index 50fc9740..f1fbfa8a 100644 --- a/src/shell/grabs/moving.rs +++ b/src/shell/grabs/moving.rs @@ -905,7 +905,7 @@ impl Drop for MoveGrab { let seat = self.seat.clone(); // false-positive: `Output`s hash is based on it's inner ptr #[allow(clippy::mutable_key_type)] - let window_outputs = self.window_outputs.drain().collect::>(); + let window_outputs = std::mem::take(&mut self.window_outputs); let previous = self.previous; let window = self.window.clone(); let is_touch_grab = matches!(self.start_data, GrabStartData::Touch(_)); diff --git a/src/shell/layout/tiling/grabs/resize.rs b/src/shell/layout/tiling/grabs/resize.rs index 850545be..c6f202cf 100644 --- a/src/shell/layout/tiling/grabs/resize.rs +++ b/src/shell/layout/tiling/grabs/resize.rs @@ -201,7 +201,7 @@ impl TabletToolTarget for ResizeForkTarget { tool, data: TabletToolGrabStartData { focus: None, - location: location, + location, trigger: TabletToolGrabTrigger::Tip, }, }, diff --git a/src/wayland/handlers/decoration.rs b/src/wayland/handlers/decoration.rs index ae58d338..a1efbd0a 100644 --- a/src/wayland/handlers/decoration.rs +++ b/src/wayland/handlers/decoration.rs @@ -69,17 +69,16 @@ impl State { XdgMode::from_preference(self.default_decoration()) }; for (window, _) in mapped.windows() { - if PreferredDecorationMode::is_unset(&window.0) { - if let Some(toplevel) = window.0.toplevel() { - if toplevel.with_committed_state(|state| { - state.is_some_and(|state| state.decoration_mode.is_some()) - }) { - toplevel.with_pending_state(|state| { - state.decoration_mode = Some(mode); - }); - toplevel.send_configure(); - } - } + if PreferredDecorationMode::is_unset(&window.0) + && let Some(toplevel) = window.0.toplevel() + && toplevel.with_committed_state(|state| { + state.is_some_and(|state| state.decoration_mode.is_some()) + }) + { + toplevel.with_pending_state(|state| { + state.decoration_mode = Some(mode); + }); + toplevel.send_configure(); } } }; diff --git a/src/wayland/handlers/pointer_constraints.rs b/src/wayland/handlers/pointer_constraints.rs index e024bb40..743b3b0b 100644 --- a/src/wayland/handlers/pointer_constraints.rs +++ b/src/wayland/handlers/pointer_constraints.rs @@ -89,7 +89,6 @@ impl PointerConstraintsHandler for State { ConstraintRemove::PointerLeave(_) => { // If the constraint was broken by the pointer forcibly leaving the surface, then it doesn't // make much sense to warp it. - return; } ConstraintRemove::Destroyed(constraint) => { let Some(seat) = self