From 3a56d492decfcb38a1e93a13f5c428aa2550e3a7 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Thu, 20 Nov 2025 11:12:31 -0800
Subject: [PATCH] library: upgrade to hashbrown v0.16.1

---
 library/Cargo.lock                      | 11 +++++++++--
 library/std/Cargo.toml                  |  2 +-
 library/std/src/collections/hash/map.rs |  4 ++--
 src/tools/tidy/src/deps.rs              |  2 ++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/library/Cargo.lock b/library/Cargo.lock
index b062b505cb248..8f60cea459c7d 100644
--- a/library/Cargo.lock
+++ b/library/Cargo.lock
@@ -88,6 +88,12 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "foldhash"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+
 [[package]]
 name = "fortanix-sgx-abi"
 version = "0.6.1"
@@ -119,10 +125,11 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.5"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 dependencies = [
+ "foldhash",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
 ]
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
index 1ba9f7e32d91a..3a673cf23b835 100644
--- a/library/std/Cargo.toml
+++ b/library/std/Cargo.toml
@@ -20,7 +20,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
 panic_abort = { path = "../panic_abort" }
 core = { path = "../core", public = true }
 unwind = { path = "../unwind" }
-hashbrown = { version = "0.15", default-features = false, features = [
+hashbrown = { version = "0.16.1", default-features = false, features = [
     'rustc-dep-of-std',
 ] }
 std_detect = { path = "../std_detect", public = true }
diff --git a/library/std/src/collections/hash/map.rs b/library/std/src/collections/hash/map.rs
index ab21e3b927e20..251d62bd2033a 100644
--- a/library/std/src/collections/hash/map.rs
+++ b/library/std/src/collections/hash/map.rs
@@ -1051,7 +1051,7 @@ where
         K: Borrow<Q>,
         Q: Hash + Eq,
     {
-        self.base.get_many_mut(ks)
+        self.base.get_disjoint_mut(ks)
     }
 
     /// Attempts to get mutable references to `N` values in the map at once, without validating that
@@ -1118,7 +1118,7 @@ where
         K: Borrow<Q>,
         Q: Hash + Eq,
     {
-        unsafe { self.base.get_many_unchecked_mut(ks) }
+        unsafe { self.base.get_disjoint_unchecked_mut(ks) }
     }
 
     /// Returns `true` if the map contains a value for the specified key.
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index 93d38d929c6d0..9b586e158ad68 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -42,6 +42,7 @@ const LICENSES: &[&str] = &[
     "MIT/Apache-2.0",
     "Unlicense OR MIT",
     "Unlicense/MIT",
+    "Zlib",                                                // foldhash (FIXME: see PERMITTED_STDLIB_DEPENDENCIES)
     // tidy-alphabetical-end
 ];
 
@@ -509,6 +510,7 @@ const PERMITTED_STDLIB_DEPENDENCIES: &[&str] = &[
     "cfg-if",
     "compiler_builtins",
     "dlmalloc",
+    "foldhash", // FIXME: only appears in Cargo.lock due to https://github.com/rust-lang/cargo/issues/10801
     "fortanix-sgx-abi",
     "getopts",
     "gimli",