Linting issues

jpochyla · Jan 29, 2025 · c918952 · c918952
1 parent 2e18144
commit c918952
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/psst-gui/src/controller/playback.rs b/psst-gui/src/controller/playback.rs
@@ -214,7 +214,7 @@ impl PlaybackController {
                     album: album.as_deref(),
                     artist: artist.as_deref(),
                     duration,
-                    cover_url: cover_url.as_deref(),
+                    cover_url: cover_url,
                 })
                 .unwrap();
         }

diff --git a/psst-gui/src/ui/track.rs b/psst-gui/src/ui/track.rs
@@ -184,7 +184,7 @@ pub fn playable_widget(track: &Track, display: Display) -> impl Widget<PlayRow<A
                 return *target_id == row.item.id;
             }
             // Otherwise check if it's playing or is the current track
-            row.is_playing || row.ctx.now_playing.as_ref().map_or(false, |playable| {
+            row.is_playing || row.ctx.now_playing.as_ref().is_some_and(|playable| {
                 matches!(playable, Playable::Track(track) if track.id == row.item.id)
             })
         })

diff --git a/psst-gui/src/webapi/local.rs b/psst-gui/src/webapi/local.rs
@@ -187,11 +187,11 @@ impl LocalTrackManager {
             .artists
             .iter()
             .next()
-            .map_or(false, |t2_artist| t2_artist.name != t1.artist);
+            .is_some_and(|t2_artist| t2_artist.name != t1.artist);
         let album_mismatch = t2
             .album
             .as_ref()
-            .map_or(false, |t2_album| t2_album.name != t1.album);
+            .is_some_and(|t2_album| t2_album.name != t1.album);
         !(artist_mismatch || album_mismatch)
     }
 }

diff --git a/psst-gui/src/widget/link.rs b/psst-gui/src/widget/link.rs
@@ -75,7 +75,7 @@ impl<T: Data> Widget<T> for Link<T> {
             let is_active = self
                 .is_active
                 .as_ref()
-                .map_or(false, |predicate| predicate(data, env));
+                .is_some_and(|predicate| predicate(data, env));
             if is_active {
                 env.get(theme::LINK_ACTIVE_COLOR)
             } else {