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

chore: clippy

Browse source
This commit is contained in:
Vukašin Vojinović 2025-10-16 13:50:32 +02:00 • committed by Victoria Brekenfeld
parent 3b70bc0265
commit 0847247c33
77 changed files with 865 additions and 1029 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/wayland/protocols/corner_radius.rs
View file

@ -141,11 +141,10 @@ where
surface.wl_surface(),
move |_, _dh, surface| {
let corner_radii_too_big = with_states(surface, |surface_data| {
let corners = surface_data
let corners = *surface_data
.cached_state
.get::<CacheableCorners>()
.pending()
.clone();
.pending();
surface_data
.cached_state
.get::<SurfaceCachedState>()

4
src/wayland/protocols/drm.rs
View file

@ -87,7 +87,7 @@ where
) {
let data = DrmInstanceData {
formats: global_data.formats.clone(),
dmabuf_global: global_data.dmabuf_global.clone(),
dmabuf_global: global_data.dmabuf_global,
};
let drm_instance = data_init.init(resource, data);
@ -266,7 +266,7 @@ impl<R: 'static> WlDrmState<R> {
filter: Box::new(client_filter),
formats,
device_path,
dmabuf_global: dmabuf_global.clone(),
dmabuf_global: *dmabuf_global,
};
display.create_global::<D, wl_drm::WlDrm, _>(2, data)

51
src/wayland/protocols/image_capture_source.rs
View file

@ -219,15 +219,12 @@ where
_dhandle: &DisplayHandle,
data_init: &mut DataInit<'_, D>,
) {
match request {
OutputSourceRequest::CreateSource { source, output } => {
let data = match Output::from_resource(&output) {
Some(output) => ImageCaptureSourceData::Output(output.downgrade()),
None => ImageCaptureSourceData::Destroyed,
};
data_init.init(source, data);
}
_ => {}
if let OutputSourceRequest::CreateSource { source, output } = request {
let data = match Output::from_resource(&output) {
Some(output) => ImageCaptureSourceData::Output(output.downgrade()),
None => ImageCaptureSourceData::Destroyed,
};
data_init.init(source, data);
}
}
@ -256,15 +253,12 @@ where
_dhandle: &DisplayHandle,
data_init: &mut DataInit<'_, D>,
) {
match request {
CosmicWorkspaceSourceRequest::CreateSource { source, output } => {
let data = match state.workspace_state().get_ext_workspace_handle(&output) {
Some(workspace) => ImageCaptureSourceData::Workspace(workspace),
None => ImageCaptureSourceData::Destroyed,
};
data_init.init(source, data);
}
_ => {}
if let CosmicWorkspaceSourceRequest::CreateSource { source, output } = request {
let data = match state.workspace_state().get_ext_workspace_handle(&output) {
Some(workspace) => ImageCaptureSourceData::Workspace(workspace),
None => ImageCaptureSourceData::Destroyed,
};
data_init.init(source, data);
}
}
@ -293,18 +287,15 @@ where
_dhandle: &DisplayHandle,
data_init: &mut DataInit<'_, D>,
) {
match request {
ToplevelSourceRequest::CreateSource {
if let ToplevelSourceRequest::CreateSource {
source,
toplevel_handle,
} => {
let data = match window_from_ext_handle(state, &toplevel_handle) {
Some(toplevel) => ImageCaptureSourceData::Toplevel(toplevel.clone()),
None => ImageCaptureSourceData::Destroyed,
};
data_init.init(source, data);
}
_ => {}
} = request {
let data = match window_from_ext_handle(state, &toplevel_handle) {
Some(toplevel) => ImageCaptureSourceData::Toplevel(toplevel.clone()),
None => ImageCaptureSourceData::Destroyed,
};
data_init.init(source, data);
}
}
@ -330,9 +321,7 @@ where
_dhandle: &DisplayHandle,
_data_init: &mut DataInit<'_, D>,
) {
match request {
_ => {}
}
{}
}
fn destroyed(

21
src/wayland/protocols/output_configuration/handlers/cosmic.rs
View file

@ -148,19 +148,16 @@ where
_dh: &DisplayHandle,
_data_init: &mut DataInit<'_, D>,
) {
match request {
zcosmic_output_head_v1::Request::Release => {
let inner = state.output_configuration_state();
if let Some(head) = inner
.instances
.iter_mut()
.flat_map(|instance| instance.heads.iter_mut())
.find(|head| head.extension_obj.as_ref().is_some_and(|o| o == obj))
{
head.extension_obj.take();
}
if let zcosmic_output_head_v1::Request::Release = request {
let inner = state.output_configuration_state();
if let Some(head) = inner
.instances
.iter_mut()
.flat_map(|instance| instance.heads.iter_mut())
.find(|head| head.extension_obj.as_ref().is_some_and(|o| o == obj))
{
head.extension_obj.take();
}
_ => {}
}
}
}

34
src/wayland/protocols/output_configuration/handlers/wlr.rs
View file

@ -136,13 +136,10 @@ where
_dh: &DisplayHandle,
_data_init: &mut DataInit<'_, D>,
) {
match request {
zwlr_output_head_v1::Request::Release => {
for instance in &mut state.output_configuration_state().instances {
instance.heads.retain(|h| &h.obj != obj);
}
if let zwlr_output_head_v1::Request::Release = request {
for instance in &mut state.output_configuration_state().instances {
instance.heads.retain(|h| &h.obj != obj);
}
_ => {}
}
}
@ -173,16 +170,13 @@ where
_dh: &DisplayHandle,
_data_init: &mut DataInit<'_, D>,
) {
match request {
zwlr_output_mode_v1::Request::Release => {
let state = state.output_configuration_state();
for instance in &mut state.instances {
for head in &mut instance.heads {
head.modes.retain(|mode| mode != obj)
}
if let zwlr_output_mode_v1::Request::Release = request {
let state = state.output_configuration_state();
for instance in &mut state.instances {
for head in &mut instance.heads {
head.modes.retain(|mode| mode != obj)
}
}
_ => {}
}
}
}
@ -281,13 +275,11 @@ where
.heads
.iter_mut()
.map(|(head, conf)| {
let output = match {
inner
.instances
.iter()
.find_map(|instance| instance.heads.iter().find(|h| h.obj == *head))
.map(|i| i.output.clone())
} {
let output = match inner
.instances
.iter()
.find_map(|instance| instance.heads.iter().find(|h| h.obj == *head))
.map(|i| i.output.clone()) {
Some(o) => o,
None => {
return Err(zwlr_output_configuration_head_v1::Error::InvalidMode);

9
src/wayland/protocols/output_configuration/mod.rs
View file

@ -37,8 +37,7 @@ mod handlers;
pub fn head_is_enabled(output: &Output) -> bool {
output
.user_data()
.get::<OutputState>()
.map_or(false, |inner| inner.lock().unwrap().enabled)
.get::<OutputState>().is_some_and(|inner| inner.lock().unwrap().enabled)
}
#[derive(Debug)]
@ -135,7 +134,7 @@ impl<'a> TryFrom<&'a mut PendingOutputConfigurationInner> for OutputConfiguratio
wlr_mode
.data::<Mode>()
.cloned()
.ok_or_else(|| zwlr_output_configuration_head_v1::Error::InvalidMode)?,
.ok_or(zwlr_output_configuration_head_v1::Error::InvalidMode)?,
)),
Some(ModeConfiguration::Custom { size, refresh }) => {
Some(ModeConfiguration::Custom { size, refresh })
@ -283,7 +282,7 @@ where
for instance in &mut self.instances {
let mut removed_heads = Vec::new();
for head in &mut instance.heads {
if &head.output == &output {
if head.output == output {
if head.obj.version() < zwlr_output_head_v1::REQ_RELEASE_SINCE {
removed_heads.push(head.obj.clone());
}
@ -435,7 +434,7 @@ where
.map(|c| c == output_mode)
.unwrap_or(false)
{
instance.obj.current_mode(&*mode);
instance.obj.current_mode(mode);
}
}
}

33
src/wayland/protocols/overlap_notify.rs
View file

@ -120,7 +120,7 @@ impl OverlapNotifyState {
w.is_sticky()
|| active_workspaces.iter().any(|active_workspace| {
state.in_workspace(&active_workspace)
state.in_workspace(active_workspace)
})
})
{
@ -208,8 +208,8 @@ impl LayerOverlapNotificationDataInternal {
}
}
}
for (_, (identifier, namespace, exclusive, layer, overlap)) in
&self.last_snapshot.layer_overlaps
for (identifier, namespace, exclusive, layer, overlap) in
self.last_snapshot.layer_overlaps.values()
{
new_notification.layer_enter(
identifier.clone(),
@ -414,22 +414,19 @@ where
_dhandle: &DisplayHandle,
data_init: &mut smithay::reexports::wayland_server::DataInit<'_, D>,
) {
match request {
zcosmic_overlap_notify_v1::Request::NotifyOnOverlap {
if let zcosmic_overlap_notify_v1::Request::NotifyOnOverlap {
overlap_notification,
layer_surface,
} => {
let notification = data_init.init(overlap_notification, ());
if let Some(surface) = state.layer_surface_from_resource(layer_surface) {
let mut data = surface
.user_data()
.get_or_insert_threadsafe(LayerOverlapNotificationData::default)
.lock()
.unwrap();
data.add_notification(notification);
}
} = request {
let notification = data_init.init(overlap_notification, ());
if let Some(surface) = state.layer_surface_from_resource(layer_surface) {
let mut data = surface
.user_data()
.get_or_insert_threadsafe(LayerOverlapNotificationData::default)
.lock()
.unwrap();
data.add_notification(notification);
}
_ => {}
}
}
@ -461,9 +458,7 @@ where
_dhandle: &DisplayHandle,
_data_init: &mut smithay::reexports::wayland_server::DataInit<'_, D>,
) {
match request {
_ => {}
}
{}
}
}

145
src/wayland/protocols/screencopy.rs
View file

@ -167,7 +167,7 @@ impl SessionRef {
}
pub fn user_data(&self) -> &UserDataMap {
&*self.user_data
&self.user_data
}
}
@ -346,7 +346,7 @@ impl CursorSessionRef {
}
pub fn user_data(&self) -> &UserDataMap {
&*self.user_data
&self.user_data
}
}
@ -746,25 +746,22 @@ where
_dhandle: &DisplayHandle,
data_init: &mut DataInit<'_, D>,
) {
match request {
ext_image_copy_capture_session_v1::Request::CreateFrame { frame } => {
let inner = Arc::new(Mutex::new(FrameInner::new(
resource.clone(),
data.inner.lock().unwrap().constraints.clone(),
)));
let obj = data_init.init(
frame,
FrameData {
inner: inner.clone(),
},
);
data.inner
.lock()
.unwrap()
.active_frames
.push(FrameRef { obj, inner });
}
_ => {}
if let ext_image_copy_capture_session_v1::Request::CreateFrame { frame } = request {
let inner = Arc::new(Mutex::new(FrameInner::new(
resource.clone(),
data.inner.lock().unwrap().constraints.clone(),
)));
let obj = data_init.init(
frame,
FrameData {
inner: inner.clone(),
},
);
data.inner
.lock()
.unwrap()
.active_frames
.push(FrameRef { obj, inner });
}
}
@ -803,45 +800,42 @@ where
_dhandle: &DisplayHandle,
data_init: &mut DataInit<'_, D>,
) {
match request {
ext_image_copy_capture_cursor_session_v1::Request::GetCaptureSession { session } => {
let new_data = CursorSessionData {
inner: data.inner.clone(),
};
let session = data_init.init(session, new_data);
if let ext_image_copy_capture_cursor_session_v1::Request::GetCaptureSession { session } = request {
let new_data = CursorSessionData {
inner: data.inner.clone(),
};
let session = data_init.init(session, new_data);
let mut inner = data.inner.lock().unwrap();
if inner.session.is_some() {
resource.post_error(
ext_image_copy_capture_cursor_session_v1::Error::DuplicateSession,
"Duplicate session",
);
return;
}
if inner.stopped {
session.stopped();
} else if let Some(constraints) = inner.constraints.as_ref() {
session.buffer_size(constraints.size.w as u32, constraints.size.h as u32);
for fmt in &constraints.shm {
session.shm_format(*fmt);
}
if let Some(dma) = constraints.dma.as_ref() {
let node = Vec::from(dma.node.dev_id().to_ne_bytes());
session.dmabuf_device(node);
for (fmt, modifiers) in &dma.formats {
let modifiers = modifiers
.iter()
.flat_map(|modifier| u64::from(*modifier).to_ne_bytes())
.collect::<Vec<u8>>();
session.dmabuf_format(*fmt as u32, modifiers);
}
}
session.done();
}
inner.session = Some(session);
let mut inner = data.inner.lock().unwrap();
if inner.session.is_some() {
resource.post_error(
ext_image_copy_capture_cursor_session_v1::Error::DuplicateSession,
"Duplicate session",
);
return;
}
_ => {}
if inner.stopped {
session.stopped();
} else if let Some(constraints) = inner.constraints.as_ref() {
session.buffer_size(constraints.size.w as u32, constraints.size.h as u32);
for fmt in &constraints.shm {
session.shm_format(*fmt);
}
if let Some(dma) = constraints.dma.as_ref() {
let node = Vec::from(dma.node.dev_id().to_ne_bytes());
session.dmabuf_device(node);
for (fmt, modifiers) in &dma.formats {
let modifiers = modifiers
.iter()
.flat_map(|modifier| u64::from(*modifier).to_ne_bytes())
.collect::<Vec<u8>>();
session.dmabuf_format(*fmt as u32, modifiers);
}
}
session.done();
}
inner.session = Some(session);
}
}
@ -879,25 +873,22 @@ where
_dhandle: &DisplayHandle,
data_init: &mut DataInit<'_, D>,
) {
match request {
ext_image_copy_capture_session_v1::Request::CreateFrame { frame } => {
let inner = Arc::new(Mutex::new(FrameInner::new(
resource.clone(),
data.inner.lock().unwrap().constraints.clone(),
)));
let obj = data_init.init(
frame,
FrameData {
inner: inner.clone(),
},
);
data.inner
.lock()
.unwrap()
.active_frames
.push(FrameRef { obj, inner });
}
_ => {}
if let ext_image_copy_capture_session_v1::Request::CreateFrame { frame } = request {
let inner = Arc::new(Mutex::new(FrameInner::new(
resource.clone(),
data.inner.lock().unwrap().constraints.clone(),
)));
let obj = data_init.init(
frame,
FrameData {
inner: inner.clone(),
},
);
data.inner
.lock()
.unwrap()
.active_frames
.push(FrameRef { obj, inner });
}
}

21
src/wayland/protocols/toplevel_info.rs
View file

@ -252,10 +252,7 @@ where
_dh: &DisplayHandle,
_data_init: &mut DataInit<'_, D>,
) {
match request {
zcosmic_toplevel_handle_v1::Request::Destroy => {}
_ => {}
}
if let zcosmic_toplevel_handle_v1::Request::Destroy = request {}
}
fn destroyed(
@ -290,7 +287,7 @@ pub fn toplevel_leave_output(toplevel: &impl Window, output: &Output) {
pub fn toplevel_enter_workspace(toplevel: &impl Window, workspace: &WorkspaceHandle) {
if let Some(state) = toplevel.user_data().get::<ToplevelState>() {
state.lock().unwrap().workspaces.push(workspace.clone());
state.lock().unwrap().workspaces.push(*workspace);
}
}
@ -509,7 +506,7 @@ where
changed = true;
}
if handle_state.states.as_ref().map_or(true, |states| {
if handle_state.states.as_ref().is_none_or(|states| {
(states.contains(&States::Maximized) != window.is_maximized())
|| (states.contains(&States::Fullscreen) != window.is_fullscreen())
|| (states.contains(&States::Activated) != window.is_activated())
@ -562,7 +559,7 @@ where
.geometry
.filter(|_| instance.version() >= zcosmic_toplevel_handle_v1::EVT_GEOMETRY_SINCE)
.filter(|geo| output.geometry().intersection(*geo).is_some())
.map(|geo| geo.to_local(&output));
.map(|geo| geo.to_local(output));
for wl_output in output.client_outputs(&client) {
if handle_state.wl_outputs.insert(wl_output.clone()) {
instance.output_enter(&wl_output);
@ -584,7 +581,7 @@ where
.iter()
.any(|output| output.owns(wl_output));
if !retain {
instance.output_leave(&wl_output);
instance.output_leave(wl_output);
changed = true;
}
retain
@ -596,8 +593,8 @@ where
.iter()
.filter(|w| !handle_state.workspaces.contains(w))
{
for handle in workspace_state.raw_ext_workspace_handles(&new_workspace, &instance.id()) {
instance.ext_workspace_enter(&handle);
for handle in workspace_state.raw_ext_workspace_handles(new_workspace, &instance.id()) {
instance.ext_workspace_enter(handle);
changed = true;
}
}
@ -606,8 +603,8 @@ where
.iter()
.filter(|w| !state.workspaces.contains(w))
{
for handle in workspace_state.raw_ext_workspace_handles(&old_workspace, &instance.id()) {
instance.ext_workspace_leave(&handle);
for handle in workspace_state.raw_ext_workspace_handles(old_workspace, &instance.id()) {
instance.ext_workspace_leave(handle);
changed = true;
}
}

4
src/wayland/protocols/workspace/ext.rs
View file

@ -350,7 +350,7 @@ where
let retain =
wl_output.is_alive() && group.outputs.iter().any(|output| output.owns(wl_output));
if !retain {
instance.output_leave(&wl_output);
instance.output_leave(wl_output);
changed = true;
}
retain
@ -361,7 +361,7 @@ where
if handle_state.capabilities != Some(group.capabilities) {
instance.capabilities(group.capabilities);
handle_state.capabilities = Some(group.capabilities.clone());
handle_state.capabilities = Some(group.capabilities);
changed = true;
}

8
src/wayland/protocols/workspace/mod.rs
View file

@ -305,8 +305,8 @@ where
fn done(&mut self) {
let mut changed = false;
for instance in &self.ext_instances {
for mut group in &mut self.groups {
if ext::send_group_to_client::<D>(&self.dh, instance, &mut group) {
for group in &mut self.groups {
if ext::send_group_to_client::<D>(&self.dh, instance, group) {
changed = true;
}
}
@ -338,7 +338,7 @@ where
}
}
impl<'a, D> WorkspaceUpdateGuard<'a, D>
impl<D> WorkspaceUpdateGuard<'_, D>
where
D: WorkspaceHandler,
{
@ -617,7 +617,7 @@ where
}
}
impl<'a, D> Drop for WorkspaceUpdateGuard<'a, D>
impl<D> Drop for WorkspaceUpdateGuard<'_, D>
where
D: WorkspaceHandler,
{