From b472a155fc7788d24c60f8f69e29eed7cdfab6a8 Mon Sep 17 00:00:00 2001
From: "daniel.eades" <daniel.eades@hotmail.com>
Date: Thu, 16 Nov 2023 18:24:47 +0000
Subject: [PATCH] remove redundant clones

---
 cosmic-app-list/src/app.rs                             |  2 +-
 cosmic-applet-audio/src/main.rs                        |  2 +-
 cosmic-applet-audio/src/mpris_subscription.rs          | 10 ++++------
 cosmic-applet-network/src/app.rs                       |  4 ++--
 .../src/network_manager/active_conns.rs                |  4 ++--
 cosmic-applet-network/src/network_manager/devices.rs   |  2 +-
 .../src/network_manager/wireless_enabled.rs            |  4 ++--
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs
index c032e519..c5169963 100755
--- a/cosmic-app-list/src/app.rs
+++ b/cosmic-app-list/src/app.rs
@@ -551,7 +551,7 @@ impl cosmic::Application for CosmicAppList {
                         },
                         window::Id(0),
                         Some(DndIcon::Custom(icon_id)),
-                        Box::new(toplevel_group.clone()),
+                        Box::new(toplevel_group),
                     );
                 }
             }
diff --git a/cosmic-applet-audio/src/main.rs b/cosmic-applet-audio/src/main.rs
index 28832b1c..72b78c0f 100644
--- a/cosmic-applet-audio/src/main.rs
+++ b/cosmic-applet-audio/src/main.rs
@@ -685,7 +685,7 @@ impl cosmic::Application for Audio {
                 if artists.len() > 15 {
                     format!("{artists:15}...")
                 } else {
-                    artists.to_string()
+                    artists
                 }
             } else {
                 String::new()
diff --git a/cosmic-applet-audio/src/mpris_subscription.rs b/cosmic-applet-audio/src/mpris_subscription.rs
index cc24f865..82bd411a 100644
--- a/cosmic-applet-audio/src/mpris_subscription.rs
+++ b/cosmic-applet-audio/src/mpris_subscription.rs
@@ -27,12 +27,10 @@ pub struct PlayerStatus {
 impl PlayerStatus {
     async fn new(player: Player) -> Self {
         let metadata = player.metadata().await.unwrap();
-        let title = metadata.title().map(|t| Cow::from(t.to_string()));
-        let artists = metadata.artists().map(|a| {
-            a.into_iter()
-                .map(|a| Cow::from(a.to_string()))
-                .collect::<Vec<_>>()
-        });
+        let title = metadata.title().map(|t| Cow::from(t));
+        let artists = metadata
+            .artists()
+            .map(|a| a.into_iter().map(|a| Cow::from(a)).collect::<Vec<_>>());
         let icon = metadata
             .art_url()
             .and_then(|u| url::Url::parse(&u).ok())
diff --git a/cosmic-applet-network/src/app.rs b/cosmic-applet-network/src/app.rs
index ccd0460e..c06def0d 100644
--- a/cosmic-applet-network/src/app.rs
+++ b/cosmic-applet-network/src/app.rs
@@ -346,10 +346,10 @@ impl cosmic::Application for CosmicNetworkApplet {
                 {
                     let _ = tx.unbounded_send(NetworkManagerRequest::Password(
                         access_point.ssid.clone(),
-                        password.to_string(),
+                        password,
                     ));
                     self.new_connection
-                        .replace(NewConnectionState::Waiting(access_point.clone()));
+                        .replace(NewConnectionState::Waiting(access_point));
                 };
             }
             Message::ActivateKnownWifi(ssid) => {
diff --git a/cosmic-applet-network/src/network_manager/active_conns.rs b/cosmic-applet-network/src/network_manager/active_conns.rs
index 900b3347..6f60f87f 100644
--- a/cosmic-applet-network/src/network_manager/active_conns.rs
+++ b/cosmic-applet-network/src/network_manager/active_conns.rs
@@ -11,9 +11,9 @@ pub fn active_conns_subscription<I: 'static + Hash + Copy + Send + Sync + Debug>
     id: I,
     conn: Connection,
 ) -> iced::Subscription<NetworkManagerEvent> {
-    let initial = State::Continue(conn.clone());
+    let initial = State::Continue(conn);
     subscription::channel(id, 50, move |mut output| {
-        let mut state = initial.clone();
+        let mut state = initial;
 
         async move {
             loop {
diff --git a/cosmic-applet-network/src/network_manager/devices.rs b/cosmic-applet-network/src/network_manager/devices.rs
index 77fb69d2..2e141b9e 100644
--- a/cosmic-applet-network/src/network_manager/devices.rs
+++ b/cosmic-applet-network/src/network_manager/devices.rs
@@ -12,7 +12,7 @@ pub fn devices_subscription<I: 'static + Hash + Copy + Send + Sync + Debug>(
     has_popup: bool,
     conn: Connection,
 ) -> iced::Subscription<NetworkManagerEvent> {
-    let initial = State::Continue(conn.clone());
+    let initial = State::Continue(conn);
     subscription::channel((id, has_popup), 50, move |mut output| {
         let mut state = initial.clone();
 
diff --git a/cosmic-applet-network/src/network_manager/wireless_enabled.rs b/cosmic-applet-network/src/network_manager/wireless_enabled.rs
index 005bc65e..7c9c5fb1 100644
--- a/cosmic-applet-network/src/network_manager/wireless_enabled.rs
+++ b/cosmic-applet-network/src/network_manager/wireless_enabled.rs
@@ -11,9 +11,9 @@ pub fn wireless_enabled_subscription<I: 'static + Hash + Copy + Send + Sync + De
     id: I,
     conn: Connection,
 ) -> iced::Subscription<NetworkManagerEvent> {
-    let initial = State::Continue(conn.clone());
+    let initial = State::Continue(conn);
     subscription::channel(id, 50, move |mut output| {
-        let mut state = initial.clone();
+        let mut state = initial;
 
         async move {
             loop {