Skip to content

Commit 07d3128

Browse files
committed
Auto merge of rust-lang#16043 - Veykril:dep-bump, r=Veykril
Bump and unlock some dependencies
2 parents c4f0da9 + 5544f4f commit 07d3128

File tree

6 files changed

+33
-55
lines changed

6 files changed

+33
-55
lines changed

Cargo.lock

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

Cargo.toml

+5-4
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ bitflags = "2.4.1"
9595
cargo_metadata = "0.18.1"
9696
dissimilar = "1.0.7"
9797
either = "1.9.0"
98+
hashbrown = { version = "0.14", features = [
99+
"inline-more",
100+
], default-features = false }
98101
indexmap = "2.1.0"
99102
itertools = "0.12.0"
100103
libc = "0.2.150"
@@ -121,7 +124,5 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features =
121124
triomphe = { version = "0.1.10", default-features = false, features = ["std"] }
122125
xshell = "0.2.5"
123126

124-
# can't upgrade due to dashmap depending on 0.12.3 currently
125-
hashbrown = { version = "0.12.3", features = [
126-
"inline-more",
127-
], default-features = false }
127+
# We need to freeze the version of the crate, as the raw-api feature is considered unstable
128+
dashmap = { version = "=5.5.3", features = ["raw-api"] }

crates/hir-def/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ doctest = false
1515
arrayvec = "0.7.2"
1616
bitflags.workspace = true
1717
cov-mark = "2.0.0-pre.1"
18-
# We need to freeze the version of the crate, as the raw-api feature is considered unstable
19-
dashmap = { version = "=5.4.0", features = ["raw-api"] }
18+
dashmap.workspace = true
2019
drop_bomb = "0.1.5"
2120
either.workspace = true
2221
fst = { version = "0.4.7", default-features = false }

crates/intern/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ doctest = false
1414

1515
[dependencies]
1616
# We need to freeze the version of the crate, as the raw-api feature is considered unstable
17-
dashmap = { version = "=5.4.0", features = ["raw-api"] }
17+
dashmap.workspace = true
1818
hashbrown.workspace = true
1919
rustc-hash = "1.1.0"
2020
triomphe.workspace = true

crates/rust-analyzer/Cargo.toml

-5
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ triomphe.workspace = true
4343
nohash-hasher.workspace = true
4444
always-assert = "0.1.2"
4545

46-
# These 3 deps are not used by r-a directly, but we list them here to lock in their versions
47-
# in our transitive deps to prevent them from pulling in windows-sys 0.45.0
48-
mio = "=0.8.5"
49-
parking_lot_core = "=0.9.6"
50-
5146
cfg.workspace = true
5247
flycheck.workspace = true
5348
hir-def.workspace = true

crates/stdx/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ itertools.workspace = true
2121
# Think twice before adding anything here
2222

2323
[target.'cfg(windows)'.dependencies]
24-
miow = "0.5.0"
24+
miow = "0.6.0"
2525
winapi = { version = "0.3.9", features = ["winerror"] }
2626

2727
[features]

0 commit comments

Comments
 (0)