[dep]: Update dependencies

Update calibright, zbus, and fututes
bim9262 · Oct 20, 2024 · eec1fee · eec1fee
1 parent 50753e3
commit eec1fee
Show file tree

Hide file tree

Showing 16 changed files with 77 additions and 133 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,14 +32,14 @@ rustdoc-args = ["--cfg", "docsrs"]
 async-trait = "0.1"
 backon = { version = "1.2", default-features = false, features = ["tokio-sleep"] }
 base64 = { version = "0.22.1" }
-calibright = { version = "0.1.6", features = ["watch"] }
+calibright = { version = "0.1.9", features = ["watch"] }
 chrono = { version = "0.4", default-features = false, features = ["clock", "unstable-locales"] }
 chrono-tz = { version = "0.9", features = ["serde"] }
 clap = { version = "4.0", default-features = false, features = ["std", "derive", "help", "usage"] }
 debounced = "0.2.0"
 dirs = "5.0"
 env_logger = "0.11"
-futures = { version = "0.3", default-features = false }
+futures = { version = "0.3.31", default-features = false }
 glob = { version = "0.3.1", optional = true }
 hyper = "0.14"
 iana-time-zone = "0.1.60"
@@ -77,7 +77,7 @@ toml = { version = "0.8", features = ["preserve_order"] }
 unicode-segmentation = "1.10.1"
 wayrs-client = { version = "1.0", features = ["tokio"] }
 wayrs-protocols = { version = "0.14", features = ["wlr-foreign-toplevel-management-unstable-v1"] }
-zbus = { version = "4", default-features = false, features = ["tokio"] }
+zbus = { version = "5", default-features = false, features = ["tokio"] }
 
 [dependencies.tokio]
 version = "1.12"

diff --git a/src/blocks/battery/upower.rs b/src/blocks/battery/upower.rs
@@ -12,7 +12,7 @@ const DISPLAY_DEVICE_PATH: ObjectPath =
 
 struct DeviceConnection {
     device_proxy: DeviceProxy<'static>,
-    changes: PropertiesChangedStream<'static>,
+    changes: PropertiesChangedStream,
 }
 
 impl DeviceConnection {
@@ -99,8 +99,8 @@ pub(super) struct Device {
     device: DeviceName,
     dev_model: Option<String>,
     device_conn: Option<DeviceConnection>,
-    device_added_stream: DeviceAddedStream<'static>,
-    device_removed_stream: DeviceRemovedStream<'static>,
+    device_added_stream: DeviceAddedStream,
+    device_removed_stream: DeviceRemovedStream,
 }
 
 impl Device {

diff --git a/src/blocks/bluetooth.rs b/src/blocks/bluetooth.rs
@@ -398,14 +398,14 @@ impl Device {
                     .error("Failed to create PropertiesProxy")?,
                 device: Device1Proxy::builder(manager_proxy.inner().connection())
                     // No caching because https://github.com/greshake/i3status-rust/issues/1565#issuecomment-1379308681
-                    .cache_properties(zbus::CacheProperties::No)
+                    .cache_properties(zbus::proxy::CacheProperties::No)
                     .path(path.clone())
                     .unwrap()
                     .build()
                     .await
                     .error("Failed to create Device1Proxy")?,
                 battery: Battery1Proxy::builder(manager_proxy.inner().connection())
-                    .cache_properties(zbus::CacheProperties::No)
+                    .cache_properties(zbus::proxy::CacheProperties::No)
                     .path(path)
                     .unwrap()
                     .build()

diff --git a/src/blocks/external_ip.rs b/src/blocks/external_ip.rs
@@ -91,7 +91,7 @@ pub async fn run(config: &Config, api: &CommonApi) -> Result<()> {
         proxy
             .add_match_rule(
                 MatchRule::builder()
-                    .msg_type(zbus::MessageType::Signal)
+                    .msg_type(zbus::message::Type::Signal)
                     .path("/org/freedesktop/NetworkManager")
                     .and_then(|x| x.interface("org.freedesktop.DBus.Properties"))
                     .and_then(|x| x.member("PropertiesChanged"))
@@ -103,7 +103,7 @@ pub async fn run(config: &Config, api: &CommonApi) -> Result<()> {
         proxy
             .add_match_rule(
                 MatchRule::builder()
-                    .msg_type(zbus::MessageType::Signal)
+                    .msg_type(zbus::message::Type::Signal)
                     .path_namespace("/org/freedesktop/NetworkManager/ActiveConnection")
                     .and_then(|x| x.interface("org.freedesktop.DBus.Properties"))
                     .and_then(|x| x.member("PropertiesChanged"))
@@ -115,7 +115,7 @@ pub async fn run(config: &Config, api: &CommonApi) -> Result<()> {
         proxy
             .add_match_rule(
                 MatchRule::builder()
-                    .msg_type(zbus::MessageType::Signal)
+                    .msg_type(zbus::message::Type::Signal)
                     .path_namespace("/org/freedesktop/NetworkManager/IP4Config")
                     .and_then(|x| x.interface("org.freedesktop.DBus.Properties"))
                     .and_then(|x| x.member("PropertiesChanged"))

diff --git a/src/blocks/hueshift.rs b/src/blocks/hueshift.rs
@@ -330,7 +330,7 @@ impl HueShiftDriver for Wlsunset {
 
 struct WlGammarelayRs {
     proxy: WlGammarelayRsBusProxy<'static>,
-    updates: zbus::PropertyStream<'static, u16>,
+    updates: zbus::proxy::PropertyStream<'static, u16>,
 }
 
 impl WlGammarelayRs {