leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: clippy fixes

Browse source
This commit is contained in:
Hojjat 2026-09-04 07:46:03 -06:00 • committed by Victoria Brekenfeld
parent 057e7b72cc
commit 0f56d214b9
7 changed files with 66 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/input/tablet_emu.rs
View file

@ -105,8 +105,7 @@ impl TabletToolGrab<State> for PointerEmulationGrab {
InputTime::now(), InputTime::now(),
true, true,
); );
} else { } else if let Some(pointer) = self.seat.get_pointer() {
if let Some(pointer) = self.seat.get_pointer() {
pointer.motion( pointer.motion(
data, data,
focus, focus,
@ -119,7 +118,6 @@ impl TabletToolGrab<State> for PointerEmulationGrab {
pointer.frame(data); pointer.frame(data);
} }
} }
}
fn proximity_out( fn proximity_out(
&mut self, &mut self,
@ -179,8 +177,7 @@ impl TabletToolGrab<State> for PointerEmulationGrab {
InputTime::now(), InputTime::now(),
true, true,
); );
} else { } else if let Some(pointer) = self.seat.get_pointer() {
if let Some(pointer) = self.seat.get_pointer() {
pointer.motion( pointer.motion(
data, data,
focus, focus,
@ -193,7 +190,6 @@ impl TabletToolGrab<State> for PointerEmulationGrab {
pointer.frame(data); pointer.frame(data);
} }
} }
}
fn button( fn button(
&mut self, &mut self,

18
src/shell/element/stack.rs
View file

@ -1724,13 +1724,13 @@ impl PointerTarget<State> for CosmicStack {
state.common.config.cosmic_conf.edge_snap_threshold, state.common.config.cosmic_conf.edge_snap_threshold,
false, false,
); );
if let Some((grab, focus)) = res { if let Some((grab, focus)) = res
if let GrabType::Pointer = grab.grab_type() { && let GrabType::Pointer = grab.grab_type()
{
seat.get_pointer() seat.get_pointer()
.unwrap() .unwrap()
.set_grab(state, grab, serial, focus); .set_grab(state, grab, serial, focus);
} }
}
}); });
} }
None => {} None => {}
@ -1785,13 +1785,13 @@ impl PointerTarget<State> for CosmicStack {
&state.common.event_loop_handle, &state.common.event_loop_handle,
false, false,
); );
if let Some((grab, focus)) = res { if let Some((grab, focus)) = res
if let GrabType::Pointer = grab.grab_type() { && let GrabType::Pointer = grab.grab_type()
{
seat.get_pointer() seat.get_pointer()
.unwrap() .unwrap()
.set_grab(state, grab, serial, focus); .set_grab(state, grab, serial, focus);
} }
}
}); });
} }
} }
@ -1999,14 +1999,14 @@ impl TabletToolTarget<State> for CosmicStack {
state.common.config.cosmic_conf.edge_snap_threshold, state.common.config.cosmic_conf.edge_snap_threshold,
false, false,
); );
if let Some((grab, focus)) = res { if let Some((grab, focus)) = res
if let GrabType::TabletTool = grab.grab_type() { && let GrabType::TabletTool = grab.grab_type()
{
seat.tablet_seat() seat.tablet_seat()
.get_tool(grab.tool().unwrap()) .get_tool(grab.tool().unwrap())
.unwrap() .unwrap()
.set_grab(state, grab, InputTime::now(), serial, focus); .set_grab(state, grab, InputTime::now(), serial, focus);
} }
}
}); });
} }
None => {} None => {}

12
src/shell/element/window.rs
View file

