diff --git a/Cargo.lock b/Cargo.lock index f658a1cb..85f050ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -285,7 +285,7 @@ dependencies = [ "objc2-core-foundation", "objc2-core-graphics", "objc2-foundation 0.3.2", - "parking_lot", + "parking_lot 0.12.5", "percent-encoding", "windows-sys 0.61.2", "x11rb", @@ -1354,7 +1354,7 @@ dependencies = [ "objc2 0.5.3", "objc2-app-kit 0.2.2", "objc2-foundation 0.2.2", - "parking_lot", + "parking_lot 0.12.5", "percent-encoding", "profiling", "raw-window-handle", @@ -1500,7 +1500,7 @@ dependencies = [ "epaint_default_fonts", "log", "nohash-hasher", - "parking_lot", + "parking_lot 0.12.5", "profiling", ] @@ -1611,9 +1611,9 @@ checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48" [[package]] name = "fixedbitset" -version = "0.4.2" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" [[package]] name = "flate2" @@ -2506,7 +2506,7 @@ dependencies = [ "komorebi-themes", "lazy_static", "nanoid", - "parking_lot", + "parking_lot 0.13.0", "pastey", "regex", "schemars 1.2.3", @@ -2529,7 +2529,7 @@ version = "0.1.0" dependencies = [ "komorebi", "komorebi-themes", - "parking_lot", + "parking_lot 0.13.0", "serde_json_lenient", ] @@ -2730,6 +2730,15 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lock_api" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65d91b22da179613dcf4d6ec8349563f52a363f6849e03b00dd0a185ec4a59af" +dependencies = [ + "scopeguard", +] + [[package]] name = "log" version = "0.4.34" @@ -2932,11 +2941,11 @@ dependencies = [ [[package]] name = "nanoid" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8" +checksum = "8628de41fe064cc3f0cf07f3d299ee3e73521adaff72278731d5c8cae3797873" dependencies = [ - "rand 0.8.8", + "rand 0.9.5", ] [[package]] @@ -3025,7 +3034,7 @@ dependencies = [ "crossbeam-channel", "file-id", "notify", - "parking_lot", + "parking_lot 0.12.5", "walkdir", ] @@ -3536,8 +3545,18 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ - "lock_api", - "parking_lot_core", + "lock_api 0.4.14", + "parking_lot_core 0.9.12", +] + +[[package]] +name = "parking_lot" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9cf937ca4e1d0b7578784559063422fc39ae7c5a00f02471f2614d5486fd226" +dependencies = [ + "lock_api 0.5.0", + "parking_lot_core 0.10.0", ] [[package]] @@ -3546,15 +3565,27 @@ version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ - "backtrace", "cfg-if", "libc", - "petgraph", "redox_syscall 0.5.18", "smallvec", "windows-link 0.2.1", ] +[[package]] +name = "parking_lot_core" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cfff060068cc18aa7815010fcaf80c68c7fb9e85fc7f5c0f9bf142c21d19826" +dependencies = [ + "backtrace", + "libc", + "petgraph", + "redox_syscall 0.9.5", + "smallvec", + "windows-link 0.2.1", +] + [[package]] name = "paste" version = "1.0.15" @@ -3575,12 +3606,14 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "petgraph" -version = "0.6.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455" dependencies = [ "fixedbitset", + "hashbrown 0.15.5", "indexmap 2.14.2", + "serde", ] [[package]] @@ -3829,10 +3862,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c" dependencies = [ "libc", - "rand_chacha", + "rand_chacha 0.3.1", "rand_core 0.6.4", ] +[[package]] +name = "rand" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.5", +] + [[package]] name = "rand" version = "0.10.3" @@ -3854,6 +3897,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.5", +] + [[package]] name = "rand_core" version = "0.6.4" @@ -3863,6 +3916,15 @@ dependencies = [ "getrandom 0.2.17", ] +[[package]] +name = "rand_core" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" +dependencies = [ + "getrandom 0.3.4", +] + [[package]] name = "rand_core" version = "0.10.1" @@ -5368,7 +5430,7 @@ dependencies = [ "js-sys", "log", "naga", - "parking_lot", + "parking_lot 0.12.5", "portable-atomic", "profiling", "raw-window-handle", @@ -5400,7 +5462,7 @@ dependencies = [ "log", "naga", "once_cell", - "parking_lot", + "parking_lot 0.12.5", "portable-atomic", "profiling", "raw-window-handle", @@ -5474,7 +5536,7 @@ dependencies = [ "objc", "once_cell", "ordered-float", - "parking_lot", + "parking_lot 0.12.5", "portable-atomic", "portable-atomic-util", "profiling", diff --git a/komorebi-client/Cargo.toml b/komorebi-client/Cargo.toml index 0fd64e3e..3c1a8911 100644 --- a/komorebi-client/Cargo.toml +++ b/komorebi-client/Cargo.toml @@ -10,7 +10,7 @@ komorebi-themes = { workspace = true } serde_json = { workspace = true } [dev-dependencies] -parking_lot = "0.12" +parking_lot = "0.13" [features] default = ["schemars"] diff --git a/komorebi-client/tests/subscribe.rs b/komorebi-client/tests/subscribe.rs index d47e27f4..7c97376b 100644 --- a/komorebi-client/tests/subscribe.rs +++ b/komorebi-client/tests/subscribe.rs @@ -69,7 +69,7 @@ impl Daemon { /// Starts the window manager once, and waits for the other tests to be done with it fn daemon() -> (parking_lot::MutexGuard<'static, ()>, &'static Daemon) { - static TURN: Mutex<()> = parking_lot::const_mutex(()); + static TURN: Mutex<()> = Mutex::new(()); static DAEMON: OnceLock = OnceLock::new(); let turn = TURN.lock(); diff --git a/komorebi/Cargo.toml b/komorebi/Cargo.toml index b7eb9f75..7364bb17 100644 --- a/komorebi/Cargo.toml +++ b/komorebi/Cargo.toml @@ -18,8 +18,8 @@ ctrlc = { version = "3", features = ["termination"] } dirs = { workspace = true } hotwatch = { workspace = true } lazy_static = { workspace = true } -nanoid = "0.4" -parking_lot = "0.12" +nanoid = "0.5" +parking_lot = "0.13" pastey = { workspace = true } regex = "1" schemars = { workspace = true, optional = true }