From e76d01eaed05a0efad4020f77f507c4b6025f868 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Thu, 1 Dec 2022 09:24:49 +1300 Subject: [PATCH] Update dependencies --- Cargo.lock | 194 ++++++++++++------------------ Cargo.toml | 7 +- daemon-user/Cargo.toml | 4 +- daemon-user/src/ctrl_anime.rs | 7 +- daemon/Cargo.toml | 1 - daemon/src/ctrl_supported.rs | 4 +- daemon/src/lib.rs | 3 +- rog-anime/Cargo.toml | 3 +- rog-anime/src/data.rs | 2 +- rog-aura/Cargo.toml | 4 +- rog-aura/src/builtin_modes.rs | 2 +- rog-aura/src/per_key_rgb.rs | 2 +- rog-aura/src/per_zone.rs | 2 +- rog-aura/src/usb.rs | 2 +- rog-dbus/Cargo.toml | 2 - rog-dbus/src/zbus_anime.rs | 9 +- rog-dbus/src/zbus_led.rs | 16 +-- rog-dbus/src/zbus_platform.rs | 16 +-- rog-dbus/src/zbus_power.rs | 7 +- rog-dbus/src/zbus_profile.rs | 13 +- rog-dbus/src/zbus_supported.rs | 3 +- rog-platform/Cargo.toml | 3 +- rog-platform/src/platform.rs | 2 +- rog-platform/src/supported.rs | 2 +- rog-profiles/Cargo.toml | 5 +- rog-profiles/src/fan_curve_set.rs | 2 +- rog-profiles/src/lib.rs | 2 +- 27 files changed, 109 insertions(+), 210 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fcf5ee9e..801631e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -26,9 +26,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464b3811b747f8f7ebc8849c9c728c39f6ac98a055edad93baf9eb330e3f8f9d" +checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107" dependencies = [ "cfg-if", "getrandom", @@ -38,9 +38,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -112,11 +112,11 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" dependencies = [ - "concurrent-queue 1.2.4", + "concurrent-queue", "event-listener", "futures-core", ] @@ -129,7 +129,7 @@ checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" dependencies = [ "async-lock", "async-task", - "concurrent-queue 2.0.0", + "concurrent-queue", "fastrand", "futures-lite", "slab", @@ -149,13 +149,13 @@ dependencies = [ [[package]] name = "async-io" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7" +checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" dependencies = [ "async-lock", "autocfg", - "concurrent-queue 1.2.4", + "concurrent-queue", "futures-lite", "libc", "log", @@ -164,7 +164,7 @@ dependencies = [ "slab", "socket2", "waker-fn", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -191,20 +191,20 @@ dependencies = [ [[package]] name = "async-process" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c" +checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4" dependencies = [ "async-io", + "async-lock", "autocfg", "blocking", "cfg-if", "event-listener", "futures-lite", "libc", - "once_cell", "signal-hook", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -226,9 +226,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.58" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" +checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" dependencies = [ "proc-macro2", "quote", @@ -317,16 +317,16 @@ dependencies = [ [[package]] name = "blocking" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" +checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" dependencies = [ "async-channel", + "async-lock", "async-task", "atomic-waker", "fastrand", "futures-lite", - "once_cell", ] [[package]] @@ -363,15 +363,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" - -[[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" [[package]] name = "cairo-rs" @@ -399,12 +393,12 @@ dependencies = [ [[package]] name = "calloop" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595eb0438b3c6d262395fe30e6de9a61beb57ea56290b00a07f227fe6e20cbf2" +checksum = "5bcf530afb40e45e14440701e5e996d7fd139e84a912a4d83a8d6a0fb3e58663" dependencies = [ "log", - "nix 0.24.2", + "nix 0.25.0", "slotmap", "thiserror", "vec_map", @@ -412,9 +406,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.76" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" [[package]] name = "cesu8" @@ -523,15 +517,6 @@ dependencies = [ "syn", ] -[[package]] -name = "concurrent-queue" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -dependencies = [ - "cache-padded", -] - [[package]] name = "concurrent-queue" version = "2.0.0" @@ -614,9 +599,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if", ] @@ -681,7 +666,6 @@ dependencies = [ "tokio", "toml", "zbus", - "zvariant", ] [[package]] @@ -698,8 +682,6 @@ dependencies = [ "serde_json", "smol", "zbus", - "zvariant", - "zvariant_derive", ] [[package]] @@ -750,9 +732,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer", "crypto-common", @@ -1020,12 +1002,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", - "miniz_oxide 0.5.4", + "miniz_oxide 0.6.2", ] [[package]] @@ -1765,13 +1747,12 @@ dependencies = [ [[package]] name = "logind-zbus" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c2bd5667a34b046e66f21ac2c016b1f4b41318423f9282b4e04f755ad947817" +checksum = "214b1739f5cf1b467329c1a7b42e9b142aee6dce3f38a86cf902b5b6ac1b55b3" dependencies = [ "serde", "zbus", - "zvariant", ] [[package]] @@ -1842,15 +1823,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.6.2" @@ -1923,9 +1895,9 @@ dependencies = [ [[package]] name = "ndk-sys" -version = "0.4.0" +version = "0.4.1+23.1.7779620" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d83ec9c63ec5bf950200a8e508bdad6659972187b625469f58ef8c08e29046" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" dependencies = [ "jni-sys", ] @@ -1984,15 +1956,13 @@ dependencies = [ [[package]] name = "notify-rust" -version = "4.5.11" -source = "git+https://github.com/flukejones/notify-rust.git#6033d06377d6d601207ae31861cda560d03a9aa8" +version = "4.6.0" +source = "git+https://github.com/flukejones/notify-rust.git#c83082a2549932bde52a4ec449b9981fc39e9a0d" dependencies = [ "mac-notification-sys", "serde", "tauri-winrt-notification", "zbus", - "zvariant", - "zvariant_derive", ] [[package]] @@ -2097,9 +2067,9 @@ dependencies = [ [[package]] name = "owned_ttf_parser" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4665508572151759e8d60404e20dc096ef93a99801a05ac2ac6e43bf5b4ca187" +checksum = "18904d3c65493a9f0d7542293d1a7f69bfdc309a6b9ef4f46dc3e58b0577edc5" dependencies = [ "ttf-parser", ] @@ -2147,9 +2117,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" dependencies = [ "cfg-if", "libc", @@ -2166,9 +2136,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8" +checksum = "5f400b0f7905bf702f9f3dc3df5a121b16c54e9e8012c082905fdf09a931861a" dependencies = [ "thiserror", "ucd-trie", @@ -2222,16 +2192,16 @@ dependencies = [ [[package]] name = "polling" -version = "2.4.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2" +checksum = "166ca89eb77fd403230b9c156612965a81e094ec6ec3aa13663d4c8b113fa748" dependencies = [ "autocfg", "cfg-if", "libc", "log", "wepoll-ffi", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -2439,7 +2409,6 @@ dependencies = [ "serde_derive", "sysfs-class", "zbus", - "zvariant", ] [[package]] @@ -2450,7 +2419,7 @@ dependencies = [ "serde_derive", "serde_json", "toml", - "zvariant", + "zbus", ] [[package]] @@ -2462,8 +2431,6 @@ dependencies = [ "rog_platform", "rog_profiles", "zbus", - "zbus_macros", - "zvariant", ] [[package]] @@ -2479,8 +2446,7 @@ dependencies = [ "serde_derive", "sysfs-class", "udev", - "zvariant", - "zvariant_derive", + "zbus", ] [[package]] @@ -2490,8 +2456,7 @@ dependencies = [ "serde", "serde_derive", "udev", - "zvariant", - "zvariant_derive", + "zbus", ] [[package]] @@ -2581,18 +2546,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.147" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c" dependencies = [ "proc-macro2", "quote", @@ -2601,9 +2566,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ "itoa", "ryu", @@ -2737,9 +2702,9 @@ dependencies = [ [[package]] name = "smol" -version = "1.2.5" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cf3b5351f3e783c1d79ab5fc604eeed8b8ae9abd36b166e8b87a089efd85e4" +checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" dependencies = [ "async-channel", "async-executor", @@ -2750,7 +2715,6 @@ dependencies = [ "async-process", "blocking", "futures-lite", - "once_cell", ] [[package]] @@ -2821,9 +2785,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" dependencies = [ "proc-macro2", "quote", @@ -2974,9 +2938,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.21.2" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" dependencies = [ "autocfg", "libc", @@ -2990,9 +2954,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", @@ -3587,9 +3551,9 @@ dependencies = [ [[package]] name = "x11-dl" -version = "2.20.0" +version = "2.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c83627bc137605acc00bb399c7b908ef460b621fc37c953db2b09f88c449ea6" +checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0" dependencies = [ "lazy_static", "libc", @@ -3635,9 +3599,9 @@ checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" [[package]] name = "zbus" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a0b85c5608c27d2306d67e955b9c6e23a42d824205c85038a7afbe19c0ae22" +checksum = "a25ae891bd547674b368906552115143031c16c23a0f2f4b2f5f5436ab2e6a9f" dependencies = [ "async-broadcast", "async-channel", @@ -3674,9 +3638,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b18018648e7e10ed856809befe7309002b87b2b12d5b282cb5040d7974b58677" +checksum = "8aa37701ce7b3a43632d2b0ad9d4aef602b46be6bdd7fba3b7c5007f9f6eb2c2" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3687,9 +3651,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41a408fd8a352695690f53906dc7fd036be924ec51ea5e05666ff42685ed0af5" +checksum = "d69bb79b44e1901ed8b217e485d0f01991aec574479b68cb03415f142bc7ae67" dependencies = [ "serde", "static_assertions", @@ -3698,9 +3662,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794fb7f59af4105697b0449ba31731ee5dbb3e773a17dbdf3d36206ea1b1644" +checksum = "5c817f416f05fcbc833902f1e6064b72b1778573978cfeac54731451ccc9e207" dependencies = [ "byteorder", "enumflags2", @@ -3712,9 +3676,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd58d4b6c8e26d3dd2149c8c40c6613ef6451b9885ff1296d1ac86c388351a54" +checksum = "fdd24fffd02794a76eb10109de463444064c88f5adb9e9d1a78488adc332bfef" dependencies = [ "proc-macro-crate", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index a66d6857..659d0986 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,11 +11,8 @@ concat-idents = "^1.1" dirs = "^4.0" smol = "^1.2" -zbus = "^3.4" -zbus_macros = "^3.4" -zvariant = "^3.7" -zvariant_derive = "^3.7" -logind-zbus = { version = "^3.0" } #, default-features = false, features = ["non_blocking"] } +zbus = "^3.5" +logind-zbus = { version = "^3.0.3" } #, default-features = false, features = ["non_blocking"] } serde = "^1.0" serde_derive = "^1.0" diff --git a/daemon-user/Cargo.toml b/daemon-user/Cargo.toml index 1a403087..78e6a3d3 100644 --- a/daemon-user/Cargo.toml +++ b/daemon-user/Cargo.toml @@ -27,6 +27,4 @@ rog_aura = { path = "../rog-aura" } rog_dbus = { path = "../rog-dbus" } rog_platform = { path = "../rog-platform" } -zbus.workspace = true -zvariant.workspace = true -zvariant_derive.workspace = true \ No newline at end of file +zbus.workspace = true \ No newline at end of file diff --git a/daemon-user/src/ctrl_anime.rs b/daemon-user/src/ctrl_anime.rs index 9c233c2c..1bac0495 100644 --- a/daemon-user/src/ctrl_anime.rs +++ b/daemon-user/src/ctrl_anime.rs @@ -11,9 +11,10 @@ use std::{ }, }; use std::{sync::Arc, thread::sleep, time::Instant}; -use zbus::dbus_interface; -use zvariant::ObjectPath; -use zvariant_derive::Type; +use zbus::{ + dbus_interface, + zvariant::{ObjectPath, Type}, +}; use crate::user_config::ConfigLoadSave; use crate::{error::Error, user_config::UserAnimeConfig}; diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index e7568cbe..13532d54 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -32,7 +32,6 @@ log.workspace = true env_logger.workspace = true zbus.workspace = true -zvariant.workspace = true logind-zbus.workspace = true # serialisation diff --git a/daemon/src/ctrl_supported.rs b/daemon/src/ctrl_supported.rs index 993d8271..5a24b733 100644 --- a/daemon/src/ctrl_supported.rs +++ b/daemon/src/ctrl_supported.rs @@ -1,8 +1,6 @@ use async_trait::async_trait; use serde_derive::{Deserialize, Serialize}; -use zbus::dbus_interface; -use zbus::Connection; -use zvariant::Type; +use zbus::{dbus_interface, zvariant::Type, Connection}; use crate::{ ctrl_anime::CtrlAnime, ctrl_aura::controller::CtrlKbdLed, ctrl_platform::CtrlPlatform, diff --git a/daemon/src/lib.rs b/daemon/src/lib.rs index c4a6a804..6766f3c8 100644 --- a/daemon/src/lib.rs +++ b/daemon/src/lib.rs @@ -25,8 +25,7 @@ use crate::error::RogError; use async_trait::async_trait; use log::warn; use logind_zbus::manager::ManagerProxy; -use zbus::{export::futures_util::StreamExt, Connection, SignalContext}; -use zvariant::ObjectPath; +use zbus::{export::futures_util::StreamExt, zvariant::ObjectPath, Connection, SignalContext}; /// This macro adds a function which spawns an `inotify` task on the passed in `Executor`. /// diff --git a/rog-anime/Cargo.toml b/rog-anime/Cargo.toml index 2621612e..f9c456c2 100644 --- a/rog-anime/Cargo.toml +++ b/rog-anime/Cargo.toml @@ -14,7 +14,7 @@ exclude = ["data"] [features] default = ["dbus", "detect"] -dbus = ["zvariant", "zbus"] +dbus = ["zbus"] detect = ["sysfs-class"] [dependencies] @@ -28,7 +28,6 @@ serde_derive.workspace = true glam.workspace = true -zvariant = { workspace = true, optional = true } zbus = { workspace = true, optional = true } sysfs-class = { workspace = true, optional = true } \ No newline at end of file diff --git a/rog-anime/src/data.rs b/rog-anime/src/data.rs index 4f8ecf48..a06df930 100644 --- a/rog-anime/src/data.rs +++ b/rog-anime/src/data.rs @@ -7,7 +7,7 @@ use std::{ use log::info; use serde_derive::{Deserialize, Serialize}; #[cfg(feature = "dbus")] -use zvariant::Type; +use zbus::zvariant::Type; use crate::{ error::{AnimeError, Result}, diff --git a/rog-aura/Cargo.toml b/rog-aura/Cargo.toml index 72a8b1ac..0ac5d6f3 100644 --- a/rog-aura/Cargo.toml +++ b/rog-aura/Cargo.toml @@ -14,13 +14,13 @@ exclude = ["data"] [features] default = ["dbus", "toml"] -dbus = ["zvariant"] +dbus = ["zbus"] [dependencies] serde.workspace = true serde_derive.workspace = true toml = { workspace = true, optional = true } -zvariant = { workspace = true, optional = true } +zbus = { workspace = true, optional = true } [dev-dependencies] serde_json.workspace = true \ No newline at end of file diff --git a/rog-aura/src/builtin_modes.rs b/rog-aura/src/builtin_modes.rs index 22f2da98..9c0e31f0 100644 --- a/rog-aura/src/builtin_modes.rs +++ b/rog-aura/src/builtin_modes.rs @@ -7,7 +7,7 @@ pub const LED_INIT5: [u8; 6] = [0x5e, 0x05, 0x20, 0x31, 0, 0x08]; use serde_derive::{Deserialize, Serialize}; use std::{fmt::Display, str::FromStr}; #[cfg(feature = "dbus")] -use zvariant::Type; +use zbus::zvariant::Type; use crate::{error::Error, LED_MSG_LEN}; diff --git a/rog-aura/src/per_key_rgb.rs b/rog-aura/src/per_key_rgb.rs index 695da59a..7ea76678 100644 --- a/rog-aura/src/per_key_rgb.rs +++ b/rog-aura/src/per_key_rgb.rs @@ -1,7 +1,7 @@ use crate::keys::Key; use serde_derive::{Deserialize, Serialize}; #[cfg(feature = "dbus")] -use zvariant::Type; +use zbus::zvariant::Type; /// Represents the per-key raw USB packets pub type PerKeyRaw = Vec>; diff --git a/rog-aura/src/per_zone.rs b/rog-aura/src/per_zone.rs index 30501595..d3a0a16b 100644 --- a/rog-aura/src/per_zone.rs +++ b/rog-aura/src/per_zone.rs @@ -1,6 +1,6 @@ use serde_derive::{Deserialize, Serialize}; #[cfg(feature = "dbus")] -use zvariant::Type; +use zbus::zvariant::Type; /// Represents the zoned raw USB packets pub type ZonedRaw = Vec; diff --git a/rog-aura/src/usb.rs b/rog-aura/src/usb.rs index 349032f8..87e5f40f 100644 --- a/rog-aura/src/usb.rs +++ b/rog-aura/src/usb.rs @@ -1,7 +1,7 @@ use serde::{Deserialize, Serialize}; use std::ops::{BitAnd, BitOr}; #[cfg(feature = "dbus")] -use zvariant::Type; +use zbus::zvariant::Type; pub const LED_INIT1: [u8; 2] = [0x5d, 0xb9]; pub const LED_INIT2: &str = "]ASUS Tech.Inc."; // ] == 0x5d diff --git a/rog-dbus/Cargo.toml b/rog-dbus/Cargo.toml index 9d13fe69..85618500 100644 --- a/rog-dbus/Cargo.toml +++ b/rog-dbus/Cargo.toml @@ -15,5 +15,3 @@ rog_aura = { path = "../rog-aura" } rog_profiles = { path = "../rog-profiles" } rog_platform = { path = "../rog-platform" } zbus.workspace = true -zbus_macros.workspace = true -zvariant.workspace = true diff --git a/rog-dbus/src/zbus_anime.rs b/rog-dbus/src/zbus_anime.rs index d74690c9..fa129faa 100644 --- a/rog-dbus/src/zbus_anime.rs +++ b/rog-dbus/src/zbus_anime.rs @@ -1,5 +1,5 @@ use rog_anime::{AnimeDataBuffer, AnimePowerStates}; -use zbus_macros::dbus_proxy; +use zbus::dbus_proxy; #[dbus_proxy( interface = "org.asuslinux.Daemon", @@ -7,33 +7,26 @@ use zbus_macros::dbus_proxy; )] trait Anime { /// Set whether the AniMe will show boot, suspend, or off animations - #[inline] fn set_boot_on_off(&self, status: bool) -> zbus::Result<()>; /// Set the global AniMe brightness - #[inline] fn set_brightness(&self, bright: f32) -> zbus::Result<()>; /// Set whether the AniMe is displaying images/data - #[inline] fn set_on_off(&self, status: bool) -> zbus::Result<()>; /// Writes a data stream of length. Will force system thread to exit until it is restarted - #[inline] fn write(&self, input: AnimeDataBuffer) -> zbus::Result<()>; /// Get status of if the AniMe LEDs are on - #[inline] #[dbus_proxy(property)] fn awake_enabled(&self) -> zbus::Result; /// Get the status of if factory system-status animations are enabled - #[inline] #[dbus_proxy(property)] fn boot_enabled(&self) -> zbus::Result; /// Notify listeners of the status of AniMe LED power and factory system-status animations - #[inline] #[dbus_proxy(signal)] fn power_states(&self, data: AnimePowerStates) -> zbus::Result<()>; } diff --git a/rog-dbus/src/zbus_led.rs b/rog-dbus/src/zbus_led.rs index a5f3ab83..0f7b4cf5 100644 --- a/rog-dbus/src/zbus_led.rs +++ b/rog-dbus/src/zbus_led.rs @@ -21,8 +21,8 @@ use std::collections::BTreeMap; +use zbus::dbus_proxy; use zbus::{blocking::Connection, Result}; -use zbus_macros::dbus_proxy; use rog_aura::{usb::AuraPowerDev, AuraEffect, AuraModeNum, LedBrightness, PerKeyRaw}; @@ -34,60 +34,46 @@ const BLOCKING_TIME: u64 = 40; // 100ms = 10 FPS, max 50ms = 20 FPS, 40ms = 25 F )] trait Led { /// NextLedMode method - #[inline] fn next_led_mode(&self) -> zbus::Result<()>; /// PrevLedMode method - #[inline] fn prev_led_mode(&self) -> zbus::Result<()>; /// Toggle to next led brightness - #[inline] fn next_led_brightness(&self) -> zbus::Result<()>; /// Toggle to previous led brightness - #[inline] fn prev_led_brightness(&self) -> zbus::Result<()>; /// SetBrightness method - #[inline] fn set_brightness(&self, brightness: LedBrightness) -> zbus::Result<()>; /// SetLedMode method - #[inline] fn set_led_mode(&self, effect: &AuraEffect) -> zbus::Result<()>; - #[inline] fn set_leds_power(&self, options: AuraPowerDev, enabled: bool) -> zbus::Result<()>; - #[inline] fn per_key_raw(&self, data: PerKeyRaw) -> zbus::fdo::Result<()>; /// NotifyLed signal - #[inline] #[dbus_proxy(signal)] fn notify_led(&self, data: AuraEffect) -> zbus::Result<()>; #[dbus_proxy(signal)] - #[inline] fn notify_power_states(&self, data: AuraPowerDev) -> zbus::Result<()>; /// LedBrightness property - #[inline] #[dbus_proxy(property)] fn led_brightness(&self) -> zbus::Result; /// LedMode property - #[inline] fn led_mode(&self) -> zbus::Result; /// LedModes property - #[inline] fn led_modes(&self) -> zbus::Result>; // As property doesn't work for AuraPowerDev (complexity of serialization?) // #[dbus_proxy(property)] - #[inline] fn leds_enabled(&self) -> zbus::Result; } diff --git a/rog-dbus/src/zbus_platform.rs b/rog-dbus/src/zbus_platform.rs index 907158c8..498a724d 100644 --- a/rog-dbus/src/zbus_platform.rs +++ b/rog-dbus/src/zbus_platform.rs @@ -20,7 +20,7 @@ //! …consequently `zbus-xmlgen` did not generate code for the above interfaces. use rog_platform::platform::GpuMode; -use zbus_macros::dbus_proxy; +use zbus::dbus_proxy; #[dbus_proxy( interface = "org.asuslinux.Daemon", @@ -28,62 +28,48 @@ use zbus_macros::dbus_proxy; )] trait RogBios { /// DgpuDisable method - #[inline] fn dgpu_disable(&self) -> zbus::Result; /// EgpuEnable method - #[inline] fn egpu_enable(&self) -> zbus::Result; /// GpuMuxMode method - #[inline] fn gpu_mux_mode(&self) -> zbus::Result; /// PanelOd method - #[inline] fn panel_od(&self) -> zbus::Result; /// PostBootSound method - #[inline] fn post_boot_sound(&self) -> zbus::Result; /// SetDgpuDisable method - #[inline] fn set_dgpu_disable(&self, disable: bool) -> zbus::Result<()>; /// SetEgpuEnable method - #[inline] fn set_egpu_enable(&self, enable: bool) -> zbus::Result<()>; /// SetGpuMuxMode method - #[inline] fn set_gpu_mux_mode(&self, mode: GpuMode) -> zbus::Result<()>; /// SetPanelOd method - #[inline] fn set_panel_od(&self, overdrive: bool) -> zbus::Result<()>; /// SetPostBootSound method - #[inline] fn set_post_boot_sound(&self, on: bool) -> zbus::Result<()>; /// NotifyDgpuDisable signal - #[inline] #[dbus_proxy(signal)] fn notify_dgpu_disable(&self, disable: bool) -> zbus::Result<()>; /// NotifyEgpuEnable signal - #[inline] #[dbus_proxy(signal)] fn notify_egpu_enable(&self, enable: bool) -> zbus::Result<()>; /// NotifyGpuMuxMode signal - #[inline] #[dbus_proxy(signal)] fn notify_gpu_mux_mode(&self, mode: GpuMode) -> zbus::Result<()>; /// NotifyPanelOd signal - #[inline] #[dbus_proxy(signal)] fn notify_panel_od(&self, overdrive: bool) -> zbus::Result<()>; diff --git a/rog-dbus/src/zbus_power.rs b/rog-dbus/src/zbus_power.rs index 1ab8a31b..55160737 100644 --- a/rog-dbus/src/zbus_power.rs +++ b/rog-dbus/src/zbus_power.rs @@ -19,7 +19,7 @@ //! //! …consequently `zbus-xmlgen` did not generate code for the above interfaces. -use zbus_macros::dbus_proxy; +use zbus::dbus_proxy; #[dbus_proxy( interface = "org.asuslinux.Daemon", @@ -27,24 +27,19 @@ use zbus_macros::dbus_proxy; )] trait Power { /// charge_control_end_threshold method - #[inline] fn charge_control_end_threshold(&self) -> zbus::Result; /// MainsOnline method - #[inline] fn mains_online(&self) -> zbus::Result; /// set_charge_control_end_threshold method - #[inline] fn set_charge_control_end_threshold(&self, limit: u8) -> zbus::Result<()>; /// NotifyCharge signal - #[inline] #[dbus_proxy(signal)] fn notify_charge_control_end_threshold(&self, limit: u8) -> zbus::Result; /// NotifyMainsOnline signal - #[inline] #[dbus_proxy(signal)] fn notify_mains_online(&self, on: bool) -> zbus::Result<()>; } diff --git a/rog-dbus/src/zbus_profile.rs b/rog-dbus/src/zbus_profile.rs index 8435f4e1..2f340c08 100644 --- a/rog-dbus/src/zbus_profile.rs +++ b/rog-dbus/src/zbus_profile.rs @@ -23,7 +23,7 @@ use rog_profiles::{ fan_curve_set::{CurveData, FanCurveSet}, Profile, }; -use zbus_macros::dbus_proxy; +use zbus::dbus_proxy; #[dbus_proxy( interface = "org.asuslinux.Daemon", @@ -31,55 +31,44 @@ use zbus_macros::dbus_proxy; )] trait Profile { /// Get the fan-curve data for the currently active Profile - #[inline] fn fan_curve_data(&self, profile: Profile) -> zbus::Result; /// Fetch the active profile name - #[inline] fn active_profile(&self) -> zbus::Result; /// Get a list of profiles that have fan-curves enabled. - #[inline] fn enabled_fan_profiles(&self) -> zbus::Result>; /// Toggle to next platform_profile. Names provided by `Profiles`. /// If fan-curves are supported will also activate a fan curve for profile. - #[inline] fn next_profile(&self) -> zbus::Result<()>; /// Fetch profile names - #[inline] fn profiles(&self) -> zbus::Result>; /// Set this platform_profile name as active - #[inline] fn set_active_profile(&self, profile: Profile) -> zbus::Result<()>; /// Set a profile fan curve enabled status. Will also activate a fan curve. - #[inline] fn set_fan_curve_enabled(&self, profile: Profile, enabled: bool) -> zbus::Result<()>; /// Set the fan curve for the specified profile, or the profile the user is /// currently in if profile == None. Will also activate the fan curve. - #[inline] fn set_fan_curve(&self, profile: Profile, curve: CurveData) -> zbus::Result<()>; /// Reset the stored (self) and device curve to the defaults of the platform. /// /// Each platform_profile has a different default and the defualt can be read /// only for the currently active profile. - #[inline] fn set_active_curve_to_defaults(&self) -> zbus::Result<()>; /// Reset the stored (self) and device curve to the defaults of the platform. /// /// Each platform_profile has a different default and the defualt can be read /// only for the currently active profile. - #[inline] fn reset_profile_curves(&self, profile: Profile) -> zbus::fdo::Result<()>; /// NotifyProfile signal - #[inline] #[dbus_proxy(signal)] async fn notify_profile(&self, profile: Profile) -> zbus::Result; } diff --git a/rog-dbus/src/zbus_supported.rs b/rog-dbus/src/zbus_supported.rs index bbbdeb5c..649e5f5d 100644 --- a/rog-dbus/src/zbus_supported.rs +++ b/rog-dbus/src/zbus_supported.rs @@ -20,7 +20,7 @@ //! …consequently `zbus-xmlgen` did not generate code for the above interfaces. use rog_platform::supported::SupportedFunctions; -use zbus_macros::dbus_proxy; +use zbus::dbus_proxy; #[dbus_proxy( interface = "org.asuslinux.Daemon", @@ -28,6 +28,5 @@ use zbus_macros::dbus_proxy; )] trait Supported { /// SupportedFunctions method - #[inline] fn supported_functions(&self) -> zbus::Result; } diff --git a/rog-platform/Cargo.toml b/rog-platform/Cargo.toml index 8a32b694..272245b3 100644 --- a/rog-platform/Cargo.toml +++ b/rog-platform/Cargo.toml @@ -8,8 +8,7 @@ log.workspace = true rog_aura = { path = "../rog-aura" } serde.workspace = true serde_derive.workspace = true -zvariant.workspace = true -zvariant_derive.workspace = true +zbus.workspace = true sysfs-class.workspace = true concat-idents.workspace = true udev.workspace = true diff --git a/rog-platform/src/platform.rs b/rog-platform/src/platform.rs index 96aa44bf..d86e38dd 100644 --- a/rog-platform/src/platform.rs +++ b/rog-platform/src/platform.rs @@ -2,7 +2,7 @@ use std::{fmt::Display, path::PathBuf, str::FromStr}; use log::{info, warn}; use serde::{Deserialize, Serialize}; -use zvariant::Type; +use zbus::zvariant::Type; use crate::{ attr_bool, attr_u8, diff --git a/rog-platform/src/supported.rs b/rog-platform/src/supported.rs index eee45d62..4c46e9ad 100644 --- a/rog-platform/src/supported.rs +++ b/rog-platform/src/supported.rs @@ -1,7 +1,7 @@ use rog_aura::{usb::AuraDevice, AuraModeNum, AuraZone}; use serde_derive::{Deserialize, Serialize}; use std::fmt; -use zvariant_derive::Type; +use zbus::zvariant::Type; #[derive(Serialize, Deserialize, Type, Debug, Default, Clone)] pub struct SupportedFunctions { diff --git a/rog-profiles/Cargo.toml b/rog-profiles/Cargo.toml index 78627933..d303137f 100644 --- a/rog-profiles/Cargo.toml +++ b/rog-profiles/Cargo.toml @@ -6,12 +6,11 @@ edition = "2021" [features] default = ["dbus"] -dbus = ["zvariant", "zvariant_derive"] +dbus = ["zbus"] [dependencies] udev.workspace = true serde.workspace = true serde_derive.workspace = true -zvariant = { workspace = true, optional = true } -zvariant_derive = { workspace = true, optional = true } \ No newline at end of file +zbus = { workspace = true, optional = true } \ No newline at end of file diff --git a/rog-profiles/src/fan_curve_set.rs b/rog-profiles/src/fan_curve_set.rs index d3eb923e..eea11a02 100644 --- a/rog-profiles/src/fan_curve_set.rs +++ b/rog-profiles/src/fan_curve_set.rs @@ -2,7 +2,7 @@ use serde_derive::{Deserialize, Serialize}; use udev::Device; #[cfg(feature = "dbus")] -use zvariant_derive::Type; +use zbus::zvariant::Type; use crate::{error::ProfileError, FanCurvePU}; diff --git a/rog-profiles/src/lib.rs b/rog-profiles/src/lib.rs index 376e4649..a5ed51b6 100644 --- a/rog-profiles/src/lib.rs +++ b/rog-profiles/src/lib.rs @@ -14,7 +14,7 @@ use serde_derive::{Deserialize, Serialize}; use udev::Device; #[cfg(feature = "dbus")] -use zvariant_derive::Type; +use zbus::zvariant::Type; pub const PLATFORM_PROFILE: &str = "/sys/firmware/acpi/platform_profile"; pub const PLATFORM_PROFILES: &str = "/sys/firmware/acpi/platform_profile_choices";