chore(std): Add std HashMap,HashSet (bluealloy#1041)

crates/primitives/Cargo.toml

@@ -32,9 +32,13 @@ once_cell = { version = "1.19", default-features = false, optional = true }
 # utility
 enumn = "0.1"
 derive_more = { version = "0.99", optional = true }
+cfg-if = "1"
 
 # optional
-serde = { version = "1.0", default-features = false, features = ["derive", "rc"], optional = true }
+serde = { version = "1.0", default-features = false, features = [
+    "derive",
+    "rc",
+], optional = true }
 
 [build-dependencies]
 hex = { version = "0.4", default-features = false }

crates/primitives/src/db.rs

@@ -1,6 +1,5 @@
-use crate::{Account, AccountInfo, Address, Bytecode, B256, U256};
+use crate::{Account, AccountInfo, Address, Bytecode, HashMap, B256, U256};
 use auto_impl::auto_impl;
-use hashbrown::HashMap as Map;
 
 pub mod components;
 pub use components::{
@@ -30,7 +29,7 @@ pub trait Database {
 #[auto_impl(&mut, Box)]
 pub trait DatabaseCommit {
     /// Commit changes to the database.
-    fn commit(&mut self, changes: Map<Address, Account>);
+    fn commit(&mut self, changes: HashMap<Address, Account>);
 }
 
 /// EVM database interface.

crates/primitives/src/lib.rs

@@ -20,7 +20,6 @@ pub mod result;
 pub mod specification;
 pub mod state;
 pub mod utilities;
-
 pub use alloy_primitives::{
     self, address, b256, bytes, fixed_bytes, hex, hex_literal, ruint, uint, Address, Bytes,
     FixedBytes, Log, LogData, B256, I256, U256,
@@ -29,7 +28,16 @@ pub use bitvec;
 pub use bytecode::*;
 pub use constants::*;
 pub use env::*;
-pub use hashbrown::{hash_map, hash_set, HashMap, HashSet};
+
+cfg_if::cfg_if! {
+    if #[cfg(std)] {
+        pub use std::collections::{hash_map, hash_set, HashMap, HashSet};
+        use hashbrown as _;
+    } else {
+        pub use hashbrown::{hash_map, hash_set, HashMap, HashSet};
+    }
+}
+
 #[cfg(feature = "c-kzg")]
 pub use kzg::{EnvKzgSettings, KzgSettings};
 pub use precompile::*;

crates/primitives/src/state.rs

@@ -1,7 +1,6 @@
-use crate::{Address, Bytecode, B256, KECCAK_EMPTY, U256};
+use crate::{Address, Bytecode, HashMap, B256, KECCAK_EMPTY, U256};
 use bitflags::bitflags;
 use core::hash::{Hash, Hasher};
-use hashbrown::HashMap;
 
 /// EVM State is a mapping from addresses to accounts.
 pub type State = HashMap<Address, Account>;

crates/revm/src/journaled_state.rs

@@ -446,17 +446,17 @@ impl JournaledState {
     ) -> Result<SelfDestructResult, DB::Error> {
         let (is_cold, target_exists) = self.load_account_exist(target, db)?;
 
-        let acc = if address != target {
+        if address != target {
             // Both accounts are loaded before this point, `address` as we execute its contract.
             // and `target` at the beginning of the function.
-            let [acc, target_account] = self.state.get_many_mut([&address, &target]).unwrap();
+            let acc_balance = self.state.get_mut(&target).unwrap().info.balance;
+
+            let target_account = self.state.get_mut(&target).unwrap();
             Self::touch_account(self.journal.last_mut().unwrap(), &target, target_account);
-            target_account.info.balance += acc.info.balance;
-            acc
-        } else {
-            self.state.get_mut(&address).unwrap()
-        };
+            target_account.info.balance += acc_balance;
+        }
 
+        let acc = self.state.get_mut(&address).unwrap();
         let balance = acc.info.balance;
         let previously_destroyed = acc.is_selfdestructed();
         let is_cancun_enabled = SpecId::enabled(self.spec, CANCUN);