From e2d2d4110be5d15e0bdc1eb81bd84ed7786c3ad8 Mon Sep 17 00:00:00 2001
From: Jacob Lifshay <programmerjake@gmail.com>
Date: Wed, 9 Apr 2025 20:33:21 -0700
Subject: [PATCH] upgrade hashbrown to 0.15.2

---
 Cargo.lock                              | 51 ++++++++-----------------
 Cargo.toml                              |  2 +-
 crates/fayalite/src/util.rs             |  2 +-
 crates/fayalite/src/util/test_hasher.rs |  2 +-
 4 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 23cdc34..611e42e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,18 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "ahash"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
-dependencies = [
- "cfg-if",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
 [[package]]
 name = "allocator-api2"
 version = "0.2.16"
@@ -310,7 +298,7 @@ dependencies = [
  "eyre",
  "fayalite-proc-macros",
  "fayalite-visit-gen",
- "hashbrown",
+ "hashbrown 0.15.2",
  "jobslot",
  "num-bigint",
  "num-traits",
@@ -365,6 +353,12 @@ version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -403,9 +397,16 @@ name = "hashbrown"
 version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 dependencies = [
- "ahash",
  "allocator-api2",
+ "equivalent",
+ "foldhash",
 ]
 
 [[package]]
@@ -436,7 +437,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
- "hashbrown",
+ "hashbrown 0.14.3",
  "serde",
 ]
 
@@ -893,23 +894,3 @@ checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
 dependencies = [
  "tap",
 ]
-
-[[package]]
-name = "zerocopy"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
diff --git a/Cargo.toml b/Cargo.toml
index 54de3a8..8a022c9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ blake3 = { version = "1.5.4", features = ["serde"] }
 clap = { version = "4.5.9", features = ["derive", "env", "string"] }
 ctor = "0.2.8"
 eyre = "0.6.12"
-hashbrown = "0.14.3"
+hashbrown = "0.15.2"
 indexmap = { version = "2.5.0", features = ["serde"] }
 jobslot = "0.2.19"
 num-bigint = "0.4.6"
diff --git a/crates/fayalite/src/util.rs b/crates/fayalite/src/util.rs
index ebc3f6d..233867e 100644
--- a/crates/fayalite/src/util.rs
+++ b/crates/fayalite/src/util.rs
@@ -14,7 +14,7 @@ mod test_hasher;
 #[cfg(feature = "unstable-test-hasher")]
 pub type DefaultBuildHasher = test_hasher::DefaultBuildHasher;
 #[cfg(not(feature = "unstable-test-hasher"))]
-pub(crate) type DefaultBuildHasher = hashbrown::hash_map::DefaultHashBuilder;
+pub(crate) type DefaultBuildHasher = hashbrown::DefaultHashBuilder;
 
 pub(crate) type HashMap<K, V> = hashbrown::HashMap<K, V, DefaultBuildHasher>;
 pub(crate) type HashSet<T> = hashbrown::HashSet<T, DefaultBuildHasher>;
diff --git a/crates/fayalite/src/util/test_hasher.rs b/crates/fayalite/src/util/test_hasher.rs
index 2a0cdd4..20df5b7 100644
--- a/crates/fayalite/src/util/test_hasher.rs
+++ b/crates/fayalite/src/util/test_hasher.rs
@@ -115,7 +115,7 @@ const ENV_VAR_VALUES: &'static [EnvVarValue] = &[
     },
     env_var_value! {
         key: "hashbrown",
-        build_hasher: hashbrown::hash_map::DefaultHashBuilder,
+        build_hasher: hashbrown::DefaultHashBuilder,
         description: "use hashbrown's DefaultHashBuilder",
     },
     env_var_value! {