From 81645d07773a82ca0804e80acec1a94541920b8f Mon Sep 17 00:00:00 2001 From: Luke Date: Sat, 9 Jan 2021 13:42:46 +1300 Subject: [PATCH] Update deps and fmt --- Cargo.lock | 501 +++++++++++++++++++++++-------- asus-nb-ctrl/Cargo.toml | 6 +- asus-nb-ctrl/src/ctrl_anime.rs | 22 +- asus-nb-ctrl/src/ctrl_charge.rs | 2 +- asus-nb-ctrl/src/ctrl_fan_cpu.rs | 2 +- asus-nb-ctrl/src/ctrl_leds.rs | 9 +- asus-nb-ctrl/src/lib.rs | 2 +- asus-nb-ctrl/src/main.rs | 7 +- asus-nb/src/anime_dbus.rs | 30 +- asus-nb/src/cli_options.rs | 21 +- asus-nb/src/core_dbus.rs | 6 +- asus-nb/src/dbus_anime.rs | 13 +- asus-nb/src/dbus_charge.rs | 15 +- asus-nb/src/dbus_gfx.rs | 21 +- asus-nb/src/dbus_ledmode.rs | 19 +- asus-nb/src/dbus_profile.rs | 19 +- asus-nb/src/lib.rs | 4 +- asus-notify/Cargo.toml | 8 +- asus-notify/src/main.rs | 8 +- ctrl-gfx/Cargo.toml | 4 +- ctrl-gfx/src/lib.rs | 1 - 21 files changed, 477 insertions(+), 243 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 05ee93b5..c8937047 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,9 +8,9 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aho-corasick" -version = "0.7.13" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" dependencies = [ "memchr", ] @@ -23,9 +23,9 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "asus-nb" @@ -80,6 +80,26 @@ dependencies = [ "serde_json", ] +[[package]] +name = "async-io" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd" +dependencies = [ + "concurrent-queue", + "fastrand", + "futures-lite", + "libc", + "log", + "nb-connect", + "once_cell", + "parking", + "polling", + "vec-arena", + "waker-fn", + "winapi", +] + [[package]] name = "atty" version = "0.2.14" @@ -99,9 +119,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "base64" -version = "0.12.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bitflags" @@ -117,9 +137,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "blake2b_simd" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" +checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" dependencies = [ "arrayref", "arrayvec", @@ -134,15 +154,21 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "byteorder" -version = "1.3.4" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" +checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" + +[[package]] +name = "cache-padded" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" [[package]] name = "cc" -version = "1.0.60" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c" +checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" [[package]] name = "cfg-if" @@ -151,10 +177,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] -name = "chrono" -version = "0.4.18" +name = "cfg-if" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d021fddb7bd3e734370acfa4a83f34095571d8570c039f1420d77540f68d5772" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ "libc", "num-integer", @@ -163,6 +195,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "concurrent-queue" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" +dependencies = [ + "cache-padded", +] + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -171,21 +212,21 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "crc32fast" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] name = "crossbeam-utils" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 1.0.0", "lazy_static", ] @@ -211,13 +252,13 @@ dependencies = [ [[package]] name = "derivative" -version = "2.1.1" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f" +checksum = "eaed5874effa6cde088c644ddcdcb4ffd1511391c5be4fdd7a5ccd02c7e4a183" dependencies = [ "proc-macro2", - "quote 1.0.7", - "syn 1.0.42", + "quote 1.0.8", + "syn 1.0.58", ] [[package]] @@ -248,8 +289,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ "proc-macro2", - "quote 1.0.7", - "syn 1.0.42", + "quote 1.0.8", + "syn 1.0.58", ] [[package]] @@ -273,37 +314,150 @@ checksum = "22deed3a8124cff5fa835713fa105621e43bbdc46690c3a6b68328a012d350d4" dependencies = [ "proc-macro-error", "proc-macro2", - "quote 1.0.7", + "quote 1.0.8", "rustversion", - "syn 1.0.42", + "syn 1.0.58", "synstructure", ] [[package]] name = "fastrand" -version = "1.3.5" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c85295147490b8fcf2ea3d104080a105a8b2c63f9c319e82c02d8e952388919" +checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3" +dependencies = [ + "instant", +] [[package]] name = "filetime" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e" +checksum = "0c122a393ea57648015bf06fbd3d372378992e86b9ff5a7a497b076a28c79efe" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "redox_syscall", "winapi", ] [[package]] -name = "getrandom" -version = "0.1.15" +name = "futures" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" +checksum = "c70be434c505aee38639abccb918163b63158a4b4bb791b45b7023044bdc3c9c" dependencies = [ - "cfg-if", + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f01c61843314e95f96cc9245702248733a3a3d744e43e2e755e3c7af8348a0a9" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8d3b0917ff63a2a96173133c02818fac4a746b0a57569d3baca9ec0e945e08" + +[[package]] +name = "futures-executor" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee9ca2f7eb4475772cf39dd1cd06208dce2670ad38f4d9c7262b3e15f127068" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e37c1a51b037b80922864b8eed90692c5cd8abd4c71ce49b77146caa47f3253b" + +[[package]] +name = "futures-lite" +version = "1.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-macro" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f8719ca0e1f3c5e34f3efe4570ef2c0610ca6da85ae7990d472e9cbfba13664" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote 1.0.8", + "syn 1.0.58", +] + +[[package]] +name = "futures-sink" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6adabac1290109cfa089f79192fb6244ad2c3f1cc2281f3e1dd987592b71feb" + +[[package]] +name = "futures-task" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92a0843a2ff66823a8f7c77bffe9a09be2b64e533562c412d63075643ec0038" +dependencies = [ + "once_cell", +] + +[[package]] +name = "futures-util" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "036a2107cdeb57f6d7322f1b6c363dad67cd63ca3b7d1b925bdf75bd5d96cda9" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "proc-macro-hack", + "proc-macro-nested", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] @@ -324,15 +478,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915ef07c710d84733522461de2a734d4d62a3fd39a4d4f404c2f385ef8618d05" dependencies = [ "proc-macro2", - "quote 1.0.7", - "syn 1.0.42", + "quote 1.0.8", + "syn 1.0.58", ] [[package]] name = "hermit-abi" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c30f6d0bc6b00693347368a67d41b58f2fb851215ff1da49e90fe2c5c667151" +checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" dependencies = [ "libc", ] @@ -346,6 +500,15 @@ dependencies = [ "quick-error", ] +[[package]] +name = "instant" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +dependencies = [ + "cfg-if 1.0.0", +] + [[package]] name = "intel-pstate" version = "0.2.1" @@ -358,9 +521,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "lazy_static" @@ -370,9 +533,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.77" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235" +checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929" [[package]] name = "libdbus-sys" @@ -385,9 +548,9 @@ dependencies = [ [[package]] name = "libflate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9bac9023e1db29c084f9f8cd9d3852e5e8fddf98fb47c4964a0ea4663d95949" +checksum = "389de7875e06476365974da3e7ff85d55f1972188ccd9f6020dd7c8156e17914" dependencies = [ "adler32", "crc32fast", @@ -413,9 +576,9 @@ dependencies = [ [[package]] name = "libusb1-sys" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f02e930161703cc97c0aab3a905feb9740db03a80910f31ab0f8fa309223f39" +checksum = "be241693102a24766d0b8526c8988771edac2842630d7e730f8e9fbc014f3703" dependencies = [ "cc", "libc", @@ -431,7 +594,7 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -457,9 +620,19 @@ dependencies = [ [[package]] name = "memchr" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" + +[[package]] +name = "nb-connect" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998" +dependencies = [ + "libc", + "winapi", +] [[package]] name = "nix" @@ -469,7 +642,7 @@ checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" dependencies = [ "bitflags 1.2.1", "cc", - "cfg-if", + "cfg-if 0.1.10", "libc", "void", ] @@ -486,20 +659,23 @@ dependencies = [ [[package]] name = "notify-rust" -version = "4.0.0" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "144acee6a0543dc74893e4b8a33936b5b0a94cc2d4ab024afd0c6daff7afc3c0" +checksum = "95a3a5dd7b4b415b112ce0fae1988f3e6dee90a96918bf3950b5f2289b19a04b" dependencies = [ - "dbus", "mac-notification-sys", + "serde", "winrt-notification", + "zbus", + "zvariant", + "zvariant_derive", ] [[package]] name = "num-integer" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ "autocfg", "num-traits", @@ -507,9 +683,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ "autocfg", ] @@ -551,15 +727,46 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.4.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" +checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" + +[[package]] +name = "parking" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" + +[[package]] +name = "pin-project-lite" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36743d754ccdf9954c2e352ce2d4b106e024c814f6499c2dadff80da9a442d8" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" + +[[package]] +name = "polling" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "log", + "wepoll-sys", + "winapi", +] [[package]] name = "proc-macro-crate" @@ -567,7 +774,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" dependencies = [ - "toml 0.5.6", + "toml 0.5.8", ] [[package]] @@ -578,8 +785,8 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2", - "quote 1.0.7", - "syn 1.0.42", + "quote 1.0.8", + "syn 1.0.58", "version_check", ] @@ -590,15 +797,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", - "quote 1.0.7", + "quote 1.0.8", "version_check", ] [[package]] -name = "proc-macro2" -version = "1.0.23" +name = "proc-macro-hack" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ef7cd2518ead700af67bf9d1a658d90b6037d77110fd9c0445429d0ba1c6c9" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro-nested" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" + +[[package]] +name = "proc-macro2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" dependencies = [ "unicode-xid 0.2.1", ] @@ -617,9 +836,9 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" [[package]] name = "quote" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" dependencies = [ "proc-macro2", ] @@ -643,9 +862,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.3.9" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a" dependencies = [ "aho-corasick", "memchr", @@ -655,9 +874,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.18" +version = "0.6.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" +checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" [[package]] name = "rle-decode-fast" @@ -667,18 +886,18 @@ checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac" [[package]] name = "rog_fan_curve" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da77fe4a6ad41da874d83eca6a32075a5b8f6ad4778682bc1308075e7ef856a9" +checksum = "c71cfe91a717104796aeefea4e98ce5cefb11f2bb5dd10bba865dd4ae86273cb" dependencies = [ "serde", ] [[package]] name = "rusb" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fa037368ee577fca9ef237c5ec129084c18e7e3e5987cc611fb8b2d78cf84a" +checksum = "f6f32cd45962594f9f8cd4547b5757132715600e2c8840aa9ccd3d1a9ed6fdc6" dependencies = [ "libc", "libusb1-sys", @@ -686,9 +905,9 @@ dependencies = [ [[package]] name = "rust-argon2" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19" +checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" dependencies = [ "base64", "blake2b_simd", @@ -698,14 +917,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9bdc5e856e51e685846fb6c13a1f5e5432946c2c90501bdc76a1319f19e29da" -dependencies = [ - "proc-macro2", - "quote 1.0.7", - "syn 1.0.42", -] +checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" [[package]] name = "ryu" @@ -721,29 +935,29 @@ checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" [[package]] name = "serde" -version = "1.0.116" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5" +checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.116" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8" +checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" dependencies = [ "proc-macro2", - "quote 1.0.7", - "syn 1.0.42", + "quote 1.0.8", + "syn 1.0.58", ] [[package]] name = "serde_json" -version = "1.0.57" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" +checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a" dependencies = [ "itoa", "ryu", @@ -757,10 +971,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76" dependencies = [ "proc-macro2", - "quote 1.0.7", - "syn 1.0.42", + "quote 1.0.8", + "syn 1.0.58", ] +[[package]] +name = "slab" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" + [[package]] name = "smart-default" version = "0.6.0" @@ -768,8 +988,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" dependencies = [ "proc-macro2", - "quote 1.0.7", - "syn 1.0.42", + "quote 1.0.8", + "syn 1.0.58", ] [[package]] @@ -801,12 +1021,12 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.42" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c51d92969d209b54a98397e1b91c8ae82d8c87a7bb87df0b29aa2ad81454228" +checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5" dependencies = [ "proc-macro2", - "quote 1.0.7", + "quote 1.0.8", "unicode-xid 0.2.1", ] @@ -826,8 +1046,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ "proc-macro2", - "quote 1.0.7", - "syn 1.0.42", + "quote 1.0.8", + "syn 1.0.58", "unicode-xid 0.2.1", ] @@ -854,18 +1074,18 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" dependencies = [ "winapi-util", ] [[package]] name = "thread_local" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447" dependencies = [ "lazy_static", ] @@ -901,9 +1121,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ "serde", ] @@ -932,9 +1152,15 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" [[package]] name = "vcpkg" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" +checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" + +[[package]] +name = "vec-arena" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d" [[package]] name = "version_check" @@ -948,6 +1174,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + [[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" @@ -960,6 +1192,15 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wepoll-sys" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff" +dependencies = [ + "cc", +] + [[package]] name = "winapi" version = "0.3.9" @@ -1042,16 +1283,20 @@ dependencies = [ [[package]] name = "zbus" -version = "1.2.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3d015ea4cb76e7f951e429086995126807372f80c9a2a29bf00fcfd31a50b0" +checksum = "40b4d4aa39daed4e32aed75f0c37b969184949a0fdfd5f2e1277abfda61f02a8" dependencies = [ + "async-io", "byteorder", "derivative", "enumflags2", "fastrand", + "futures", + "nb-connect", "nix", "once_cell", + "polling", "scoped-tls", "serde", "serde_repr", @@ -1061,21 +1306,21 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "1.2.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54567d486c1ece9268173866c227ac1e168aa5cdf983ae9d13aaf45767fdf679" +checksum = "87cc141cda72384bef359badf1808e391d3968f9299e8f3c3cbb78dafa1e0930" dependencies = [ "proc-macro-crate", "proc-macro2", - "quote 1.0.7", - "syn 1.0.42", + "quote 1.0.8", + "syn 1.0.58", ] [[package]] name = "zvariant" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb79b31a454101beda19e64082dfd9ad59c5ff8afa41e1de1065333105b02740" +checksum = "4bfdc513511335faee7b18d6e8b6086de555d6e8b0a598415571bb0f0b446519" dependencies = [ "byteorder", "enumflags2", @@ -1085,12 +1330,12 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "605bf414a59d93a3d55055e72ea066c5c0bc578ed2227df15c407207b1c780ef" +checksum = "6651d08772eefc17d36ef4da3a521b2e5f87c10ef730125b83eb500512073c92" dependencies = [ "proc-macro-crate", "proc-macro2", - "quote 1.0.7", - "syn 1.0.42", + "quote 1.0.8", + "syn 1.0.58", ] diff --git a/asus-nb-ctrl/Cargo.toml b/asus-nb-ctrl/Cargo.toml index e1993217..7c197f5c 100644 --- a/asus-nb-ctrl/Cargo.toml +++ b/asus-nb-ctrl/Cargo.toml @@ -32,10 +32,8 @@ gumdrop = "^0.8.0" log = "^0.4.8" env_logger = "^0.7.1" -# async -zbus = "1.2.0" -zvariant = "2.2.0" -#tokio = { version = "^0.2.4", features = ["rt-threaded", "sync"] } +zbus = "^1.8.0" +zvariant = "^2.4.0" # serialisation serde = "^1.0" diff --git a/asus-nb-ctrl/src/ctrl_anime.rs b/asus-nb-ctrl/src/ctrl_anime.rs index f9c520d2..e0cbb55e 100644 --- a/asus-nb-ctrl/src/ctrl_anime.rs +++ b/asus-nb-ctrl/src/ctrl_anime.rs @@ -11,7 +11,7 @@ const APPLY: u8 = 0xc4; // Used to turn the panel on and off // The next byte can be 0x03 for "on" and 0x00 for "off" -const ON_OFF : u8 = 0x04; +const ON_OFF: u8 = 0x04; use asus_nb::error::AuraError; use log::{error, info, warn}; @@ -60,14 +60,12 @@ impl crate::ZbusAdd for CtrlAnimeDisplay { #[dbus_interface(name = "org.asuslinux.Daemon")] impl Dbus for CtrlAnimeDisplay { fn set_anime(&mut self, input: Vec>) { - self.do_command(AnimatrixCommand::WriteImage(input)) - .map_or_else(|err| warn!("{}", err), - |()| info!("Writing image to Anime")); + .map_or_else(|err| warn!("{}", err), |()| info!("Writing image to Anime")); } fn set_on_off(&mut self, status: bool) { - let mut flush : Vec = vec![0; PACKET_SIZE]; + let mut flush: Vec = vec![0; PACKET_SIZE]; flush[0] = DEV_PAGE; flush[1] = WRITE; flush[2] = ON_OFF; @@ -81,9 +79,10 @@ impl Dbus for CtrlAnimeDisplay { status_str = "off"; } - self.do_command(AnimatrixCommand::Write(flush)) - .map_or_else(|err| warn!("{}", err), - |()| info!("Turning {} the AniMe", status_str)); + self.do_command(AnimatrixCommand::Write(flush)).map_or_else( + |err| warn!("{}", err), + |()| info!("Turning {} the AniMe", status_str), + ); } fn set_boot_on_off(&mut self, status: bool) { @@ -91,9 +90,10 @@ impl Dbus for CtrlAnimeDisplay { self.do_command(AnimatrixCommand::SetBoot(status)) .and_then(|()| self.do_command(AnimatrixCommand::Apply)) - .map_or_else(|err| warn!("{}", err), - |()| info!("Turning {} the AniMe at boot/shutdown", - status_str)); + .map_or_else( + |err| warn!("{}", err), + |()| info!("Turning {} the AniMe at boot/shutdown", status_str), + ); } } diff --git a/asus-nb-ctrl/src/ctrl_charge.rs b/asus-nb-ctrl/src/ctrl_charge.rs index c2e565ea..f5239626 100644 --- a/asus-nb-ctrl/src/ctrl_charge.rs +++ b/asus-nb-ctrl/src/ctrl_charge.rs @@ -43,7 +43,7 @@ impl CtrlCharge { } #[dbus_interface(signal)] - pub fn notify_charge(&self, limit: u8) -> zbus::Result<()>; + fn notify_charge(&self, limit: u8) -> zbus::Result<()>; } impl crate::ZbusAdd for CtrlCharge { diff --git a/asus-nb-ctrl/src/ctrl_fan_cpu.rs b/asus-nb-ctrl/src/ctrl_fan_cpu.rs index efbeca19..03d30386 100644 --- a/asus-nb-ctrl/src/ctrl_fan_cpu.rs +++ b/asus-nb-ctrl/src/ctrl_fan_cpu.rs @@ -55,7 +55,7 @@ impl DbusFanAndCpu { if let Some(profile) = cfg.power_profiles.get(&cfg.active_profile) { if let Ok(json) = serde_json::to_string(profile) { self.notify_profile(&json) - .unwrap_or_else(|err| warn!("{}", err)); + .unwrap_or_else(|err| warn!("{}", err)); } } } diff --git a/asus-nb-ctrl/src/ctrl_leds.rs b/asus-nb-ctrl/src/ctrl_leds.rs index d4d5d309..9390e8ab 100644 --- a/asus-nb-ctrl/src/ctrl_leds.rs +++ b/asus-nb-ctrl/src/ctrl_leds.rs @@ -76,12 +76,12 @@ impl DbusKbdBacklight { if let Ok(mut ctrl) = self.inner.try_lock() { if let Ok(mut cfg) = ctrl.config.clone().try_lock() { ctrl.toggle_mode(false, &mut cfg) - .unwrap_or_else(|err| warn!("{}", err)); + .unwrap_or_else(|err| warn!("{}", err)); if let Some(mode) = cfg.get_led_mode_data(cfg.kbd_backlight_mode) { if let Ok(json) = serde_json::to_string(&mode) { self.notify_led(&json) - .unwrap_or_else(|err| warn!("{}", err)); + .unwrap_or_else(|err| warn!("{}", err)); } } } @@ -92,12 +92,12 @@ impl DbusKbdBacklight { if let Ok(mut ctrl) = self.inner.try_lock() { if let Ok(mut cfg) = ctrl.config.clone().try_lock() { ctrl.toggle_mode(true, &mut cfg) - .unwrap_or_else(|err| warn!("{}", err)); + .unwrap_or_else(|err| warn!("{}", err)); if let Some(mode) = cfg.get_led_mode_data(cfg.kbd_backlight_mode) { if let Ok(json) = serde_json::to_string(&mode) { self.notify_led(&json) - .unwrap_or_else(|err| warn!("{}", err)); + .unwrap_or_else(|err| warn!("{}", err)); } } } @@ -418,7 +418,6 @@ impl CtrlKbdBacklight { fn toggle_mode(&mut self, reverse: bool, config: &mut Config) -> Result<(), RogError> { let current = config.kbd_backlight_mode; if let Some(idx) = self.supported_modes.iter().position(|v| *v == current) { - let mut idx = idx; // goes past end of array if reverse { diff --git a/asus-nb-ctrl/src/lib.rs b/asus-nb-ctrl/src/lib.rs index 6c7fb395..651c32a0 100644 --- a/asus-nb-ctrl/src/lib.rs +++ b/asus-nb-ctrl/src/lib.rs @@ -15,8 +15,8 @@ pub mod laptops; mod error; -use config::Config; use crate::error::RogError; +use config::Config; use zbus::ObjectServer; pub static VERSION: &str = env!("CARGO_PKG_VERSION"); diff --git a/asus-nb-ctrl/src/main.rs b/asus-nb-ctrl/src/main.rs index dbee00d6..b5bb0c1f 100644 --- a/asus-nb-ctrl/src/main.rs +++ b/asus-nb-ctrl/src/main.rs @@ -1,11 +1,6 @@ use asus_nb::{ anime_dbus::AniMeDbusWriter, - cli_options::{ - AniMeActions, - AniMeStatusValue, - LedBrightness, - SetAuraBuiltin, - }, + cli_options::{AniMeActions, AniMeStatusValue, LedBrightness, SetAuraBuiltin}, core_dbus::AuraDbusClient, profile::{ProfileCommand, ProfileEvent}, }; diff --git a/asus-nb/src/anime_dbus.rs b/asus-nb/src/anime_dbus.rs index 1358c2f5..66eb2975 100644 --- a/asus-nb/src/anime_dbus.rs +++ b/asus-nb/src/anime_dbus.rs @@ -1,8 +1,6 @@ -const DBUS_ANIME_PATH : &str = "/org/asuslinux/Anime"; -pub const ANIME_PANE1_PREFIX: [u8; 7] = - [0x5e, 0xc0, 0x02, 0x01, 0x00, 0x73, 0x02]; -pub const ANIME_PANE2_PREFIX: [u8; 7] = - [0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02]; +const DBUS_ANIME_PATH: &str = "/org/asuslinux/Anime"; +pub const ANIME_PANE1_PREFIX: [u8; 7] = [0x5e, 0xc0, 0x02, 0x01, 0x00, 0x73, 0x02]; +pub const ANIME_PANE2_PREFIX: [u8; 7] = [0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02]; use crate::anime_matrix::{AniMeMatrix, AniMePacketType}; use crate::DBUS_NAME; @@ -10,9 +8,7 @@ use dbus::blocking::{Connection, Proxy}; use std::error::Error; use std::{thread, time::Duration}; -use crate::dbus_anime::{ - OrgAsuslinuxDaemon as OrgAsuslinuxDaemonAniMe, -}; +use crate::dbus_anime::OrgAsuslinuxDaemon as OrgAsuslinuxDaemonAniMe; /// Interface for the AniMe dot-matrix display /// @@ -38,12 +34,9 @@ impl AniMeDbusWriter { } // Create D-Bus proxy - fn new_proxy(&self) -> Proxy<&Connection>{ - self.connection.with_proxy( - DBUS_NAME, - DBUS_ANIME_PATH, - Duration::from_millis(200), - ) + fn new_proxy(&self) -> Proxy<&Connection> { + self.connection + .with_proxy(DBUS_NAME, DBUS_ANIME_PATH, Duration::from_millis(200)) } fn thread_sleep(&self) { @@ -70,8 +63,7 @@ impl AniMeDbusWriter { /// /// Where led brightness is 0..255, low to high #[inline] - pub fn write_image(&self, image: &mut AniMePacketType) - -> Result<(), Box> { + pub fn write_image(&self, image: &mut AniMePacketType) -> Result<(), Box> { let proxy = self.new_proxy(); image[0][..7].copy_from_slice(&ANIME_PANE1_PREFIX); @@ -84,8 +76,7 @@ impl AniMeDbusWriter { } #[inline] - pub fn set_leds_brightness(&self, led_brightness: u8) - -> Result<(), Box> { + pub fn set_leds_brightness(&self, led_brightness: u8) -> Result<(), Box> { let mut anime_matrix = AniMeMatrix::new(); anime_matrix.fill_with(led_brightness); @@ -105,8 +96,7 @@ impl AniMeDbusWriter { } #[inline] - pub fn turn_boot_on_off(&self, status: bool) - -> Result<(), Box> { + pub fn turn_boot_on_off(&self, status: bool) -> Result<(), Box> { let proxy = self.new_proxy(); proxy.set_boot_on_off(status)?; diff --git a/asus-nb/src/cli_options.rs b/asus-nb/src/cli_options.rs index 9b7a4fdd..04dfcd3f 100644 --- a/asus-nb/src/cli_options.rs +++ b/asus-nb/src/cli_options.rs @@ -27,9 +27,10 @@ impl FromStr for LedBrightness { "med" => Ok(LedBrightness { level: Some(0x02) }), "high" => Ok(LedBrightness { level: Some(0x03) }), _ => { - print!("{}\n{}\n", - "Invalid argument, must be one of:", - "off, low, med, high"); + print!( + "{}\n{}\n", + "Invalid argument, must be one of:", "off, low, med, high" + ); Err(AuraError::ParseBrightness) } } @@ -245,9 +246,7 @@ impl FromStr for AniMeStatusValue { "on" => Ok(AniMeStatusValue::On), "off" => Ok(AniMeStatusValue::Off), _ => { - print!("{}\n{}\n", - "Invalid argument, must be one of:", - "on, off"); + print!("{}\n{}\n", "Invalid argument, must be one of:", "on, off"); Err(AuraError::ParseAnime) } } @@ -266,9 +265,13 @@ impl From for bool { pub struct AniMeLeds { #[options(help = "print help message")] help: bool, - #[options(no_long, required, - short = "b", meta = "BYTE", - help = "set all leds brightness value")] + #[options( + no_long, + required, + short = "b", + meta = "BYTE", + help = "set all leds brightness value" + )] led_brightness: u8, } impl AniMeLeds { diff --git a/asus-nb/src/core_dbus.rs b/asus-nb/src/core_dbus.rs index 723a08db..a00d2946 100644 --- a/asus-nb/src/core_dbus.rs +++ b/asus-nb/src/core_dbus.rs @@ -1,5 +1,5 @@ -use crate::cli_options::LedBrightness; use super::*; +use crate::cli_options::LedBrightness; use crate::fancy::KeyColourArray; use crate::profile::ProfileEvent; use ctrl_gfx::vendors::GfxVendors; @@ -11,7 +11,9 @@ use std::sync::{ }; use std::{thread, time::Duration}; -use crate::dbus_charge::{OrgAsuslinuxDaemonNotifyCharge, OrgAsuslinuxDaemon as OrgAsuslinuxDaemonCharge}; +use crate::dbus_charge::{ + OrgAsuslinuxDaemon as OrgAsuslinuxDaemonCharge, OrgAsuslinuxDaemonNotifyCharge, +}; use crate::dbus_gfx::{ OrgAsuslinuxDaemon as OrgAsuslinuxDaemonGfx, OrgAsuslinuxDaemonNotifyAction, OrgAsuslinuxDaemonNotifyGfx, diff --git a/asus-nb/src/dbus_anime.rs b/asus-nb/src/dbus_anime.rs index 0c200d48..75b1993d 100644 --- a/asus-nb/src/dbus_anime.rs +++ b/asus-nb/src/dbus_anime.rs @@ -1,5 +1,5 @@ // This code was autogenerated with `dbus-codegen-rust -s -d org.asuslinux.Daemon -p /org/asuslinux/Anime -m None -f org.asuslinux.Daemon -c blocking`, see https://github.com/diwic/dbus-rs -use dbus as dbus; +use dbus; #[allow(unused_imports)] use dbus::arg; use dbus::blocking; @@ -10,17 +10,18 @@ pub trait OrgAsuslinuxDaemon { fn set_boot_on_off(&self, status: bool) -> Result<(), dbus::Error>; } -impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref> OrgAsuslinuxDaemon for blocking::Proxy<'a, C> { - +impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref> OrgAsuslinuxDaemon + for blocking::Proxy<'a, C> +{ fn set_anime(&self, input: Vec>) -> Result<(), dbus::Error> { - self.method_call("org.asuslinux.Daemon", "SetAnime", (input, )) + self.method_call("org.asuslinux.Daemon", "SetAnime", (input,)) } fn set_on_off(&self, status: bool) -> Result<(), dbus::Error> { - self.method_call("org.asuslinux.Daemon", "SetOnOff", (status, )) + self.method_call("org.asuslinux.Daemon", "SetOnOff", (status,)) } fn set_boot_on_off(&self, status: bool) -> Result<(), dbus::Error> { - self.method_call("org.asuslinux.Daemon", "SetBootOnOff", (status, )) + self.method_call("org.asuslinux.Daemon", "SetBootOnOff", (status,)) } } diff --git a/asus-nb/src/dbus_charge.rs b/asus-nb/src/dbus_charge.rs index aa56c8ed..ee275353 100644 --- a/asus-nb/src/dbus_charge.rs +++ b/asus-nb/src/dbus_charge.rs @@ -1,5 +1,5 @@ // This code was autogenerated with `dbus-codegen-rust -s -d org.asuslinux.Daemon -f org.asuslinux.Daemon -c blocking -p /org/asuslinux/Charge -m None`, see https://github.com/diwic/dbus-rs -use dbus as dbus; +use dbus; #[allow(unused_imports)] use dbus::arg; use dbus::blocking; @@ -9,15 +9,16 @@ pub trait OrgAsuslinuxDaemon { fn limit(&self) -> Result; } -impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref> OrgAsuslinuxDaemon for blocking::Proxy<'a, C> { - +impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref> OrgAsuslinuxDaemon + for blocking::Proxy<'a, C> +{ fn set_limit(&self, limit: u8) -> Result<(), dbus::Error> { - self.method_call("org.asuslinux.Daemon", "SetLimit", (limit, )) + self.method_call("org.asuslinux.Daemon", "SetLimit", (limit,)) } fn limit(&self) -> Result { self.method_call("org.asuslinux.Daemon", "Limit", ()) - .and_then(|r: (i16, )| Ok(r.0, )) + .and_then(|r: (i16,)| Ok(r.0)) } } @@ -34,9 +35,7 @@ impl arg::AppendAll for OrgAsuslinuxDaemonNotifyCharge { impl arg::ReadAll for OrgAsuslinuxDaemonNotifyCharge { fn read(i: &mut arg::Iter) -> Result { - Ok(OrgAsuslinuxDaemonNotifyCharge { - limit: i.read()?, - }) + Ok(OrgAsuslinuxDaemonNotifyCharge { limit: i.read()? }) } } diff --git a/asus-nb/src/dbus_gfx.rs b/asus-nb/src/dbus_gfx.rs index ef74da62..2d66f971 100644 --- a/asus-nb/src/dbus_gfx.rs +++ b/asus-nb/src/dbus_gfx.rs @@ -1,5 +1,5 @@ // This code was autogenerated with `dbus-codegen-rust -s -d org.asuslinux.Daemon -p /org/asuslinux/Gfx -m None -f org.asuslinux.Daemon -c blocking`, see https://github.com/diwic/dbus-rs -use dbus as dbus; +use dbus; #[allow(unused_imports)] use dbus::arg; use dbus::blocking; @@ -10,20 +10,21 @@ pub trait OrgAsuslinuxDaemon { fn set_vendor(&self, vendor: &str) -> Result<(), dbus::Error>; } -impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref> OrgAsuslinuxDaemon for blocking::Proxy<'a, C> { - +impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref> OrgAsuslinuxDaemon + for blocking::Proxy<'a, C> +{ fn vendor(&self) -> Result { self.method_call("org.asuslinux.Daemon", "Vendor", ()) - .and_then(|r: (String, )| Ok(r.0, )) + .and_then(|r: (String,)| Ok(r.0)) } fn power(&self) -> Result { self.method_call("org.asuslinux.Daemon", "Power", ()) - .and_then(|r: (String, )| Ok(r.0, )) + .and_then(|r: (String,)| Ok(r.0)) } fn set_vendor(&self, vendor: &str) -> Result<(), dbus::Error> { - self.method_call("org.asuslinux.Daemon", "SetVendor", (vendor, )) + self.method_call("org.asuslinux.Daemon", "SetVendor", (vendor,)) } } @@ -40,9 +41,7 @@ impl arg::AppendAll for OrgAsuslinuxDaemonNotifyGfx { impl arg::ReadAll for OrgAsuslinuxDaemonNotifyGfx { fn read(i: &mut arg::Iter) -> Result { - Ok(OrgAsuslinuxDaemonNotifyGfx { - vendor: i.read()?, - }) + Ok(OrgAsuslinuxDaemonNotifyGfx { vendor: i.read()? }) } } @@ -64,9 +63,7 @@ impl arg::AppendAll for OrgAsuslinuxDaemonNotifyAction { impl arg::ReadAll for OrgAsuslinuxDaemonNotifyAction { fn read(i: &mut arg::Iter) -> Result { - Ok(OrgAsuslinuxDaemonNotifyAction { - action: i.read()?, - }) + Ok(OrgAsuslinuxDaemonNotifyAction { action: i.read()? }) } } diff --git a/asus-nb/src/dbus_ledmode.rs b/asus-nb/src/dbus_ledmode.rs index 6005131f..24ca38b5 100644 --- a/asus-nb/src/dbus_ledmode.rs +++ b/asus-nb/src/dbus_ledmode.rs @@ -1,5 +1,5 @@ // This code was autogenerated with `dbus-codegen-rust -s -d org.asuslinux.Daemon -f org.asuslinux.Daemon -c blocking -p /org/asuslinux/Led -m None`, see https://github.com/diwic/dbus-rs -use dbus as dbus; +use dbus; #[allow(unused_imports)] use dbus::arg; use dbus::blocking; @@ -13,10 +13,11 @@ pub trait OrgAsuslinuxDaemon { fn led_brightness(&self) -> Result; } -impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref> OrgAsuslinuxDaemon for blocking::Proxy<'a, C> { - +impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref> OrgAsuslinuxDaemon + for blocking::Proxy<'a, C> +{ fn set_led_mode(&self, data: &str) -> Result<(), dbus::Error> { - self.method_call("org.asuslinux.Daemon", "SetLedMode", (data, )) + self.method_call("org.asuslinux.Daemon", "SetLedMode", (data,)) } fn next_led_mode(&self) -> Result<(), dbus::Error> { @@ -29,17 +30,17 @@ impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref> OrgAsuslin fn led_mode(&self) -> Result { self.method_call("org.asuslinux.Daemon", "LedMode", ()) - .and_then(|r: (String, )| Ok(r.0, )) + .and_then(|r: (String,)| Ok(r.0)) } fn led_modes(&self) -> Result { self.method_call("org.asuslinux.Daemon", "LedModes", ()) - .and_then(|r: (String, )| Ok(r.0, )) + .and_then(|r: (String,)| Ok(r.0)) } fn led_brightness(&self) -> Result { self.method_call("org.asuslinux.Daemon", "LedBrightness", ()) - .and_then(|r: (i16, )| Ok(r.0, )) + .and_then(|r: (i16,)| Ok(r.0)) } } @@ -56,9 +57,7 @@ impl arg::AppendAll for OrgAsuslinuxDaemonNotifyLed { impl arg::ReadAll for OrgAsuslinuxDaemonNotifyLed { fn read(i: &mut arg::Iter) -> Result { - Ok(OrgAsuslinuxDaemonNotifyLed { - data: i.read()?, - }) + Ok(OrgAsuslinuxDaemonNotifyLed { data: i.read()? }) } } diff --git a/asus-nb/src/dbus_profile.rs b/asus-nb/src/dbus_profile.rs index de7d2f5e..dd3ca0e6 100644 --- a/asus-nb/src/dbus_profile.rs +++ b/asus-nb/src/dbus_profile.rs @@ -1,5 +1,5 @@ // This code was autogenerated with `dbus-codegen-rust -s -d org.asuslinux.Daemon -p /org/asuslinux/Profile -m None -f org.asuslinux.Daemon -c blocking`, see https://github.com/diwic/dbus-rs -use dbus as dbus; +use dbus; #[allow(unused_imports)] use dbus::arg; use dbus::blocking; @@ -12,10 +12,11 @@ pub trait OrgAsuslinuxDaemon { fn profiles(&self) -> Result; } -impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref> OrgAsuslinuxDaemon for blocking::Proxy<'a, C> { - +impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref> OrgAsuslinuxDaemon + for blocking::Proxy<'a, C> +{ fn set_profile(&self, profile: &str) -> Result<(), dbus::Error> { - self.method_call("org.asuslinux.Daemon", "SetProfile", (profile, )) + self.method_call("org.asuslinux.Daemon", "SetProfile", (profile,)) } fn next_profile(&self) -> Result<(), dbus::Error> { @@ -24,17 +25,17 @@ impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref> OrgAsuslin fn active_profile_name(&self) -> Result { self.method_call("org.asuslinux.Daemon", "ActiveProfileName", ()) - .and_then(|r: (String, )| Ok(r.0, )) + .and_then(|r: (String,)| Ok(r.0)) } fn profile(&self) -> Result { self.method_call("org.asuslinux.Daemon", "Profile", ()) - .and_then(|r: (String, )| Ok(r.0, )) + .and_then(|r: (String,)| Ok(r.0)) } fn profiles(&self) -> Result { self.method_call("org.asuslinux.Daemon", "Profiles", ()) - .and_then(|r: (String, )| Ok(r.0, )) + .and_then(|r: (String,)| Ok(r.0)) } } @@ -51,9 +52,7 @@ impl arg::AppendAll for OrgAsuslinuxDaemonNotifyProfile { impl arg::ReadAll for OrgAsuslinuxDaemonNotifyProfile { fn read(i: &mut arg::Iter) -> Result { - Ok(OrgAsuslinuxDaemonNotifyProfile { - profile: i.read()?, - }) + Ok(OrgAsuslinuxDaemonNotifyProfile { profile: i.read()? }) } } diff --git a/asus-nb/src/lib.rs b/asus-nb/src/lib.rs index 90bd27c4..4bf4adf8 100644 --- a/asus-nb/src/lib.rs +++ b/asus-nb/src/lib.rs @@ -23,11 +23,11 @@ pub mod anime_dbus; /// Helper functions for the AniMe display pub mod anime_matrix; +pub mod dbus_anime; +pub mod dbus_charge; pub mod dbus_gfx; pub mod dbus_ledmode; pub mod dbus_profile; -pub mod dbus_charge; -pub mod dbus_anime; pub mod error; diff --git a/asus-notify/Cargo.toml b/asus-notify/Cargo.toml index e61ae457..f715cdc8 100644 --- a/asus-notify/Cargo.toml +++ b/asus-notify/Cargo.toml @@ -11,7 +11,11 @@ edition = "2018" serde = "^1.0" serde_derive = "^1.0" serde_json = "^1.0" -notify-rust = "^4.0.0" dbus = { version = "^0.8" } asus-nb = { path = "../asus-nb" } -asus-nb-ctrl = { path = "../asus-nb-ctrl" } \ No newline at end of file +asus-nb-ctrl = { path = "../asus-nb-ctrl" } + +[dependencies.notify-rust] +version = "^4.0.0" +default-features = false +features = ["z"] \ No newline at end of file diff --git a/asus-notify/src/main.rs b/asus-notify/src/main.rs index 4bb63771..32b91bbd 100644 --- a/asus-notify/src/main.rs +++ b/asus-notify/src/main.rs @@ -7,7 +7,7 @@ use std::time::Duration; fn main() -> Result<(), Box> { println!("Version {}", env!("CARGO_PKG_VERSION")); - + let mut cfg = Config::read_new()?; let mut last_profile = String::new(); @@ -83,7 +83,11 @@ fn do_thermal_notif(profile: &Profile, label: &str) -> Result