From 32d71847b6bf768857eab0afa5be2cf516ae6a88 Mon Sep 17 00:00:00 2001 From: Lionel DARNIS Date: Sat, 23 May 2026 20:49:24 +0200 Subject: [PATCH] chore: align subscriptions with local stack --- subscriptions/a11y-manager/Cargo.toml | 4 ++-- subscriptions/accessibility/Cargo.toml | 2 +- subscriptions/airplane-mode/Cargo.toml | 2 +- subscriptions/network-manager/Cargo.toml | 2 +- subscriptions/network-manager/src/devices.rs | 2 +- subscriptions/network-manager/src/lib.rs | 2 +- subscriptions/pulse/Cargo.toml | 2 +- subscriptions/pulse/src/lib.rs | 4 ++-- subscriptions/settings-daemon/Cargo.toml | 2 +- subscriptions/upower/Cargo.toml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/subscriptions/a11y-manager/Cargo.toml b/subscriptions/a11y-manager/Cargo.toml index bfdf7c2..8bb0c2b 100644 --- a/subscriptions/a11y-manager/Cargo.toml +++ b/subscriptions/a11y-manager/Cargo.toml @@ -7,8 +7,8 @@ rust-version.workspace = true publish = true [dependencies] -cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols" } -iced_futures = { git = "https://github.com/pop-os/libcosmic" } +cosmic-protocols = { path = "../../../cosmic-protocols" } +iced_futures = { path = "../../../libcosmic/iced/futures" } num-derive = "0.4.2" num-traits = "0.2.19" sctk.workspace = true diff --git a/subscriptions/accessibility/Cargo.toml b/subscriptions/accessibility/Cargo.toml index 2a3b5e6..2491153 100644 --- a/subscriptions/accessibility/Cargo.toml +++ b/subscriptions/accessibility/Cargo.toml @@ -9,7 +9,7 @@ publish = true [dependencies] cosmic-dbus-a11y = { git = "https://github.com/pop-os/dbus-settings-bindings" } futures = "0.3.32" -iced_futures = { git = "https://github.com/pop-os/libcosmic" } +iced_futures = { path = "../../../libcosmic/iced/futures" } tokio = { version = "1.49.0", features = ["sync", "time"] } tracing = "0.1.44" zbus = "5.13" diff --git a/subscriptions/airplane-mode/Cargo.toml b/subscriptions/airplane-mode/Cargo.toml index 403f6fe..4fda29b 100644 --- a/subscriptions/airplane-mode/Cargo.toml +++ b/subscriptions/airplane-mode/Cargo.toml @@ -8,7 +8,7 @@ publish = true [dependencies] futures = "0.3.32" -iced_futures = { git = "https://github.com/pop-os/libcosmic" } +iced_futures = { path = "../../../libcosmic/iced/futures" } log = "0.4.29" rustix = "1.1.3" tokio = "1.49.0" diff --git a/subscriptions/network-manager/Cargo.toml b/subscriptions/network-manager/Cargo.toml index e40a2a8..c66a4ca 100644 --- a/subscriptions/network-manager/Cargo.toml +++ b/subscriptions/network-manager/Cargo.toml @@ -11,7 +11,7 @@ cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bi secret-service = { version = "5.1.0", features = ["rt-tokio-crypto-rust"] } nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings" } futures = "0.3.32" -iced_futures = { git = "https://github.com/pop-os/libcosmic" } +iced_futures = { path = "../../../libcosmic/iced/futures" } itertools = "0.14.0" secure-string = "0.3.0" thiserror = "2.0.18" diff --git a/subscriptions/network-manager/src/devices.rs b/subscriptions/network-manager/src/devices.rs index 4dbcdb6..4140728 100644 --- a/subscriptions/network-manager/src/devices.rs +++ b/subscriptions/network-manager/src/devices.rs @@ -188,7 +188,7 @@ pub fn subscription( conn, }, |Wrapper { - id, + id: _, has_popup, conn, }| { diff --git a/subscriptions/network-manager/src/lib.rs b/subscriptions/network-manager/src/lib.rs index 675b7bf..a23f84b 100644 --- a/subscriptions/network-manager/src/lib.rs +++ b/subscriptions/network-manager/src/lib.rs @@ -140,7 +140,7 @@ pub fn subscription( self.id.hash(state); } } - Subscription::run_with(Wrapper { id, conn }, |Wrapper { id, conn }| { + Subscription::run_with(Wrapper { id, conn }, |Wrapper { id: _, conn }| { let conn = conn.clone(); stream::channel( 50, diff --git a/subscriptions/pulse/Cargo.toml b/subscriptions/pulse/Cargo.toml index cc4760b..48c2adc 100644 --- a/subscriptions/pulse/Cargo.toml +++ b/subscriptions/pulse/Cargo.toml @@ -7,6 +7,6 @@ rust-version.workspace = true [dependencies] libpulse-binding = { version = "2.30.1" } rustix = { version = "1.1.3", features = ["pipe"] } -iced_futures = { git = "https://github.com/pop-os/libcosmic" } +iced_futures = { path = "../../../libcosmic/iced/futures" } futures = "0.3.32" log = "0.4.27" diff --git a/subscriptions/pulse/src/lib.rs b/subscriptions/pulse/src/lib.rs index b2a7779..233e2c8 100644 --- a/subscriptions/pulse/src/lib.rs +++ b/subscriptions/pulse/src/lib.rs @@ -281,7 +281,7 @@ impl PulseChannels { /// Set the speaker balance of the active sink. pub fn set_balance(&mut self, balance: f32) { if let Err(err) = self.tx.send(Request::Balance(self.index, balance)) { - log::error!("Failed to send new balance to channel"); + log::error!("Failed to send new balance to channel: {err}"); } else { self.pipe_tx .write_all(&[1]) @@ -292,7 +292,7 @@ impl PulseChannels { /// Set the volume of the active sink. pub fn set_volume(&mut self, volume: f32) { if let Err(err) = self.tx.send(Request::Volume(self.index, volume)) { - log::error!("Failed to send new volume to channel"); + log::error!("Failed to send new volume to channel: {err}"); } else { self.pipe_tx .write_all(&[1]) diff --git a/subscriptions/settings-daemon/Cargo.toml b/subscriptions/settings-daemon/Cargo.toml index aa67fbe..59160d0 100644 --- a/subscriptions/settings-daemon/Cargo.toml +++ b/subscriptions/settings-daemon/Cargo.toml @@ -7,7 +7,7 @@ publish = true [dependencies] futures = "0.3.32" -iced_futures = { git = "https://github.com/pop-os/libcosmic" } +iced_futures = { path = "../../../libcosmic/iced/futures" } log = "0.4.29" tokio = "1.49.0" tokio-stream = "0.1.18" diff --git a/subscriptions/upower/Cargo.toml b/subscriptions/upower/Cargo.toml index 4121a10..3a468c8 100644 --- a/subscriptions/upower/Cargo.toml +++ b/subscriptions/upower/Cargo.toml @@ -8,7 +8,7 @@ publish = true [dependencies] futures = "0.3.32" -iced_futures = { git = "https://github.com/pop-os/libcosmic" } +iced_futures = { path = "../../../libcosmic/iced/futures" } log = "0.4.29" tokio = "1.49.0" tokio-stream = "0.1.18"