queue: use let chains and tidy imports

2 files changed, 11 insertions, 8 deletions

diff --git a/src/queue.rs b/src/queue.rs
index da79441..17f2143 100644
--- a/src/queue.rs
+++ b/src/queue.rs
@@ -5,9 +5,9 @@
  * https://codeberg.org/salmonik/RSPlayer
 */
 
+use rand::SeedableRng;
 use rand::rngs::StdRng;
 use rand::seq::SliceRandom;
-use rand::SeedableRng;
 use std::path::{Path, PathBuf};
 
 #[derive(Debug, Clone, PartialEq)]
@@ -315,11 +315,11 @@ impl Queue {
         let mut played: Vec<Track> = Vec::new();
         let mut played_idx: Vec<usize> = Vec::new();
         for i in 0..=current_pos {
-            if let Some(&idx) = self.shuffled_indices.get(i) {
-                if let Some(track) = self.tracks.get(idx) {
-                    played.push(track.clone());
-                    played_idx.push(idx);
-                }
+            if let Some(&idx) = self.shuffled_indices.get(i)
+                && let Some(track) = self.tracks.get(idx)
+            {
+                played.push(track.clone());
+                played_idx.push(idx);
             }
         }
 
diff --git a/tests/queue.rs b/tests/queue.rs
index 67cbabf..7472195 100644
--- a/tests/queue.rs
+++ b/tests/queue.rs
@@ -504,7 +504,9 @@ fn test_add_during_shuffle_survives_shuffle_off() {
         q.len()
     );
     assert!(
-        q.tracks().iter().any(|t| t.path == PathBuf::from("/music/d.mp3")),
+        q.tracks()
+            .iter()
+            .any(|t| t.path == PathBuf::from("/music/d.mp3")),
         "track added during shuffle was dropped when shuffle was turned off"
     );
 }
@@ -601,7 +603,8 @@ fn test_shuffle_play_now_current_is_inserted_track() {
         assert_eq!(q.position(), 1);
         let cur = q.current().expect("queue is not empty");
         assert_eq!(
-            cur.path, inserted,
+            cur.path,
+            inserted,
             "seed {}: current() after play-now is {:?}, expected {:?}; shuffled_indices={:?}",
             seed,
             cur.path,