perf: slightly reduce memory allocations and cpu work

Author: Cheong-Lau

cosmic-app-list/src/app.rs

@@ -590,7 +590,7 @@ fn find_desktop_entries<'a>(
     app_ids.iter().map(|fav| {
         let unicase_fav = fde::unicase::Ascii::new(fav.as_str());
         fde::find_app_by_id(desktop_entries, unicase_fav).map_or_else(
-            || fde::DesktopEntry::from_appid(fav.clone()).clone(),
+            || fde::DesktopEntry::from_appid(fav.clone()),
             ToOwned::to_owned,
         )
     })
@@ -612,7 +612,7 @@ impl CosmicAppList {
             .map(|(pinned_ctr, (e, original_id))| DockItem {
                 id: pinned_ctr as u32,
                 toplevels: Vec::new(),
-                desktop_info: e.clone(),
+                desktop_info: e,
                 original_app_id: original_id.clone(),
             })
             .collect();
@@ -1490,7 +1490,10 @@ impl cosmic::Application for CosmicAppList {
         } else {
             0
         };
-        let favorites: Vec<_> = (&mut self.pinned_list.iter().rev())
+        let favorites: Vec<_> = self
+            .pinned_list
+            .iter()
+            .rev()
             .filter(|f| {
                 if favorite_to_remove > 0 && f.toplevels.is_empty() {
                     favorite_to_remove -= 1;
@@ -1812,11 +1815,7 @@ impl cosmic::Application for CosmicAppList {
                                     Message::Exec(exec.to_string(), None, desktop_info.terminal()),
                                 ));
                         } else if let Some(gpus) = self.gpus.as_ref() {
-                            let default_idx = if desktop_info.prefers_non_default_gpu() {
-                                gpus.iter().position(|gpu| !gpu.default).unwrap_or(0)
-                            } else {
-                                gpus.iter().position(|gpu| gpu.default).unwrap_or(0)
-                            };
+                            let default_idx = preferred_gpu_idx(desktop_info, gpus.iter());
                             for (i, gpu) in gpus.iter().enumerate() {
                                 content = content.push(
                                     menu_button(text::body(format!(
@@ -2101,7 +2100,10 @@ impl cosmic::Application for CosmicAppList {
                 0
             };
             let mut favorites_extra = Vec::with_capacity(favorite_to_remove);
-            let mut favorites: Vec<_> = (&mut self.pinned_list.iter().rev())
+            let mut favorites: Vec<_> = self
+                .pinned_list
+                .iter()
+                .rev()
                 .filter(|f| {
                     if favorite_to_remove > 0 && f.toplevels.is_empty() {
                         favorite_to_remove -= 1;
@@ -2299,9 +2301,9 @@ impl CosmicAppList {
         if self.active_workspaces.is_empty() {
             return Vec::new();
         }
-        let current_output = self.core.applet.output_name.clone();
+        let current_output = self.core.applet.output_name.as_ref();
         let mut focused_toplevels: Vec<ExtForeignToplevelHandleV1> = Vec::new();
-        let active_workspaces = self.active_workspaces.clone();
+        let active_workspaces = &self.active_workspaces;
         for toplevel_list in self.active_list.iter().chain(self.pinned_list.iter()) {
             for (t_info, _) in &toplevel_list.toplevels {
                 if t_info.state.contains(&State::Activated)
@@ -2378,13 +2380,7 @@ impl CosmicAppList {
 fn launch_on_preferred_gpu(desktop_info: &DesktopEntry, gpus: Option<&[Gpu]>) -> Option<Message> {
     let exec = desktop_info.exec()?;
 
-    let gpu_idx = gpus.map(|gpus| {
-        if desktop_info.prefers_non_default_gpu() {
-            gpus.iter().position(|gpu| !gpu.default).unwrap_or(0)
-        } else {
-            gpus.iter().position(|gpu| gpu.default).unwrap_or(0)
-        }
-    });
+    let gpu_idx = gpus.map(|gpus| preferred_gpu_idx(desktop_info, gpus.iter()));
 
     Some(Message::Exec(
         exec.to_string(),
@@ -2393,6 +2389,14 @@ fn launch_on_preferred_gpu(desktop_info: &DesktopEntry, gpus: Option<&[Gpu]>) ->
     ))
 }
 
+fn preferred_gpu_idx<'a, I>(desktop_info: &DesktopEntry, mut gpus: I) -> usize
+where
+    I: Iterator<Item = &'a Gpu>,
+{
+    gpus.position(|gpu| gpu.default ^ desktop_info.prefers_non_default_gpu())
+        .unwrap_or(0)
+}
+
 #[derive(Debug, Default, Clone)]
 pub struct DndPathBuf(PathBuf);
 
@@ -2428,8 +2432,6 @@ impl AsMimeTypes for DndPathBuf {
     }
 
     fn as_bytes(&self, _mime_type: &str) -> Option<std::borrow::Cow<'static, [u8]>> {
-        Some(Cow::Owned(
-            self.0.clone().to_str()?.to_string().into_bytes(),
-        ))
+        Some(Cow::Owned(self.0.to_str()?.as_bytes().to_vec()))
     }
 }

cosmic-app-list/src/wayland_handler.rs

@@ -87,10 +87,7 @@ impl OutputHandler for AppData {
         if let Some(info) = self.output_state.info(&output) {
             let _ = self
                 .tx
-                .unbounded_send(WaylandUpdate::Output(OutputUpdate::Add(
-                    output.clone(),
-                    info.clone(),
-                )));
+                .unbounded_send(WaylandUpdate::Output(OutputUpdate::Add(output, info)));
         }
     }
 
@@ -103,10 +100,7 @@ impl OutputHandler for AppData {
         if let Some(info) = self.output_state.info(&output) {
             let _ = self
                 .tx
-                .unbounded_send(WaylandUpdate::Output(OutputUpdate::Update(
-                    output.clone(),
-                    info.clone(),
-                )));
+                .unbounded_send(WaylandUpdate::Output(OutputUpdate::Update(output, info)));
         }
     }
 
@@ -118,7 +112,7 @@ impl OutputHandler for AppData {
     ) {
         let _ = self
             .tx
-            .unbounded_send(WaylandUpdate::Output(OutputUpdate::Remove(output.clone())));
+            .unbounded_send(WaylandUpdate::Output(OutputUpdate::Remove(output)));
     }
 }
 
@@ -136,12 +130,12 @@ impl WorkspaceHandler for AppData {
                     .iter()
                     .filter_map(|handle| self.workspace_state.workspace_info(handle))
                     .find(|w| w.state.contains(WorkspaceUpdateState::Active))
+                    .map(|workspace| workspace.handle.clone())
             })
-            .map(|workspace| workspace.handle.clone())
             .collect::<Vec<_>>();
         let _ = self
             .tx
-            .unbounded_send(WaylandUpdate::Workspace(active_workspaces.clone()));
+            .unbounded_send(WaylandUpdate::Workspace(active_workspaces));
     }
 }
 
@@ -699,7 +693,6 @@ pub(crate) fn wayland_handler(
         exit: false,
         tx,
         conn,
-        queue_handle: qh.clone(),
         output_state: OutputState::new(&globals, &qh),
         workspace_state: WorkspaceState::new(&registry_state, &qh),
         toplevel_info_state: ToplevelInfoState::new(&registry_state, &qh),
@@ -709,6 +702,7 @@ pub(crate) fn wayland_handler(
         seat_state: SeatState::new(&globals, &qh),
         shm_state: Shm::bind(&globals, &qh).unwrap(),
         activation_state: ActivationState::bind::<AppData>(&globals, &qh).ok(),
+        queue_handle: qh,
     };
 
     loop {

cosmic-applet-audio/src/lib.rs

@@ -499,11 +499,7 @@ impl cosmic::Application for Audio {
                             self.inputs = sources
                                 .into_iter()
                                 .filter(|source| {
-                                    !source
-                                        .name
-                                        .as_ref()
-                                        .unwrap_or(&String::from("Generic"))
-                                        .contains("monitor")
+                                    !source.name.as_ref().is_some_and(|n| n.contains("monitor"))
                                 })
                                 .collect()
                         }
@@ -830,15 +826,15 @@ impl cosmic::Application for Audio {
                     self.is_open == IsOpen::Output,
                     fl!("output"),
                     match &self.current_output {
-                        Some(output) => pretty_name(output.description.clone()),
-                        None => String::from("No device selected"),
-                    },
+                        Some(output) => output.description.as_deref().unwrap_or("Generic"),
+                        None => "No device selected",
+                    }
+                    .to_string(),
                     self.outputs
-                        .clone()
-                        .into_iter()
+                        .iter()
                         .map(|output| (
                             output.name.clone().unwrap_or_default(),
-                            pretty_name(output.description)
+                            output.description.clone().unwrap_or("Generic".into())
                         ))
                         .collect(),
                     Message::OutputToggle,
@@ -848,15 +844,14 @@ impl cosmic::Application for Audio {
                     self.is_open == IsOpen::Input,
                     fl!("input"),
                     match &self.current_input {
-                        Some(input) => pretty_name(input.description.clone()),
+                        Some(input) => input.description.clone().unwrap_or("Generic".into()),
                         None => fl!("no-device"),
                     },
                     self.inputs
-                        .clone()
-                        .into_iter()
+                        .iter()
                         .map(|input| (
                             input.name.clone().unwrap_or_default(),
-                            pretty_name(input.description)
+                            input.description.clone().unwrap_or("Generic".into())
                         ))
                         .collect(),
                     Message::InputToggle,
@@ -1020,13 +1015,6 @@ fn revealer_head(
     .on_press(toggle)
 }
 
-fn pretty_name(name: Option<String>) -> String {
-    match name {
-        Some(n) => n,
-        None => String::from("Generic"),
-    }
-}
-
 #[derive(Default)]
 enum PulseState {
     #[default]

cosmic-applet-audio/src/mpris_subscription.rs

@@ -171,7 +171,7 @@ impl State {
         filter_firefox_players(&mut players);
 
         // pre-sort by path so that the same player is always selected
-        players.sort_by(|a, b| a.name().cmp(b.name()));
+        players.sort_unstable_by(|a, b| a.name().cmp(b.name()));
 
         let mut state = Self {
             conn,
@@ -196,7 +196,7 @@ impl State {
         };
         self.players.push(player);
         filter_firefox_players(&mut self.players);
-        self.players.sort_by(|a, b| a.name().cmp(b.name()));
+        self.players.sort_unstable_by(|a, b| a.name().cmp(b.name()));
         self.update_any_player_state_stream().await;
     }
 

cosmic-applet-bluetooth/src/app.rs

@@ -370,7 +370,7 @@ impl cosmic::Application for CosmicBluetoothApplet {
         }) {
             let mut row = row![
                 icon::from_name(dev.icon).size(16).symbolic(true),
-                text::body(dev.name.clone())
+                text::body(dev.name.as_str())
                     .align_x(Alignment::Start)
                     .align_y(Alignment::Center)
                     .width(Length::Fill)

cosmic-applet-bluetooth/src/bluetooth.rs

@@ -249,12 +249,7 @@ impl Ord for BluerDevice {
 impl PartialOrd for BluerDevice {
     #[inline]
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        match self.status.cmp(&other.status) {
-            std::cmp::Ordering::Equal => {
-                Some(self.name.to_lowercase().cmp(&other.name.to_lowercase()))
-            }
-            o => Some(o),
-        }
+        Some(self.cmp(other))
     }
 }
 
@@ -813,6 +808,6 @@ async fn build_device_list(mut devices: Vec<BluerDevice>, adapter: &Adapter) ->
         devices.push(device);
     }
 
-    devices.sort();
+    devices.sort_unstable();
     devices
 }

cosmic-applet-input-sources/src/lib.rs

@@ -242,8 +242,8 @@ impl cosmic::Application for Window {
             widget::column::with_capacity(4 + self.active_layouts.len()).padding([8, 0]);
         for (id, layout) in self.active_layouts.iter().enumerate() {
             let group = widget::column::with_capacity(2)
-                .push(widget::text::body(layout.description.clone()))
-                .push(widget::text::caption(layout.layout.clone()));
+                .push(widget::text::body(layout.description.as_str()))
+                .push(widget::text::caption(layout.layout.as_str()));
             content_list = content_list
                 .push(applet::menu_button(group).on_press(Message::SetActiveLayout(id)));
         }

cosmic-applet-minimize/src/lib.rs

@@ -173,7 +173,7 @@ impl cosmic::Application for Minimize {
                         // Temporarily take ownership to appease the borrow checker.
                         let mut apps = std::mem::take(&mut self.apps);
 
-                        if let Some(pos) = apps.iter_mut().position(|a| {
+                        if let Some(pos) = apps.iter().position(|a| {
                             a.toplevel_info.foreign_toplevel == toplevel_info.foreign_toplevel
                         }) {
                             if apps[pos].toplevel_info.app_id != toplevel_info.app_id {

cosmic-applet-minimize/src/wayland_handler.rs

@@ -475,12 +475,12 @@ pub(crate) fn wayland_handler(
         exit: false,
         tx,
         conn,
-        queue_handle: qh.clone(),
         shm_state,
         screencopy_state,
         seat_state: SeatState::new(&globals, &qh),
         toplevel_info_state: ToplevelInfoState::new(&registry_state, &qh),
         toplevel_manager_state: ToplevelManagerState::new(&registry_state, &qh),
+        queue_handle: qh,
         registry_state,
     };
 

cosmic-applet-network/src/app.rs

@@ -370,7 +370,7 @@ impl cosmic::Application for CosmicNetworkApplet {
                     } = &req
                     {
                         if let Some(NewConnectionState::Waiting(access_point)) =
-                            self.new_connection.clone()
+                            self.new_connection.as_ref()
                         {
                             if !success
                                 && ssid == &access_point.ssid
@@ -384,7 +384,7 @@ impl cosmic::Application for CosmicNetworkApplet {
                                     }
                                 } else if let Some(NewConnectionState::EnterPassword {
                                     access_point, ..
-                                }) = self.new_connection.clone()
+                                }) = self.new_connection.as_ref()
                                 {
                                     if success && ssid == &access_point.ssid && *hw_address == access_point.hw_address {
                                         self.new_connection = None;