From c12afe5521962dd86ef4eb6254c744d4b3ac420e Mon Sep 17 00:00:00 2001 From: LGUG2Z Date: Wed, 8 Jan 2025 21:37:17 -0800 Subject: [PATCH] chore(deps): cargo update --- Cargo.lock | 113 ++++++++++++++++++------------------ Cargo.toml | 4 +- komorebi-bar/Cargo.toml | 2 +- komorebi-bar/src/network.rs | 2 +- komorebi-bar/src/storage.rs | 2 +- komorebi/Cargo.toml | 2 +- komorebi/build.rs | 4 +- komorebi/src/main.rs | 2 +- komorebic/build.rs | 4 +- komorebic/src/main.rs | 6 +- 10 files changed, 73 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8dd5ebec..e07fcee2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -464,9 +464,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.84" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", @@ -861,9 +861,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.23" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +checksum = "9560b07a799281c7e0958b9296854d6fafd4c5f31444a7e5bb1ad6dde5ccf1bd" dependencies = [ "clap_builder", "clap_derive", @@ -871,9 +871,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.23" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +checksum = "874e0dd3eb68bf99058751ac9712f622e61e6f393a94f7128fa26e3f02f5c7cd" dependencies = [ "anstream", "anstyle", @@ -884,9 +884,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.18" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c" dependencies = [ "heck", "proc-macro2", @@ -988,9 +988,9 @@ dependencies = [ [[package]] name = "const_fn" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373e9fafaa20882876db20562275ff58d50e0caa2590077fe7ce7bef90211d0d" +checksum = "2f8a2ca5ac02d09563609681103aada9e1777d54fc57a5acd7a41404f9c93b6e" [[package]] name = "const_format" @@ -1548,9 +1548,9 @@ checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" [[package]] name = "event-listener" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" dependencies = [ "concurrent-queue", "parking", @@ -2746,7 +2746,7 @@ dependencies = [ "serde_yaml", "shadow-rs", "sysinfo", - "thiserror 2.0.9", + "thiserror 2.0.10", "uds_windows", "which", "win32-display-data", @@ -2846,9 +2846,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.20" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +checksum = "df9b68e50e6e0b26f672573834882eb57759f6db9b3be2ea3c35c91188bb4eaa" dependencies = [ "cc", "libc", @@ -2858,9 +2858,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "litemap" @@ -3178,9 +3178,9 @@ dependencies = [ [[package]] name = "netdev" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f901362e84cd407be6f8cd9d3a46bccf09136b095792785401ea7d283c79b91d" +checksum = "3ba3caeaefe9a005afb16f8a78b52426d65324adba1666e310db9ef8c03265ac" dependencies = [ "dlopen2", "ipnet", @@ -3190,7 +3190,7 @@ dependencies = [ "netlink-sys", "once_cell", "system-configuration", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3206,14 +3206,15 @@ dependencies = [ [[package]] name = "netlink-packet-route" -version = "0.17.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66" +checksum = "483325d4bfef65699214858f097d504eb812c38ce7077d165f301ec406c3066e" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags 2.6.0", "byteorder", "libc", + "log", "netlink-packet-core", "netlink-packet-utils", ] @@ -3751,9 +3752,9 @@ dependencies = [ [[package]] name = "os_info" -version = "3.9.1" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb6651f4be5e39563c4fe5cc8326349eb99a25d805a3493f791d5bfd0269e430" +checksum = "6e6520c8cc998c5741ee68ec1dc369fc47e5f0ea5320018ecf2a1ccd6328f48b" dependencies = [ "log", "serde", @@ -3843,18 +3844,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" +checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" +checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" dependencies = [ "proc-macro2", "quote", @@ -3863,9 +3864,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -4342,9 +4343,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ "bitflags 2.6.0", "errno", @@ -4486,9 +4487,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -4527,9 +4528,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", "memchr", @@ -4637,9 +4638,9 @@ dependencies = [ [[package]] name = "shadow-rs" -version = "0.35.2" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b2328fb3ec0d5302f95915e7e77cfc2ff943714d9970bc4b66e9eacf318687" +checksum = "974eb8222c62a8588bc0f02794dd1ba5b60b3ec88b58e050729d0907ed6af610" dependencies = [ "const_format", "git2", @@ -4874,9 +4875,9 @@ checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" [[package]] name = "syn" -version = "2.0.94" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", @@ -4905,9 +4906,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.31.4" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" +checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01" dependencies = [ "core-foundation-sys", "libc", @@ -5011,11 +5012,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +checksum = "a3ac7f54ca534db81081ef1c1e7f6ea8a3ef428d2fc069097c079443d24124d3" dependencies = [ - "thiserror-impl 2.0.9", + "thiserror-impl 2.0.10", ] [[package]] @@ -5031,9 +5032,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +checksum = "9e9465d30713b56a37ede7185763c3492a91be2f5fa68d958c44e41ab9248beb" dependencies = [ "proc-macro2", "quote", @@ -5141,9 +5142,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -6282,9 +6283,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.30.7" +version = "0.30.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba50bc8ef4b6f1a75c9274fb95aa9a8f63fbc66c56f391bd85cf68d51e7b1a3" +checksum = "f5d74280aabb958072864bff6cfbcf9025cf8bfacdde5e32b5e12920ef703b0f" dependencies = [ "ahash", "android-activity", @@ -6352,9 +6353,9 @@ dependencies = [ [[package]] name = "winreg" -version = "0.52.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +checksum = "89a47b489f8fc5b949477e89dca4d1617f162c6c53fbcbefde553ab17b342ff9" dependencies = [ "cfg-if 1.0.0", "windows-sys 0.48.0", @@ -6447,9 +6448,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.24" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea8b391c9a790b496184c29f7f93b9ed5b16abb306c05415b68bcc16e4d06432" +checksum = "c5b940ebc25896e71dd073bad2dbaa2abfe97b0a391415e22ad1326d9c54e3c4" [[package]] name = "yoke" diff --git a/Cargo.toml b/Cargo.toml index b61d42e6..4efdcff4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,13 +31,13 @@ tracing = "0.1" tracing-appender = "0.2" tracing-subscriber = { version = "0.3", features = ["env-filter"] } paste = "1" -sysinfo = "0.31" +sysinfo = "0.33" uds_windows = "1" win32-display-data = { git = "https://github.com/LGUG2Z/win32-display-data", rev = "dd65e3f22d0521b78fcddde11abc2a3e9dcc32a8" } windows-implement = { version = "0.58" } windows-interface = { version = "0.58" } windows-core = { version = "0.58" } -shadow-rs = "0.35" +shadow-rs = "0.37" which = "7" [workspace.dependencies.windows] diff --git a/komorebi-bar/Cargo.toml b/komorebi-bar/Cargo.toml index a02dc586..850183fc 100644 --- a/komorebi-bar/Cargo.toml +++ b/komorebi-bar/Cargo.toml @@ -20,7 +20,7 @@ egui-phosphor = "0.8" font-loader = "0.11" hotwatch = { workspace = true } image = "0.25" -netdev = "0.31" +netdev = "0.32" num = "0.4" num-derive = "0.4" num-traits = "0.2" diff --git a/komorebi-bar/src/network.rs b/komorebi-bar/src/network.rs index c996d969..aa8ec0ea 100644 --- a/komorebi-bar/src/network.rs +++ b/komorebi-bar/src/network.rs @@ -100,7 +100,7 @@ impl Network { if let Some(friendly_name) = &interface.friendly_name { self.default_interface.clone_from(friendly_name); - self.networks_network_activity.refresh(); + self.networks_network_activity.refresh(true); for (interface_name, data) in &self.networks_network_activity { if friendly_name.eq(interface_name) { diff --git a/komorebi-bar/src/storage.rs b/komorebi-bar/src/storage.rs index 126da0ca..805c34c5 100644 --- a/komorebi-bar/src/storage.rs +++ b/komorebi-bar/src/storage.rs @@ -50,7 +50,7 @@ impl Storage { fn output(&mut self) -> Vec { let now = Instant::now(); if now.duration_since(self.last_updated) > Duration::from_secs(self.data_refresh_interval) { - self.disks.refresh(); + self.disks.refresh(true); self.last_updated = now; } diff --git a/komorebi/Cargo.toml b/komorebi/Cargo.toml index 79650c06..1cf64f40 100644 --- a/komorebi/Cargo.toml +++ b/komorebi/Cargo.toml @@ -47,7 +47,7 @@ windows-core = { workspace = true } windows-implement = { workspace = true } windows-interface = { workspace = true } winput = "0.2" -winreg = "0.52" +winreg = "0.53" [build-dependencies] shadow-rs = { workspace = true } diff --git a/komorebi/build.rs b/komorebi/build.rs index 09098eca..44fad00f 100644 --- a/komorebi/build.rs +++ b/komorebi/build.rs @@ -1,3 +1,5 @@ +use shadow_rs::ShadowBuilder; + fn main() { - shadow_rs::new().unwrap(); + ShadowBuilder::builder().build().unwrap(); } diff --git a/komorebi/src/main.rs b/komorebi/src/main.rs index 20af3242..6e4d9ec7 100644 --- a/komorebi/src/main.rs +++ b/komorebi/src/main.rs @@ -177,7 +177,7 @@ fn main() -> Result<()> { SESSION_ID.store(session_id, Ordering::SeqCst); let mut system = sysinfo::System::new_all(); - system.refresh_processes(ProcessesToUpdate::All); + system.refresh_processes(ProcessesToUpdate::All, true); let matched_procs: Vec<&Process> = system.processes_by_name("komorebi.exe".as_ref()).collect(); diff --git a/komorebic/build.rs b/komorebic/build.rs index a3a21440..7e67434c 100644 --- a/komorebic/build.rs +++ b/komorebic/build.rs @@ -1,3 +1,5 @@ +use shadow_rs::ShadowBuilder; + fn main() { if std::fs::metadata("applications.json").is_err() { let applications_json = reqwest::blocking::get( @@ -6,5 +8,5 @@ fn main() { std::fs::write("applications.json", applications_json).unwrap(); } - shadow_rs::new().unwrap(); + ShadowBuilder::builder().build().unwrap(); } diff --git a/komorebic/src/main.rs b/komorebic/src/main.rs index dcc641ef..ca8b647f 100644 --- a/komorebic/src/main.rs +++ b/komorebic/src/main.rs @@ -2100,7 +2100,7 @@ fn main() -> Result<()> { }; let mut system = sysinfo::System::new_all(); - system.refresh_processes(ProcessesToUpdate::All); + system.refresh_processes(ProcessesToUpdate::All, true); let mut attempts = 0; let mut running = system @@ -2121,7 +2121,7 @@ fn main() -> Result<()> { print!("Waiting for komorebi.exe to start..."); std::thread::sleep(Duration::from_secs(3)); - system.refresh_processes(ProcessesToUpdate::All); + system.refresh_processes(ProcessesToUpdate::All, true); if system .processes_by_name("komorebi.exe".as_ref()) @@ -2399,7 +2399,7 @@ if (Get-Command Get-CimInstance -ErrorAction SilentlyContinue) { send_message(&SocketMessage::Stop)?; } let mut system = sysinfo::System::new_all(); - system.refresh_processes(ProcessesToUpdate::All); + system.refresh_processes(ProcessesToUpdate::All, true); if system.processes_by_name("komorebi.exe".as_ref()).count() >= 1 { println!("komorebi is still running, attempting to force-quit");