From cc60f55cecbb58a202b816882dcd4768ee3ba6a3 Mon Sep 17 00:00:00 2001 From: Karat Date: Thu, 30 May 2024 16:10:15 +0300 Subject: [PATCH] chore(cargo): isolate parking_lot features In the case when the `komorebi-client` is used in one project with some dependency that is transitively used crate `parking_lot` with feature `send_guard`, a compilation error occurs because `komorebi-client` transitively importing `parking_lot` with feature `deadlock_detection` and these features are mutually exclusive. This fix suggests enabling `deadlock_detection` feature in `parking_lot` crate only if `deadlock_detection` enabled for `komorebi` crate, by default it is disabled so it will solve issue with `komorebi-client` --- komorebi/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/komorebi/Cargo.toml b/komorebi/Cargo.toml index 3705a55a9..251a374ef 100644 --- a/komorebi/Cargo.toml +++ b/komorebi/Cargo.toml @@ -28,7 +28,7 @@ miow = "0.6" nanoid = "0.4" net2 = "0.2" os_info = "3.8" -parking_lot = { version = "0.12", features = ["deadlock_detection"] } +parking_lot = "0.12" paste = "1" regex = "1" schemars = "0.8" @@ -51,4 +51,4 @@ winreg = "0.52" win32-display-data = { git = "https://github.com/LGUG2Z/win32-display-data", rev = "2a0f7166da154880a1750b91829b1186d9c6a00c" } [features] -deadlock_detection = [] +deadlock_detection = ["parking_lot/deadlock_detection"]