From 0926d912ebec057973f3be836fc8b6a84afc0464 Mon Sep 17 00:00:00 2001
From: Elias Projahn <elias@johrpan.de>
Date: Sat, 25 Nov 2023 15:05:40 +0100
Subject: [PATCH] Apply some clippy suggestions

---
 src/home_page.rs  | 6 +++---
 src/library.rs    | 2 +-
 src/player.rs     | 2 +-
 src/player_bar.rs | 4 +---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/home_page.rs b/src/home_page.rs
index b5b324f..9be6b9c 100644
--- a/src/home_page.rs
+++ b/src/home_page.rs
@@ -185,7 +185,7 @@ impl MusicusHomePage {
             items.push(PlaylistItem::new(
                 true,
                 &title,
-                performances.as_ref().map(|x| x.as_str()),
+                performances.as_deref(),
                 None,
                 &tracks[0].path,
             ));
@@ -212,7 +212,7 @@ impl MusicusHomePage {
             items.push(PlaylistItem::new(
                 true,
                 &title,
-                performances.as_ref().map(|x| x.as_str()),
+                performances.as_deref(),
                 Some(&track_title(&first_track, 1)),
                 &first_track.path,
             ));
@@ -221,7 +221,7 @@ impl MusicusHomePage {
                 items.push(PlaylistItem::new(
                     false,
                     &title,
-                    performances.as_ref().map(|x| x.as_str()),
+                    performances.as_deref(),
                     // track number = track index + 1 (first track) + 1 (zero based)
                     Some(&track_title(&track, index + 2)),
                     &track.path,
diff --git a/src/library.rs b/src/library.rs
index 87b6fea..5d11187 100644
--- a/src/library.rs
+++ b/src/library.rs
@@ -380,7 +380,7 @@ impl MusicusLibrary {
                         .get::<_, String>(4)?
                         .split(',')
                         .filter(|s| !s.is_empty())
-                        .map(|s| str::parse::<usize>(s))
+                        .map(str::parse::<usize>)
                         .collect::<Result<Vec<usize>, ParseIntError>>()
                         .expect("work part IDs should be valid integers"),
                     path: PathBuf::from(self.folder()).join(row.get::<_, String>(6)?),
diff --git a/src/player.rs b/src/player.rs
index 234acfa..ed24359 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -59,7 +59,7 @@ mod imp {
                     ..Default::default()
                 });
 
-                let uri = glib::filename_to_uri(&item.path(), None)
+                let uri = glib::filename_to_uri(item.path(), None)
                     .expect("track path should be parsable as an URI");
 
                 let player = self.player.get().unwrap();
diff --git a/src/player_bar.rs b/src/player_bar.rs
index f69fb3f..b2a6690 100644
--- a/src/player_bar.rs
+++ b/src/player_bar.rs
@@ -71,9 +71,7 @@ mod imp {
 
             self.remaining_time_label.set_label(&format_time(
                 player
-                    .duration_ms()
-                    .checked_sub(current_time_ms)
-                    .unwrap_or(0),
+                    .duration_ms().saturating_sub(current_time_ms),
             ));
         }
     }