Skip to content

Commit 3a56d49

Browse files
committed
library: upgrade to hashbrown v0.16.1
1 parent 7281a3b commit 3a56d49

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

library/Cargo.lock

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,12 @@ dependencies = [
8888
"windows-sys",
8989
]
9090

91+
[[package]]
92+
name = "foldhash"
93+
version = "0.2.0"
94+
source = "registry+https://github.com/rust-lang/crates.io-index"
95+
checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
96+
9197
[[package]]
9298
name = "fortanix-sgx-abi"
9399
version = "0.6.1"
@@ -119,10 +125,11 @@ dependencies = [
119125

120126
[[package]]
121127
name = "hashbrown"
122-
version = "0.15.5"
128+
version = "0.16.1"
123129
source = "registry+https://github.com/rust-lang/crates.io-index"
124-
checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
130+
checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
125131
dependencies = [
132+
"foldhash",
126133
"rustc-std-workspace-alloc",
127134
"rustc-std-workspace-core",
128135
]

library/std/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
2020
panic_abort = { path = "../panic_abort" }
2121
core = { path = "../core", public = true }
2222
unwind = { path = "../unwind" }
23-
hashbrown = { version = "0.15", default-features = false, features = [
23+
hashbrown = { version = "0.16.1", default-features = false, features = [
2424
'rustc-dep-of-std',
2525
] }
2626
std_detect = { path = "../std_detect", public = true }

library/std/src/collections/hash/map.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@ where
10511051
K: Borrow<Q>,
10521052
Q: Hash + Eq,
10531053
{
1054-
self.base.get_many_mut(ks)
1054+
self.base.get_disjoint_mut(ks)
10551055
}
10561056

10571057
/// Attempts to get mutable references to `N` values in the map at once, without validating that
@@ -1118,7 +1118,7 @@ where
11181118
K: Borrow<Q>,
11191119
Q: Hash + Eq,
11201120
{
1121-
unsafe { self.base.get_many_unchecked_mut(ks) }
1121+
unsafe { self.base.get_disjoint_unchecked_mut(ks) }
11221122
}
11231123

11241124
/// Returns `true` if the map contains a value for the specified key.

src/tools/tidy/src/deps.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ const LICENSES: &[&str] = &[
4242
"MIT/Apache-2.0",
4343
"Unlicense OR MIT",
4444
"Unlicense/MIT",
45+
"Zlib", // foldhash (FIXME: see PERMITTED_STDLIB_DEPENDENCIES)
4546
// tidy-alphabetical-end
4647
];
4748

@@ -509,6 +510,7 @@ const PERMITTED_STDLIB_DEPENDENCIES: &[&str] = &[
509510
"cfg-if",
510511
"compiler_builtins",
511512
"dlmalloc",
513+
"foldhash", // FIXME: only appears in Cargo.lock due to https://github.com/rust-lang/cargo/issues/10801
512514
"fortanix-sgx-abi",
513515
"getopts",
514516
"gimli",

0 commit comments

Comments
 (0)