From 6f7b64c9087fde8f213730203171a1b1372e9664 Mon Sep 17 00:00:00 2001
From: Henrik Friedrichsen <henrik@affekt.org>
Date: Sun, 23 Aug 2020 20:35:16 +0200
Subject: [PATCH] cargo clippy

---
 src/album.rs    | 2 +-
 src/artist.rs   | 2 +-
 src/commands.rs | 1 -
 src/mpris.rs    | 8 ++++----
 src/playlist.rs | 2 +-
 src/spotify.rs  | 4 ++--
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/album.rs b/src/album.rs
index 2be3b1e..64d2fd3 100644
--- a/src/album.rs
+++ b/src/album.rs
@@ -138,7 +138,7 @@ impl ListItem for Album {
                 .unwrap()
                 .iter()
                 .filter(|t| t.id().is_some())
-                .map(|t| t.id().clone().unwrap())
+                .map(|t| t.id().unwrap())
                 .collect();
             let ids: Vec<String> = tracks
                 .iter()
diff --git a/src/artist.rs b/src/artist.rs
index 3d35f47..2b28971 100644
--- a/src/artist.rs
+++ b/src/artist.rs
@@ -127,7 +127,7 @@ impl ListItem for Artist {
                 .unwrap()
                 .iter()
                 .filter(|t| t.id().is_some())
-                .map(|t| t.id().clone().unwrap())
+                .map(|t| t.id().unwrap())
                 .collect();
             let ids: Vec<String> = tracks
                 .iter()
diff --git a/src/commands.rs b/src/commands.rs
index 4cea443..fd5f7d5 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -191,7 +191,6 @@ impl CommandManager {
         let local = if let Some(mut contextmenu) = s.find_name::<ContextMenu>("contextmenu") {
             contextmenu.on_command(s, cmd)?
         } else {
-            debug!("no contextmenu");
             let mut main = s
                 .find_name::<Layout>("main")
                 .expect("could not find layout");
diff --git a/src/mpris.rs b/src/mpris.rs
index e9b8f9e..b01cde2 100644
--- a/src/mpris.rs
+++ b/src/mpris.rs
@@ -42,7 +42,7 @@ fn get_metadata(playable: Option<Playable>) -> Metadata {
             "/org/ncspot/{}",
             playable
                 .map(|t| t.uri().replace(':', "/"))
-                .unwrap_or("0".to_string())
+                .unwrap_or_else(|| "0".to_string())
         )))),
     );
     hm.insert(
@@ -65,7 +65,7 @@ fn get_metadata(playable: Option<Playable>) -> Metadata {
         Variant(Box::new(
             playable
                 .and_then(|p| p.track())
-                .map(|t| t.album.clone())
+                .map(|t| t.album)
                 .unwrap_or_default(),
         )),
     );
@@ -74,7 +74,7 @@ fn get_metadata(playable: Option<Playable>) -> Metadata {
         Variant(Box::new(
             playable
                 .and_then(|p| p.track())
-                .map(|t| t.album_artists.clone())
+                .map(|t| t.album_artists)
                 .unwrap_or_default(),
         )),
     );
@@ -83,7 +83,7 @@ fn get_metadata(playable: Option<Playable>) -> Metadata {
         Variant(Box::new(
             playable
                 .and_then(|p| p.track())
-                .map(|t| t.artists.clone())
+                .map(|t| t.artists)
                 .unwrap_or_default(),
         )),
     );
diff --git a/src/playlist.rs b/src/playlist.rs
index 89d1936..fae8b3d 100644
--- a/src/playlist.rs
+++ b/src/playlist.rs
@@ -107,7 +107,7 @@ impl ListItem for Playlist {
                 .unwrap()
                 .iter()
                 .filter(|t| t.id().is_some())
-                .map(|t| t.id().clone().unwrap())
+                .map(|t| t.id().unwrap())
                 .collect();
             let ids: Vec<String> = tracks
                 .iter()
diff --git a/src/spotify.rs b/src/spotify.rs
index 0427d18..093ad9e 100644
--- a/src/spotify.rs
+++ b/src/spotify.rs
@@ -337,7 +337,7 @@ impl Spotify {
             core.run(Session::connect(config, credentials, None, handle))
         });
         match jh.join() {
-            Ok(session) => session.or_else(Err),
+            Ok(session) => session,
             Err(e) => Err(io::Error::new(
                 io::ErrorKind::Other,
                 e.downcast_ref::<String>()
@@ -590,7 +590,7 @@ impl Spotify {
         let mut tracks: Vec<String> = tracks
             .iter()
             .filter(|track| track.id().is_some())
-            .map(|track| track.id().clone().unwrap())
+            .map(|track| track.id().unwrap())
             .collect();
 
         // we can only send 100 tracks per request