cargo fmt

Author: kamiyaa

Cargo.toml

@@ -52,17 +52,11 @@ uuid = { version = "^0", features = ["v4"] }
 unicode-width = "^0"
 unicode-segmentation = "^1"
 xdg = "^2"
-
-[target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))'.dependencies]
-cpal = { features = [ "jack" ], version = "^0" }
-# pipewire = { optional = true, version = "^0" }
-
-[target.'cfg(target_os = "windows")'.dependencies]
-cpal = "^0"
-
-[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
 cpal = "^0"
+# pipewire = { optional = true, version = "^0" }
 
 [features]
 default = [ "devicons" ]
 devicons = [ "phf" ]
+jack = [ "cpal/jack" ]
+mouse = []

src/bin/server/client.rs

@@ -54,8 +54,7 @@ pub fn handle_client(
         let response = ClientRequest::ClientLeave {
             uuid: uuid.to_string(),
         };
-        let json = serde_json::to_string(&response).
-            expect("Failed to serialize ClientRequest");
+        let json = serde_json::to_string(&response).expect("Failed to serialize ClientRequest");
         let _ = event_tx_clone.send(ClientMessage::Client(json));
     });
 

src/bin/server/config/general/server.rs

@@ -47,6 +47,7 @@ fn default_audio_system_string() -> String {
 fn str_to_cpal_hostid(s: &str) -> Option<cpal::HostId> {
     match s {
         "alsa" => Some(cpal::HostId::Alsa),
+        #[cfg(feature = "jack")]
         "jack" => Some(cpal::HostId::Jack),
         _ => None,
     }

src/bin/server/playlist/impl_playlist.rs

@@ -1,5 +1,5 @@
 use rand::prelude::SliceRandom;
-use rand::thread_rng;
+use rand::rng;
 
 use dizi::song::DiziSongEntry;
 
@@ -95,15 +95,15 @@ impl DiziPlaylistTrait for DiziPlaylist {
                 let entry_index = entry.entry_index;
                 let mut new_shuffle_order: Vec<usize> =
                     (0..self.len()).filter(|i| *i != entry_index).collect();
-                new_shuffle_order.shuffle(&mut thread_rng());
+                new_shuffle_order.shuffle(&mut rng());
                 new_shuffle_order.insert(0, entry_index);
 
                 self.order = new_shuffle_order;
                 self.order_index = Some(0);
             }
             None => {
                 let mut new_shuffle_order: Vec<usize> = (0..self.len()).collect();
-                new_shuffle_order.shuffle(&mut thread_rng());
+                new_shuffle_order.shuffle(&mut rng());
                 self.order = new_shuffle_order;
             }
         }