From 0bbb4932e5b28008cf7412a2d09d5e4c354737cb Mon Sep 17 00:00:00 2001
From: Henrik Friedrichsen <henrik@affekt.org>
Date: Wed, 27 Apr 2022 22:41:04 +0200
Subject: [PATCH] Clean up clippy warnings

---
 src/model/album.rs    | 3 +--
 src/model/playlist.rs | 3 +--
 src/mpris.rs          | 2 +-
 src/ui/listview.rs    | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/model/album.rs b/src/model/album.rs
index 86cce72..4bf3636 100644
--- a/src/model/album.rs
+++ b/src/model/album.rs
@@ -250,8 +250,7 @@ impl ListItem for Album {
             .tracks
             .as_ref()?
             .iter()
-            .map(|t| t.id.as_deref())
-            .flatten()
+            .filter_map(|t| t.id.as_deref())
             // spotify allows at max 5 seed items, so choose 4 random tracks...
             .choose_multiple(&mut thread_rng(), MAX_SEEDS - 1);
 
diff --git a/src/model/playlist.rs b/src/model/playlist.rs
index c4441b3..4804a66 100644
--- a/src/model/playlist.rs
+++ b/src/model/playlist.rs
@@ -287,8 +287,7 @@ impl ListItem for Playlist {
             .tracks
             .as_ref()?
             .iter()
-            .map(|t| t.id())
-            .flatten()
+            .filter_map(|t| t.id())
             // only select unique tracks
             .collect::<HashSet<_>>()
             .into_iter()
diff --git a/src/mpris.rs b/src/mpris.rs
index 73ab3ea..9583bbc 100644
--- a/src/mpris.rs
+++ b/src/mpris.rs
@@ -606,7 +606,7 @@ fn run_dbus_server(
                         if let Some(tracks) = &playlist.tracks {
                             let should_shuffle = queue.get_shuffle();
                             queue.clear();
-                            let index = queue.append_next(&tracks.to_vec());
+                            let index = queue.append_next(tracks);
                             queue.play(index, should_shuffle, should_shuffle)
                         }
                     }
diff --git a/src/ui/listview.rs b/src/ui/listview.rs
index 3496c7f..1f5a3e6 100644
--- a/src/ui/listview.rs
+++ b/src/ui/listview.rs
@@ -136,7 +136,7 @@ impl<I: ListItem> ListView<I> {
                 .map(|t| Playable::Track(t.clone()))
                 .collect::<Vec<Playable>>()
         });
-        if let Some(tracks) = playables.or_else(|| tracks.as_ref()) {
+        if let Some(tracks) = playables.or(tracks.as_ref()) {
             let index = self.queue.append_next(tracks);
             self.queue.play(index + self.selected, true, false);
             true