Merge branch 'master' into async

jb-alvarado · Dec 21, 2024 · ae45d86 · ae45d86
2 parents cc81ea8 + 3e516b2
commit ae45d86
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
@@ -42,7 +42,6 @@ m3u8-rs = "6"
 nix = { version = "0.29", features = ["user", "fs"] }
 notify = "7.0"
 notify-debouncer-full = { version = "*", default-features = false }
-num-traits = "0.2"
 paris = "1.5"
 parking_lot = "0.12"
 path-clean = "1.0"
@@ -56,10 +55,8 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_with = "3.8"
 shlex = "1.1"
-static-files = "0.2"
 sysinfo ={ version = "0.33", features = ["linux-netdevs", "linux-tmpfs"] }
 sqlx = { version = "0.8", features = ["runtime-tokio", "sqlite"] }
-time = { version = "0.3", features = ["formatting", "macros"] }
 tokio = { version = "1.29", features = ["full"] }
 tokio-stream = "0.1"
 toml_edit = {version = "0.22", features = ["serde"]}

diff --git a/engine/src/player/utils/mod.rs b/engine/src/player/utils/mod.rs
@@ -557,7 +557,7 @@ pub fn file_extension(filename: &Path) -> Option<&str> {
 
 /// Test if given numbers are close to each other,
 /// with a third number for setting the maximum range.
-pub fn is_close<T: num_traits::Signed + std::cmp::PartialOrd>(a: T, b: T, to: T) -> bool {
+pub fn is_close(a: f64, b: f64, to: f64) -> bool {
     (a - b).abs() < to
 }