fixup clippy

rs/src/api/queue.rs

@@ -53,7 +53,7 @@ pub async fn add(data: web::Data<AppState>, input: web::Json<ApiQueueInput>) ->
     };
 
     let maybe_tracks = data.collection.get_tracks_under(&collection_location);
-    if (maybe_tracks.is_none()) {
+    if maybe_tracks.is_none() {
         return HttpResponse::NotFound().body("Not found");
     }
     let tracks = maybe_tracks.unwrap();
@@ -63,7 +63,7 @@ pub async fn add(data: web::Data<AppState>, input: web::Json<ApiQueueInput>) ->
     if input.clear {
         queue.clear();
     }
-    queue.add_tracks(tracks.into_iter().map(|track| track.clone()).collect());
+    queue.add_tracks(tracks.into_iter().cloned().collect());
     HttpResponse::Ok().body("ok")
 }
 

rs/src/filemanager/collection.rs

@@ -1,18 +1,16 @@
 use std::{
-    collections::{BTreeMap, VecDeque},
-    path::PathBuf,
+    collections::{BTreeMap},
 };
 
-use lazy_static::lazy_static;
-use regex::Regex;
+
+
 
 use super::{
     cache,
-    collection_builder::{build, CollectionBuilder},
+    collection_builder::{build},
     dto::CollectionLocation,
     model::{Category, Track},
     options::CollectionOptions,
-    utils::generate_id,
 };
 
 const DEFAULT_CATEGORY: &str = "Music";
@@ -29,6 +27,12 @@ pub fn init(options: CollectionOptions) -> std::io::Result<Collection> {
     Ok(collection)
 }
 
+impl Default for Collection {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Collection {
     pub fn new() -> Self {
         Self {
@@ -69,9 +73,7 @@ impl Collection {
      */
     pub fn get_tracks_under(&self, location: &CollectionLocation) -> Option<Vec<&Track>> {
         let maybe_category = self.categories.get(&location.category);
-        if maybe_category.is_none() {
-            return None;
-        }
+        maybe_category?;
         let category = maybe_category.unwrap();
 
         let maybe_tracks = match (&location.artist, &location.album, &location.disc) {
@@ -105,8 +107,7 @@ impl Collection {
         return maybe_tracks.and_then(|tracks| {
             tracks
                 .iter()
-                .find(|track| track.name == *location.track.as_ref().unwrap())
-                .and_then(|track| Some(vec![track.clone()]))
+                .find(|track| track.name == *location.track.as_ref().unwrap()).map(|track| vec![track.clone()])
         });
     }
 }
@@ -115,9 +116,9 @@ impl Collection {
 mod tests {
     use super::*;
     use crate::filemanager::model::factories::*;
-    use crate::filemanager::model::Track;
+
     use factori::create;
-    use std::path::PathBuf;
+
 
     #[test]
     fn test_add_category() {

rs/src/filemanager/collection_builder.rs

@@ -1,14 +1,13 @@
 use std::{
     borrow::Cow,
-    collections::{BTreeMap, VecDeque},
+    collections::{VecDeque},
     path::PathBuf,
 };
 
 use lazy_static::lazy_static;
 use regex::Regex;
 
 use super::{
-    cache,
     collection::Collection,
     model::{Category, Track},
     utils::generate_id,

rs/src/filemanager/list.rs

@@ -41,7 +41,7 @@ fn list_album(album: &Album, indent: usize) {
     let space = " ".repeat(indent);
     log::info!("{space}[al]{}", album.name);
 
-    for (disc_name, disc) in &album.discs {
+    for (_disc_name, disc) in &album.discs {
         list_album(disc, indent + 2);
     }
 

rs/src/filemanager/model.rs

@@ -149,11 +149,11 @@ pub mod factories {
     });
 
     pub fn random_string() -> String {
-        let id = thread_rng()
+
+        thread_rng()
             .sample_iter(&Alphanumeric)
             .take(30)
             .map(char::from)
-            .collect();
-        id
+            .collect()
     }
 }