chore: apply clippy suggestions

Also some slight refactors for readability/minor performance.

Author: Cheong-Lau

cosmic-app-list/src/app.rs

@@ -1360,10 +1360,10 @@ impl cosmic::Application for CosmicAppList {
                         + 4.0 * (popup_applet_count - 1.);
                     let (max_width, max_height) = match self.core.applet.anchor {
                         PanelAnchor::Top | PanelAnchor::Bottom => {
-                            (popup_applet_size, applet_suggested_size as f32)
+                            (popup_applet_size, applet_suggested_size.into())
                         }
                         PanelAnchor::Left | PanelAnchor::Right => {
-                            (applet_suggested_size as f32, popup_applet_size)
+                            (applet_suggested_size.into(), popup_applet_size)
                         }
                     };
                     popup_settings.positioner.size_limits = Limits::NONE
@@ -1714,14 +1714,14 @@ impl cosmic::Application for CosmicAppList {
 
         let mut content = match &self.core.applet.anchor {
             PanelAnchor::Left | PanelAnchor::Right => container(
-                Column::with_children(content_list)
+                Column::from_vec(content_list)
                     .spacing(4.0)
                     .align_x(Alignment::Center)
                     .height(h)
                     .width(w),
             ),
             PanelAnchor::Top | PanelAnchor::Bottom => container(
-                Row::with_children(content_list)
+                Row::from_vec(content_list)
                     .spacing(4.0)
                     .align_y(Alignment::Center)
                     .height(h)
@@ -2032,14 +2032,14 @@ impl cosmic::Application for CosmicAppList {
                     .collect();
             let content = match &self.core.applet.anchor {
                 PanelAnchor::Left | PanelAnchor::Right => container(
-                    Column::with_children(active)
+                    Column::from_vec(active)
                         .spacing(4.0)
                         .align_x(Alignment::Center)
                         .width(Length::Shrink)
                         .height(Length::Shrink),
                 ),
                 PanelAnchor::Top | PanelAnchor::Bottom => container(
-                    Row::with_children(active)
+                    Row::from_vec(active)
                         .spacing(4.0)
                         .align_y(Alignment::Center)
                         .width(Length::Shrink)
@@ -2135,14 +2135,14 @@ impl cosmic::Application for CosmicAppList {
                 .collect();
             let content = match &self.core.applet.anchor {
                 PanelAnchor::Left | PanelAnchor::Right => container(
-                    Column::with_children(favorites)
+                    Column::from_vec(favorites)
                         .spacing(4.0)
                         .align_x(Alignment::Center)
                         .width(Length::Shrink)
                         .height(Length::Shrink),
                 ),
                 PanelAnchor::Top | PanelAnchor::Bottom => container(
-                    Row::with_children(favorites)
+                    Row::from_vec(favorites)
                         .spacing(4.0)
                         .align_y(Alignment::Center)
                         .width(Length::Shrink)
@@ -2240,7 +2240,7 @@ impl CosmicAppList {
         }) else {
             return (None, active_index);
         };
-        // tracing::error!("{} {}", max_major_axis_len, self.pinned_list.len());
+        // tracing::error!("{max_major_axis_len} {}", self.pinned_list.len());
         // subtract the divider width
         max_major_axis_len -= 1;
         let applet_icon = AppletIconData::new(&self.core.applet);
@@ -2279,7 +2279,7 @@ impl CosmicAppList {
         } else {
             favorite_index = (btn_count as usize).min(self.pinned_list.len());
         }
-        // tracing::error!("{} {} {:?}", btn_count, favorite_index, active_index);
+        // tracing::error!("{btn_count} {favorite_index} {active_index:?}");
         (Some(favorite_index), active_index)
     }
 
@@ -2335,7 +2335,11 @@ impl CosmicAppList {
                 // in addition, try to match WINE entries who have its
                 // appid = the full name of the executable (incl. .exe)
                 let is_proton_game = info.app_id == "steam_app_default";
-                if is_proton_game || info.app_id.ends_with(".exe") {
+                if is_proton_game
+                    || PathBuf::from(info.app_id.clone())
+                        .extension()
+                        .is_some_and(|ext| ext.eq_ignore_ascii_case("exe"))
+                {
                     for entry in &self.desktop_entries {
                         let localised_name = entry.name(&self.locales).unwrap_or_default();
 

cosmic-app-list/src/wayland_handler.rs

@@ -404,7 +404,7 @@ impl CaptureData {
         // XXX
         if !formats.shm_formats.contains(&wl_shm::Format::Abgr8888) {
             tracing::error!("No suitable buffer format found");
-            tracing::warn!("Available formats: {:#?}", formats);
+            tracing::warn!("Available formats: {formats:#?}");
             return None;
         }
 

cosmic-applet-a11y/src/app.rs

@@ -147,22 +147,21 @@ impl cosmic::Application for CosmicA11yApplet {
             Message::TogglePopup => {
                 if let Some(p) = self.popup.take() {
                     return destroy_popup(p);
-                } else {
-                    self.timeline = Timeline::new();
+                }
+                self.timeline = Timeline::new();
 
-                    let new_id = window::Id::unique();
-                    self.popup.replace(new_id);
+                let new_id = window::Id::unique();
+                self.popup.replace(new_id);
 
-                    let popup_settings = self.core.applet.get_popup_settings(
-                        self.core.main_window_id().unwrap(),
-                        new_id,
-                        Some((1, 1)),
-                        None,
-                        None,
-                    );
+                let popup_settings = self.core.applet.get_popup_settings(
+                    self.core.main_window_id().unwrap(),
+                    new_id,
+                    Some((1, 1)),
+                    None,
+                    None,
+                );
 
-                    return get_popup(popup_settings);
-                }
+                return get_popup(popup_settings);
             }
             Message::CloseRequested(id) => {
                 if Some(id) == self.popup {

cosmic-applet-a11y/src/backend/wayland/mod.rs

@@ -2,13 +2,12 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use anyhow;
-use cctk::sctk::reexports::calloop::{self, channel::SyncSender};
+use cctk::sctk::reexports::calloop;
 use cosmic::iced::{
     self, Subscription,
-    futures::{self, SinkExt, StreamExt, channel::mpsc},
+    futures::{self, SinkExt},
     stream,
 };
-use cosmic_protocols::a11y::v1::client::cosmic_a11y_manager_v1::Filter;
 use cosmic_settings_subscriptions::cosmic_a11y_manager::{
     self as thread, AccessibilityEvent, AccessibilityRequest,
 };