@ -1112,13 +1112,13 @@ impl PointerTarget<State> for CosmicWindow {
false, false,
); );
if let Some((grab, focus)) = res { if let Some((grab, focus)) = res
if let GrabType::Pointer = grab.grab_type() { && let GrabType::Pointer = grab.grab_type()
{
seat.get_pointer() seat.get_pointer()
.unwrap() .unwrap()
.set_grab(state, grab, serial, focus) .set_grab(state, grab, serial, focus)
} }
}
}); });
} }
None => {} None => {}
@ -1315,14 +1315,14 @@ impl TabletToolTarget<State> for CosmicWindow {
false, false,
); );
if let Some((grab, focus)) = res { if let Some((grab, focus)) = res
if let GrabType::TabletTool = grab.grab_type() { && let GrabType::TabletTool = grab.grab_type()
{
seat.tablet_seat() seat.tablet_seat()
.get_tool(grab.tool().unwrap()) .get_tool(grab.tool().unwrap())
.unwrap() .unwrap()
.set_grab(state, grab, InputTime::now(), serial, focus) .set_grab(state, grab, InputTime::now(), serial, focus)
} }
}
}); });
} }
None => {} None => {}

2
src/shell/grabs/moving.rs
View file

@ -905,7 +905,7 @@ impl Drop for MoveGrab {
let seat = self.seat.clone(); let seat = self.seat.clone();
// false-positive: `Output`s hash is based on it's inner ptr // false-positive: `Output`s hash is based on it's inner ptr
#[allow(clippy::mutable_key_type)] #[allow(clippy::mutable_key_type)]
let window_outputs = self.window_outputs.drain().collect::<HashSet<_>>(); let window_outputs = std::mem::take(&mut self.window_outputs);
let previous = self.previous; let previous = self.previous;
let window = self.window.clone(); let window = self.window.clone();
let is_touch_grab = matches!(self.start_data, GrabStartData::Touch(_)); let is_touch_grab = matches!(self.start_data, GrabStartData::Touch(_));

2
src/shell/layout/tiling/grabs/resize.rs
View file

@ -201,7 +201,7 @@ impl TabletToolTarget<State> for ResizeForkTarget {
tool, tool,
data: TabletToolGrabStartData { data: TabletToolGrabStartData {
focus: None, focus: None,
location: location, location,
trigger: TabletToolGrabTrigger::Tip, trigger: TabletToolGrabTrigger::Tip,
}, },
}, },

11
src/wayland/handlers/decoration.rs
View file

@ -69,19 +69,18 @@ impl State {
XdgMode::from_preference(self.default_decoration()) XdgMode::from_preference(self.default_decoration())
}; };
for (window, _) in mapped.windows() { for (window, _) in mapped.windows() {
if PreferredDecorationMode::is_unset(&window.0) { if PreferredDecorationMode::is_unset(&window.0)
if let Some(toplevel) = window.0.toplevel() { && let Some(toplevel) = window.0.toplevel()
if toplevel.with_committed_state(|state| { && toplevel.with_committed_state(|state| {
state.is_some_and(|state| state.decoration_mode.is_some()) state.is_some_and(|state| state.decoration_mode.is_some())
}) { })
{
toplevel.with_pending_state(|state| { toplevel.with_pending_state(|state| {
state.decoration_mode = Some(mode); state.decoration_mode = Some(mode);
}); });
toplevel.send_configure(); toplevel.send_configure();
} }
} }
}
}
}; };
for set in shell.workspaces.sets.values() { for set in shell.workspaces.sets.values() {

1
src/wayland/handlers/pointer_constraints.rs
View file

@ -89,7 +89,6 @@ impl PointerConstraintsHandler for State {
ConstraintRemove::PointerLeave(_) => { ConstraintRemove::PointerLeave(_) => {
// If the constraint was broken by the pointer forcibly leaving the surface, then it doesn't // If the constraint was broken by the pointer forcibly leaving the surface, then it doesn't
// make much sense to warp it. // make much sense to warp it.
return;
} }
ConstraintRemove::Destroyed(constraint) => { ConstraintRemove::Destroyed(constraint) => {
let Some(seat) = self let Some(seat) = self