Skip to content

Commit b9a9722

Browse files
committed
Auto merge of #15556 - gigaroby:master, r=lnicola
Update notify to 6.1.1 Unlike version 6.0.1, this does not pull windows-sys 0.45.0 as observed in #15077. ``` $ cargo tree --target=x86_64-pc-windows-gnu --charset=ascii | grep windows-sys | | `-- windows-sys v0.42.0 | | | | | | `-- windows-sys v0.42.0 (*) | `-- windows-sys v0.48.0 | | `-- windows-sys v0.48.0 (*) | `-- windows-sys v0.48.0 (*) | `-- windows-sys v0.48.0 (*) | `-- windows-sys v0.42.0 (*) ```
2 parents caeea45 + 4f22e1a commit b9a9722

File tree

4 files changed

+22
-14
lines changed

4 files changed

+22
-14
lines changed

Cargo.lock

+20-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/rust-analyzer/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ always-assert = "0.1.2"
5050
# These 3 deps are not used by r-a directly, but we list them here to lock in their versions
5151
# in our transitive deps to prevent them from pulling in windows-sys 0.45.0
5252
mio = "=0.8.5"
53-
filetime = "=0.2.19"
5453
parking_lot_core = "=0.9.6"
5554

5655
cfg.workspace = true

crates/rust-analyzer/tests/slow-tests/tidy.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
158158
Apache-2.0/MIT
159159
BSD-3-Clause
160160
BlueOak-1.0.0 OR MIT OR Apache-2.0
161-
CC0-1.0 OR Artistic-2.0
161+
CC0-1.0
162162
ISC
163163
MIT
164164
MIT / Apache-2.0

crates/vfs-notify/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ tracing = "0.1.35"
1616
walkdir = "2.3.2"
1717
crossbeam-channel = "0.5.5"
1818
# We demand 5.1.0 as any higher version pulls in a new windows-sys dupe
19-
notify = "=5.1.0"
19+
notify = "6.1.1"
2020

2121
stdx.workspace = true
2222
vfs.workspace = true

0 commit comments

Comments
 (0)