feat: add flag to force hashbrown usage (#1284)

* feat: add flag to force hashbrown usage * misc: propagate hashbrown feature flag
bluealloy · Apr 13, 2024 · e0f72a0 · e0f72a0
1 parent cfc4511
commit e0f72a0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/crates/interpreter/Cargo.toml b/crates/interpreter/Cargo.toml
@@ -35,6 +35,7 @@ required-features = ["serde"]
 [features]
 default = ["std"]
 std = ["serde?/std", "revm-primitives/std"]
+hashbrown = ["revm-primitives/hashbrown"]
 serde = ["dep:serde", "revm-primitives/serde"]
 arbitrary = ["std", "revm-primitives/arbitrary"]
 asm-keccak = ["revm-primitives/asm-keccak"]

diff --git a/crates/precompile/Cargo.toml b/crates/precompile/Cargo.toml
@@ -48,6 +48,7 @@ std = [
     "c-kzg?/std",
     "secp256k1?/std",
 ]
+hashbrown = ["revm-primitives/hashbrown"]
 asm-keccak = ["revm-primitives/asm-keccak"]
 
 optimism = ["revm-primitives/optimism"]

diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml
@@ -53,6 +53,7 @@ std = [
     "bitvec/std",
     "bitflags/std",
 ]
+hashbrown = []
 serde = [
     "dep:serde",
     "alloy-primitives/serde",

diff --git a/crates/primitives/src/lib.rs b/crates/primitives/src/lib.rs
@@ -31,7 +31,7 @@ pub use constants::*;
 pub use env::*;
 
 cfg_if::cfg_if! {
-    if #[cfg(feature = "std")] {
+    if #[cfg(all(not(feature = "hashbrown"), feature = "std"))] {
         pub use std::collections::{hash_map, hash_set, HashMap, HashSet};
         use hashbrown as _;
     } else {

diff --git a/crates/revm/Cargo.toml b/crates/revm/Cargo.toml
@@ -64,6 +64,7 @@ std = [
     "revm-interpreter/std",
     "revm-precompile/std",
 ]
+hashbrown = ["revm-interpreter/hashbrown", "revm-precompile/hashbrown"]
 serde = ["dep:serde", "revm-interpreter/serde"]
 serde-json = ["serde", "dep:serde_json"]
 arbitrary = ["revm-interpreter/arbitrary"]