From 84a4a012824eb88c08aa5a4d655b03b1bc2b3529 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 May 2026 00:28:46 +0300 Subject: [PATCH] chore(deps): bump tokio from 1.52.1 to 1.52.3 (#115) * chore(deps): bump tokio from 1.52.1 to 1.52.3 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.52.1 to 1.52.3. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.52.1...tokio-1.52.3) --- updated-dependencies: - dependency-name: tokio dependency-version: 1.52.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * fix: replace std::sync::mpsc::sync_channel with tokio::sync::oneshot::channel to avoid deadlocks * deps: update cargo-sources.json --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: arabian --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- packages/flatpak/cargo-sources.json | 10 +++++----- src/utils/pipewire.rs | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c5cd9c5..1747cbc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4156,9 +4156,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.52.1" +version = "1.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6" +checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" dependencies = [ "bytes", "libc", diff --git a/Cargo.toml b/Cargo.toml index d98d9c2..e29bfb9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ keywords = ["soundpad", "pipewire", "linux", "cli", "gui"] [dependencies] -tokio = { version = "1.52.1", features = ["full"] } +tokio = { version = "1.52.3", features = ["full"] } async-trait = "0.1.89" serde = { version = "1.0.228", features = ["derive"] } diff --git a/packages/flatpak/cargo-sources.json b/packages/flatpak/cargo-sources.json index 41c8acb..ce7c671 100644 --- a/packages/flatpak/cargo-sources.json +++ b/packages/flatpak/cargo-sources.json @@ -5328,14 +5328,14 @@ { "type": "archive", "archive-type": "tar-gzip", - "url": "https://static.crates.io/crates/tokio/tokio-1.52.1.crate", - "sha256": "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6", - "dest": "cargo/vendor/tokio-1.52.1" + "url": "https://static.crates.io/crates/tokio/tokio-1.52.3.crate", + "sha256": "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe", + "dest": "cargo/vendor/tokio-1.52.3" }, { "type": "inline", - "contents": "{\"package\": \"b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6\", \"files\": {}}", - "dest": "cargo/vendor/tokio-1.52.1", + "contents": "{\"package\": \"8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe\", \"files\": {}}", + "dest": "cargo/vendor/tokio-1.52.3", "dest-filename": ".cargo-checksum.json" }, { diff --git a/src/utils/pipewire.rs b/src/utils/pipewire.rs index add49f9..1f889c5 100644 --- a/src/utils/pipewire.rs +++ b/src/utils/pipewire.rs @@ -86,7 +86,7 @@ fn parse_global_object( async fn pw_get_global_objects_thread( main_sender: mpsc::Sender<(Option, Option)>, pw_receiver: pipewire::channel::Receiver, - init_sender: std::sync::mpsc::SyncSender>, + init_sender: tokio::sync::oneshot::Sender>, ) { let (main_loop, context) = match setup_pipewire_context() { Ok(res) => res, @@ -147,7 +147,7 @@ pub async fn get_all_devices() -> Result<(Vec, Vec)> { // Channels to communicate with pipewire thread let (main_sender, mut main_receiver) = mpsc::channel(10); let (pw_sender, pw_receiver) = pipewire::channel::channel(); - let (init_sender, init_receiver) = std::sync::mpsc::sync_channel(0); + let (init_sender, init_receiver) = tokio::sync::oneshot::channel(); // Spawn pipewire thread in background let _pw_thread = tokio::spawn(async move { @@ -155,7 +155,7 @@ pub async fn get_all_devices() -> Result<(Vec, Vec)> { }); // Wait for initialization to complete - if let Err(e) = init_receiver.recv()? { + if let Err(e) = init_receiver.await { return Err(anyhow!(e)); }