Skip to content

Commit 0953e85

Browse files
committed
Downgrade some deps to get rif of windows-sys duplication
1 parent 8823db6 commit 0953e85

File tree

4 files changed

+34
-57
lines changed

4 files changed

+34
-57
lines changed

Cargo.lock

Lines changed: 25 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/profile/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ countme = { version = "3.0.1", features = ["enable"] }
2020
jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl", optional = true }
2121

2222
[target.'cfg(target_os = "linux")'.dependencies]
23-
perf-event = "=0.4.8"
23+
perf-event = "=0.4.7"
2424

2525
[target.'cfg(windows)'.dependencies]
2626
winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] }

crates/rust-analyzer/Cargo.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ triomphe.workspace = true
4747
nohash-hasher.workspace = true
4848
always-assert = "0.1.2"
4949

50+
# These 3 deps are not used by r-a directly, but we list them here to lock in their versions
51+
# in our transitive deps to prevent them from pulling in windows-sys 0.45.0
52+
mio = "=0.8.5"
53+
filetime = "=0.2.19"
54+
parking_lot_core = "=0.9.6"
55+
5056
cfg.workspace = true
5157
flycheck.workspace = true
5258
hir-def.workspace = true

crates/vfs-notify/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ doctest = false
1515
tracing = "0.1.35"
1616
walkdir = "2.3.2"
1717
crossbeam-channel = "0.5.5"
18-
notify = "6.0.1"
18+
# We demand 5.1.0 as any higher version pulls in a new windows-sys dupe
19+
notify = "=5.1.0"
1920

2021
stdx.workspace = true
2122
vfs.workspace = true

0 commit comments

Comments
 (0)