update edition + fmt

Author: wiiznokes

Cargo.toml

@@ -1,3 +1,9 @@
+[workspace]
+members = ["speexdsp-sys", "resampler", "fft"]
+
+[workspace.package]
+edition = "2024"
+
 [package]
 name = "speexdsp"
 version = "0.1.1"
@@ -9,14 +15,14 @@ keywords = ["audio", "resampler"]
 categories = ["api-bindings"]
 license = "MIT"
 readme = "README.md"
-edition = "2018"
+edition.workspace = true
 
 [features]
 sys = ["speexdsp-sys"]
 vendored-sys = ["sys", "speexdsp-sys/vendored"]
-sse3 = [ "speexdsp-resampler/sse3" ]
-avx = [ "speexdsp-resampler/avx" ]
-dynnative = [ "speexdsp-resampler/dynnative" ]
+sse3 = ["speexdsp-resampler/sse3"]
+avx = ["speexdsp-resampler/avx"]
+dynnative = ["speexdsp-resampler/dynnative"]
 
 [dev-dependencies]
 assert_approx_eq = "1.1.0"
@@ -29,8 +35,6 @@ criterion = "0.3"
 speexdsp-sys = { version = "0.1.1", path = "speexdsp-sys", optional = true }
 speexdsp-resampler = { version = "0.1", path = "resampler" }
 
-[workspace]
-members = ["speexdsp-sys", "resampler", "fft"]
 
 [[bench]]
 name = "resampling_c"

benches/resampling_c.rs

@@ -1,7 +1,7 @@
 #[cfg(feature = "sys")]
 extern crate speexdsp_sys;
 
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 #[cfg(feature = "sys")]
 use speexdsp_sys::resampler::*;
 

benches/resampling_rust.rs

@@ -1,6 +1,6 @@
 use std::f32::consts::PI;
 
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use speexdsp::resampler::*;
 
 const PERIOD: f32 = 32f32;

benches/resampling_simple_c.rs

@@ -1,4 +1,4 @@
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 
 #[cfg(feature = "sys")]
 use speexdsp_sys::resampler::*;

benches/resampling_simple_c_dbl.rs

@@ -1,4 +1,4 @@
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 
 #[cfg(feature = "sys")]
 use speexdsp_sys::resampler::*;

benches/resampling_simple_rust.rs

@@ -1,6 +1,6 @@
 use std::f32::consts::PI;
 
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use speexdsp::resampler::*;
 
 const PERIOD: f32 = 32f32;

benches/resampling_simple_rust_dbl.rs

@@ -1,6 +1,6 @@
 use std::f32::consts::PI;
 
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use speexdsp::resampler::*;
 
 const PERIOD: f32 = 32f32;

speexdsp-sys/Cargo.toml

@@ -9,6 +9,7 @@ readme = "../README.md"
 homepage = "https://github.com/rust-av/speexdsp-rs"
 keywords = ["audio", "resampler"]
 categories = ["api-bindings"]
+edition.workspace = true
 
 exclude = ["speexdsp/doc/*", "speexdsp/html/*"]
 

speexdsp-sys/build.rs

@@ -79,7 +79,7 @@ fn main() {
         cfg.define("FLOATING_POINT", None);
 
         // xxx: maybe we should use the .h files in win32 ?
-        
+
         // necessary for windows for some reason
         cfg.define("EXPORT", "");
         // most portable implementation

src/resampler.rs

@@ -110,11 +110,7 @@ mod sys {
                     out_rate as u32,
                 )
             };
-            if ret != 0 {
-                Err(ret.into())
-            } else {
-                Ok(())
-            }
+            if ret != 0 { Err(ret.into()) } else { Ok(()) }
         }
 
         fn get_rate(&self) -> (usize, usize) {
@@ -183,11 +179,7 @@ mod sys {
             let ret = unsafe {
                 speex_resampler_set_quality(self.st, quality as i32)
             };
-            if ret != 0 {
-                Err(ret.into())
-            } else {
-                Ok(())
-            }
+            if ret != 0 { Err(ret.into()) } else { Ok(()) }
         }
 
         fn get_quality(&self) -> usize {