From ac667f1273d7a7dcb067cc611626c40207053eeb Mon Sep 17 00:00:00 2001 From: arabian Date: Fri, 2 Jan 2026 03:33:20 +0300 Subject: [PATCH] feat: make_request_sync now uses tokio instead of futures --- Cargo.lock | 47 ----------------------------------------------- Cargo.toml | 1 - src/utils/gui.rs | 4 +++- 3 files changed, 3 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 61493b6..d1f8902 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1231,21 +1231,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "futures" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - [[package]] name = "futures-channel" version = "0.3.31" @@ -1253,7 +1238,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", - "futures-sink", ] [[package]] @@ -1262,18 +1246,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" -[[package]] -name = "futures-executor" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", - "num_cpus", -] - [[package]] name = "futures-io" version = "0.3.31" @@ -1304,12 +1276,6 @@ dependencies = [ "syn", ] -[[package]] -name = "futures-sink" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" - [[package]] name = "futures-task" version = "0.3.31" @@ -1322,11 +1288,9 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ - "futures-channel", "futures-core", "futures-io", "futures-macro", - "futures-sink", "futures-task", "memchr", "pin-project-lite", @@ -2016,16 +1980,6 @@ dependencies = [ "libm", ] -[[package]] -name = "num_cpus" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "num_enum" version = "0.7.5" @@ -2609,7 +2563,6 @@ dependencies = [ "eframe", "egui", "egui_material_icons", - "futures", "pipewire", "rfd", "rodio", diff --git a/Cargo.toml b/Cargo.toml index c10e654..4f6b804 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,6 @@ keywords = ["soundpad", "pipewire", "linux", "cli", "gui"] [dependencies] tokio = { version = "1.48.0", features = ["full"] } -futures = { version = "0.3.31", features = ["thread-pool"] } async-trait = "0.1.89" serde = { version = "1.0.228", features = ["derive"] } diff --git a/src/utils/gui.rs b/src/utils/gui.rs index 73f0563..587aee5 100644 --- a/src/utils/gui.rs +++ b/src/utils/gui.rs @@ -24,7 +24,9 @@ pub fn get_gui_config() -> GuiConfig { } pub fn make_request_sync(request: Request) -> Result> { - futures::executor::block_on(make_request(request)) + tokio::task::block_in_place(|| { + tokio::runtime::Handle::current().block_on(make_request(request)) + }) } pub fn format_time_pair(position: f32, duration: f32) -> String {