feat(edition): edition 2024

because pipewire need it, so I want to upgrade it

Author: Decodetalkers

Cargo.toml

@@ -6,8 +6,8 @@ repository = "https://github.com/RustAudio/cpal"
 documentation = "https://docs.rs/cpal"
 license = "Apache-2.0"
 keywords = ["audio", "sound"]
-edition = "2021"
-rust-version = "1.78"
+edition = "2024"
+rust-version = "1.85"
 
 [features]
 # ASIO backend for Windows

examples/beep.rs

@@ -13,8 +13,8 @@
 
 use clap::Parser;
 use cpal::{
+    FromSample, I24, Sample, SizedSample,
     traits::{DeviceTrait, HostTrait, StreamTrait},
-    FromSample, Sample, SizedSample, I24,
 };
 
 #[derive(Parser, Debug)]

examples/custom.rs

@@ -1,11 +1,11 @@
 use std::sync::{
-    atomic::{AtomicBool, Ordering},
     Arc,
+    atomic::{AtomicBool, Ordering},
 };
 
 use cpal::{
-    traits::{DeviceTrait, HostTrait, StreamTrait},
     DeviceDescription, DeviceDescriptionBuilder,
+    traits::{DeviceTrait, HostTrait, StreamTrait},
 };
 use cpal::{FromSample, Sample};
 

examples/feedback.rs

@@ -9,8 +9,8 @@
 use clap::Parser;
 use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
 use ringbuf::{
-    traits::{Consumer, Producer, Split},
     HeapRb,
+    traits::{Consumer, Producer, Split},
 };
 
 #[derive(Parser, Debug)]

examples/record_wav.rs

@@ -135,7 +135,7 @@ fn main() -> Result<(), anyhow::Error> {
         sample_format => {
             return Err(anyhow::Error::msg(format!(
                 "Unsupported sample format '{sample_format}'"
-            )))
+            )));
         }
     };
 

examples/synth_tones.rs

@@ -6,11 +6,11 @@ extern crate anyhow;
 extern crate clap;
 extern crate cpal;
 
+use cpal::{FromSample, Sample};
 use cpal::{
+    I24, SizedSample, U24,
     traits::{DeviceTrait, HostTrait, StreamTrait},
-    SizedSample, I24, U24,
 };
-use cpal::{FromSample, Sample};
 
 fn main() -> anyhow::Result<()> {
     let stream = stream_setup_for()?;
@@ -114,8 +114,8 @@ where
     }
 }
 
-pub fn host_device_setup(
-) -> Result<(cpal::Host, cpal::Device, cpal::SupportedStreamConfig), anyhow::Error> {
+pub fn host_device_setup()
+-> Result<(cpal::Host, cpal::Device, cpal::SupportedStreamConfig), anyhow::Error> {
     let host = cpal::default_host();
 
     let device = host

src/host/aaudio/java_interface/audio_features.rs

@@ -1,9 +1,9 @@
 use super::{
+    PackageManager,
     utils::{
-        get_context, get_package_manager, has_system_feature, with_attached, JNIEnv, JObject,
-        JResult,
+        JNIEnv, JObject, JResult, get_context, get_package_manager, has_system_feature,
+        with_attached,
     },
-    PackageManager,
 };
 
 /**

src/host/aaudio/java_interface/audio_manager.rs

@@ -1,8 +1,8 @@
 use super::{
+    AudioManager, Context,
     utils::{
-        get_context, get_property, get_system_service, with_attached, JNIEnv, JObject, JResult,
+        JNIEnv, JObject, JResult, get_context, get_property, get_system_service, with_attached,
     },
-    AudioManager, Context,
 };
 
 impl AudioManager {

src/host/aaudio/java_interface/devices_info.rs

@@ -3,14 +3,13 @@ use num_traits::FromPrimitive;
 use crate::{DeviceDirection, SampleFormat};
 
 use super::{
-    android_device_flags,
+    AudioDeviceInfo, AudioDeviceType, Context, android_device_flags,
     utils::{
-        call_method_no_args_ret_bool, call_method_no_args_ret_char_sequence,
-        call_method_no_args_ret_int, call_method_no_args_ret_int_array,
-        call_method_no_args_ret_string, get_context, get_devices, get_system_service,
-        with_attached, JNIEnv, JObject, JResult,
+        JNIEnv, JObject, JResult, call_method_no_args_ret_bool,
+        call_method_no_args_ret_char_sequence, call_method_no_args_ret_int,
+        call_method_no_args_ret_int_array, call_method_no_args_ret_string, get_context,
+        get_devices, get_system_service, with_attached,
     },
-    AudioDeviceInfo, AudioDeviceType, Context,
 };
 
 impl AudioDeviceInfo {

src/host/aaudio/java_interface/utils.rs

@@ -5,9 +5,9 @@ use std::sync::Arc;
 pub use jni::Executor;
 
 pub use jni::{
+    JNIEnv, JavaVM,
     errors::Result as JResult,
     objects::{JIntArray, JObject, JObjectArray, JString},
-    JNIEnv, JavaVM,
 };
 
 pub fn get_context() -> AndroidContext {