Skip to content

Commit

Permalink
chore(cargo): isolate parking_lot features
Browse files Browse the repository at this point in the history
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`
  • Loading branch information
edraze authored and LGUG2Z committed May 30, 2024
1 parent 2703744 commit cc60f55
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions komorebi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"]

0 comments on commit cc60f55

Please sign in to comment.