chore: tidy up, clippy, fmt

Author: Decodetalkers

Cargo.toml

@@ -7,7 +7,7 @@ documentation = "https://docs.rs/cpal"
 license = "Apache-2.0"
 keywords = ["audio", "sound"]
 edition = "2021"
-rust-version = "1.77"
+rust-version = "1.82"
 
 [features]
 # ASIO backend for Windows

src/host/mod.rs

@@ -7,11 +7,6 @@ pub(crate) mod aaudio;
     target_os = "netbsd"
 ))]
 pub(crate) mod alsa;
-#[cfg(all(
-    any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"),
-    feature = "pipewire"
-))]
-pub(crate) mod pipewire;
 #[cfg(all(windows, feature = "asio"))]
 pub(crate) mod asio;
 #[cfg(all(
@@ -36,6 +31,11 @@ pub(crate) mod emscripten;
     )
 ))]
 pub(crate) mod jack;
+#[cfg(all(
+    any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"),
+    feature = "pipewire"
+))]
+pub(crate) mod pipewire;
 #[cfg(windows)]
 pub(crate) mod wasapi;
 #[cfg(all(target_arch = "wasm32", feature = "wasm-bindgen"))]

src/host/pipewire/device.rs

@@ -237,7 +237,7 @@ impl DeviceTrait for Device {
         let (pw_init_tx, pw_init_rv) = std::sync::mpsc::channel::<bool>();
         let device = self.clone();
         let config = config.clone();
-        let wait_timeout = timeout.clone().unwrap_or(Duration::from_secs(2));
+        let wait_timeout = timeout.unwrap_or(Duration::from_secs(2));
         let handle = thread::Builder::new()
             .name("pw_capture_music_in".to_owned())
             .spawn(move || {
@@ -299,7 +299,7 @@ impl DeviceTrait for Device {
         let (pw_init_tx, pw_init_rv) = std::sync::mpsc::channel::<bool>();
         let device = self.clone();
         let config = config.clone();
-        let wait_timeout = timeout.clone().unwrap_or(Duration::from_secs(2));
+        let wait_timeout = timeout.unwrap_or(Duration::from_secs(2));
         let handle = thread::Builder::new()
             .name("pw_capture_music_out".to_owned())
             .spawn(move || {

src/host/pipewire/stream.rs

@@ -240,7 +240,7 @@ where
 
                 let data = samples.as_ptr() as *mut ();
                 let mut data =
-                    unsafe { Data::from_parts(data, n_samples as usize, user_data.sample_format) };
+                    unsafe { Data::from_parts(data, n_samples, user_data.sample_format) };
                 if let Err(err) = user_data.publish_data_out(frames, &mut data) {
                     (user_data.error_callback)(StreamError::BackendSpecific { err });
                 }