Skip to content

Commit 8ffef00

Browse files
committed
Backport rust-lang#357 for 0.11
1 parent bbb5d3b commit 8ffef00

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ edition = "2018"
1313

1414
[dependencies]
1515
# For the default hasher
16-
ahash = { version = "0.7.0", default-features = false, optional = true }
16+
ahash = { version = "0.8.0", default-features = false, optional = true }
1717

1818
# For external trait impls
1919
rayon = { version = "1.0", optional = true }
@@ -38,7 +38,8 @@ doc-comment = "0.3.1"
3838
[features]
3939
default = ["ahash", "inline-more"]
4040

41-
ahash-compile-time-rng = ["ahash/compile-time-rng"]
41+
# Ahash changed behavior here, this feature is now a no-op for backcompat
42+
ahash-compile-time-rng = []
4243
nightly = []
4344
rustc-internal-api = []
4445
rustc-dep-of-std = [

src/map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use core::ops::Index;
1414

1515
/// Default hasher for `HashMap`.
1616
#[cfg(feature = "ahash")]
17-
pub type DefaultHashBuilder = ahash::RandomState;
17+
pub type DefaultHashBuilder = core::hash::BuildHasherDefault<ahash::AHasher>;
1818

1919
/// Dummy default hasher for `HashMap`.
2020
#[cfg(not(feature = "ahash"))]

0 commit comments

Comments
 (0)