Backport rust-lang#357 for 0.11

Manishearth · Feb 8, 2024 · 8ffef00 · 8ffef00
1 parent bbb5d3b
commit 8ffef00
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 
 [dependencies]
 # For the default hasher
-ahash = { version = "0.7.0", default-features = false, optional = true }
+ahash = { version = "0.8.0", default-features = false, optional = true }
 
 # For external trait impls
 rayon = { version = "1.0", optional = true }
@@ -38,7 +38,8 @@ doc-comment = "0.3.1"
 [features]
 default = ["ahash", "inline-more"]
 
-ahash-compile-time-rng = ["ahash/compile-time-rng"]
+# Ahash changed behavior here, this feature is now a no-op for backcompat
+ahash-compile-time-rng = []
 nightly = []
 rustc-internal-api = []
 rustc-dep-of-std = [

diff --git a/src/map.rs b/src/map.rs
@@ -14,7 +14,7 @@ use core::ops::Index;
 
 /// Default hasher for `HashMap`.
 #[cfg(feature = "ahash")]
-pub type DefaultHashBuilder = ahash::RandomState;
+pub type DefaultHashBuilder = core::hash::BuildHasherDefault<ahash::AHasher>;
 
 /// Dummy default hasher for `HashMap`.
 #[cfg(not(feature = "ahash"))]