cfg: replace std feature gate alloc imports with extern crate alloc

crates/chainspec/src/lib.rs

@@ -9,7 +9,6 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(not(feature = "std"))]
 extern crate alloc;
 
 /// Chain specific constants

crates/chainspec/src/spec.rs

@@ -1,9 +1,5 @@
-pub use alloy_eips::eip1559::BaseFeeParams;
-
-#[cfg(not(feature = "std"))]
 use alloc::{boxed::Box, sync::Arc, vec::Vec};
-#[cfg(feature = "std")]
-use std::sync::Arc;
+pub use alloy_eips::eip1559::BaseFeeParams;
 
 use alloy_chains::{Chain, ChainKind, NamedChain};
 use alloy_genesis::Genesis;

crates/consensus/consensus/src/lib.rs

@@ -9,20 +9,15 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
+extern crate alloc;
+
+use alloc::{fmt::Debug, vec::Vec};
 use alloy_primitives::{BlockHash, BlockNumber, Bloom, B256, U256};
 use reth_primitives::{
     constants::MINIMUM_GAS_LIMIT, BlockWithSenders, GotExpected, GotExpectedBoxed, Header,
     InvalidTransactionError, Receipt, Request, SealedBlock, SealedHeader,
 };
 
-#[cfg(feature = "std")]
-use std::fmt::Debug;
-
-#[cfg(not(feature = "std"))]
-extern crate alloc;
-#[cfg(not(feature = "std"))]
-use alloc::{fmt::Debug, vec::Vec};
-
 /// A consensus implementation that does nothing.
 pub mod noop;
 

crates/ethereum-forks/src/display.rs

@@ -1,12 +1,10 @@
-#[cfg(not(feature = "std"))]
+use crate::{hardforks::Hardforks, ForkCondition};
 use alloc::{
     format,
     string::{String, ToString},
     vec::Vec,
 };
 
-use crate::{hardforks::Hardforks, ForkCondition};
-
 /// A container to pretty-print a hardfork.
 ///
 /// The fork is formatted depending on its fork condition:

crates/ethereum-forks/src/forkid.rs

@@ -3,7 +3,6 @@
 //! Previously version of Apache licenced [`ethereum-forkid`](https://crates.io/crates/ethereum-forkid).
 
 use crate::Head;
-#[cfg(not(feature = "std"))]
 use alloc::{
     collections::{BTreeMap, BTreeSet},
     vec::Vec,
@@ -22,8 +21,6 @@ use crc::*;
 use proptest_derive::Arbitrary as PropTestArbitrary;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
-#[cfg(feature = "std")]
-use std::collections::{BTreeMap, BTreeSet};
 
 const CRC_32_IEEE: Crc<u32> = Crc::<u32>::new(&CRC_32_ISO_HDLC);
 const TIMESTAMP_BEFORE_ETHEREUM_MAINNET: u64 = 1_300_000_000;

crates/ethereum-forks/src/hardfork/dev.rs

@@ -1,10 +1,8 @@
 use crate::{ChainHardforks, EthereumHardfork, ForkCondition};
+use alloc::vec;
 use alloy_primitives::U256;
 use once_cell::sync::Lazy;
 
-#[cfg(not(feature = "std"))]
-use alloc::vec;
-
 /// Dev hardforks
 pub static DEV_HARDFORKS: Lazy<ChainHardforks> = Lazy::new(|| {
     ChainHardforks::new(vec![

crates/ethereum-forks/src/hardfork/ethereum.rs

@@ -1,4 +1,5 @@
 use crate::{hardfork, ChainHardforks, ForkCondition, Hardfork};
+use alloc::{boxed::Box, format, string::String};
 use alloy_chains::Chain;
 use alloy_primitives::{uint, U256};
 use core::{
@@ -9,9 +10,6 @@ use core::{
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-#[cfg(not(feature = "std"))]
-use alloc::{boxed::Box, format, string::String};
-
 hardfork!(
     /// The name of an Ethereum hardfork.
     EthereumHardfork {

crates/ethereum-forks/src/hardfork/optimism.rs

@@ -1,4 +1,3 @@
-#[cfg(not(feature = "std"))]
 use alloc::{boxed::Box, format, string::String, vec};
 use core::{
     any::Any,

crates/ethereum-forks/src/lib.rs

@@ -15,7 +15,6 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(not(feature = "std"))]
 extern crate alloc;
 
 mod display;

crates/ethereum/evm/src/eip6110.rs

@@ -1,14 +1,12 @@
 //! EIP-6110 deposit requests parsing
+use alloc::{string::ToString, vec::Vec};
 use alloy_eips::eip6110::{DepositRequest, MAINNET_DEPOSIT_CONTRACT_ADDRESS};
 use alloy_sol_types::{sol, SolEvent};
 use reth_chainspec::ChainSpec;
 use reth_evm::execute::BlockValidationError;
 use reth_primitives::{Receipt, Request};
 use revm_primitives::Log;
 
-#[cfg(not(feature = "std"))]
-use alloc::{string::ToString, vec::Vec};
-
 sol! {
     #[allow(missing_docs)]
     event DepositEvent(

crates/ethereum/evm/src/execute.rs

@@ -4,6 +4,7 @@ use crate::{
     dao_fork::{DAO_HARDFORK_BENEFICIARY, DAO_HARDKFORK_ACCOUNTS},
     EthEvmConfig,
 };
+use alloc::{boxed::Box, sync::Arc, vec, vec::Vec};
 use core::fmt::Display;
 use reth_chainspec::{ChainSpec, EthereumHardforks, MAINNET};
 use reth_ethereum_consensus::validate_block_post_execution;
@@ -32,11 +33,6 @@ use revm_primitives::{
     BlockEnv, CfgEnvWithHandlerCfg, EVMError, EnvWithHandlerCfg, ResultAndState,
 };
 
-#[cfg(not(feature = "std"))]
-use alloc::{boxed::Box, sync::Arc, vec, vec::Vec};
-#[cfg(feature = "std")]
-use std::sync::Arc;
-
 /// Provides executors to execute regular ethereum blocks
 #[derive(Debug, Clone)]
 pub struct EthExecutorProvider<EvmConfig = EthEvmConfig> {

crates/ethereum/evm/src/lib.rs

@@ -9,18 +9,14 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(not(feature = "std"))]
 extern crate alloc;
 
-use std::sync::Arc;
-
+use alloc::vec::Vec;
 use reth_chainspec::{ChainSpec, Head};
 use reth_evm::{ConfigureEvm, ConfigureEvmEnv};
 use reth_primitives::{transaction::FillTxEnv, Address, Header, TransactionSigned, U256};
 use revm_primitives::{AnalysisKind, Bytes, CfgEnvWithHandlerCfg, Env, TxEnv, TxKind};
-
-#[cfg(not(feature = "std"))]
-use alloc::vec::Vec;
+use std::sync::Arc;
 
 mod config;
 pub use config::{revm_spec, revm_spec_by_timestamp_after_merge};

crates/evm/execution-errors/src/lib.rs

@@ -9,11 +9,9 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(not(feature = "std"))]
 extern crate alloc;
-#[cfg(not(feature = "std"))]
-use alloc::{boxed::Box, string::String};
 
+use alloc::{boxed::Box, string::String};
 use alloy_eips::BlockNumHash;
 use alloy_primitives::B256;
 use derive_more::Display;

crates/evm/execution-errors/src/trie.rs

@@ -1,13 +1,11 @@
 //! Errors when computing the state root.
 
+use alloc::string::ToString;
 use alloy_primitives::B256;
 use derive_more::Display;
 use nybbles::Nibbles;
 use reth_storage_errors::{db::DatabaseError, provider::ProviderError};
 
-#[cfg(not(feature = "std"))]
-use alloc::string::ToString;
-
 /// State root errors.
 #[derive(Display, Debug, PartialEq, Eq, Clone)]
 pub enum StateRootError {

crates/evm/execution-types/src/chain.rs

@@ -1,12 +1,8 @@
 //! Contains [Chain], a chain of blocks and their final state.
 
-#[cfg(not(feature = "std"))]
+use crate::ExecutionOutcome;
 use alloc::{borrow::Cow, collections::BTreeMap};
 use core::{fmt, ops::RangeInclusive};
-#[cfg(feature = "std")]
-use std::{borrow::Cow, collections::BTreeMap};
-
-use crate::ExecutionOutcome;
 use reth_execution_errors::{BlockExecutionError, InternalBlockExecutionError};
 use reth_primitives::{
     Address, BlockHash, BlockNumHash, BlockNumber, ForkBlock, Receipt, SealedBlock,

crates/evm/execution-types/src/lib.rs

@@ -8,7 +8,6 @@
 #![cfg_attr(not(test), warn(unused_crate_dependencies))]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
-#[cfg(not(feature = "std"))]
 extern crate alloc;
 
 mod chain;

crates/evm/src/builder.rs

@@ -1,8 +1,6 @@
 //! Builder for creating an EVM with a database and environment.
 
-#[cfg(not(feature = "std"))]
 use alloc::boxed::Box;
-
 use revm::{inspector_handle_register, Database, Evm, EvmBuilder, GetInspector};
 use revm_primitives::EnvWithHandlerCfg;
 

crates/evm/src/lib.rs

@@ -9,7 +9,6 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(not(feature = "std"))]
 extern crate alloc;
 
 use core::ops::Deref;

crates/evm/src/system_calls.rs

@@ -1,12 +1,7 @@
 //! System contract call functions.
 
-#[cfg(feature = "std")]
-use std::fmt::Display;
-#[cfg(not(feature = "std"))]
-use {
-    alloc::{boxed::Box, format, string::ToString, vec::Vec},
-    core::fmt::Display,
-};
+use alloc::{boxed::Box, format, string::ToString, vec::Vec};
+use core::fmt::Display;
 
 use crate::ConfigureEvm;
 use alloy_eips::{

crates/optimism/chainspec/src/base.rs

@@ -1,9 +1,6 @@
 //! Chain specification for the Base Mainnet network.
 
-#[cfg(not(feature = "std"))]
 use alloc::sync::Arc;
-#[cfg(feature = "std")]
-use std::sync::Arc;
 
 use alloy_chains::Chain;
 use alloy_primitives::{b256, U256};

crates/optimism/chainspec/src/base_sepolia.rs

@@ -1,9 +1,6 @@
 //! Chain specification for the Base Sepolia testnet network.
 
-#[cfg(not(feature = "std"))]
 use alloc::sync::Arc;
-#[cfg(feature = "std")]
-use std::sync::Arc;
 
 use alloy_chains::Chain;
 use alloy_primitives::{b256, U256};

crates/optimism/chainspec/src/dev.rs

@@ -1,9 +1,6 @@
 //! Chain specification in dev mode for custom chain.
 
-#[cfg(not(feature = "std"))]
 use alloc::sync::Arc;
-#[cfg(feature = "std")]
-use std::sync::Arc;
 
 use alloy_chains::Chain;
 use alloy_primitives::U256;

crates/optimism/chainspec/src/lib.rs

@@ -7,7 +7,6 @@
 )]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
-#[cfg(not(feature = "std"))]
 extern crate alloc;
 
 pub mod constants;

crates/optimism/chainspec/src/op.rs

@@ -1,9 +1,6 @@
 //! Chain specification for the Optimism Mainnet network.
 
-#[cfg(not(feature = "std"))]
 use alloc::sync::Arc;
-#[cfg(feature = "std")]
-use std::sync::Arc;
 
 use alloy_chains::Chain;
 use alloy_primitives::{b256, U256};

crates/optimism/chainspec/src/op_sepolia.rs

@@ -1,9 +1,6 @@
 //! Chain specification for the Optimism Sepolia testnet network.
 
-#[cfg(not(feature = "std"))]
 use alloc::sync::Arc;
-#[cfg(feature = "std")]
-use std::sync::Arc;
 
 use alloy_chains::{Chain, NamedChain};
 use alloy_primitives::{b256, U256};

crates/primitives-traits/src/constants/gas_units.rs

@@ -1,7 +1,5 @@
-use core::time::Duration;
-
-#[cfg(not(feature = "std"))]
 use alloc::string::String;
+use core::time::Duration;
 
 /// Represents one Kilogas, or `1_000` gas.
 pub const KILOGAS: u64 = 1_000;

crates/primitives-traits/src/error.rs

@@ -1,13 +1,9 @@
+use alloc::boxed::Box;
 use core::{
     fmt,
     ops::{Deref, DerefMut},
 };
 
-#[cfg(not(feature = "std"))]
-use alloc::boxed::Box;
-#[cfg(not(feature = "std"))]
-extern crate alloc;
-
 /// A pair of values, one of which is expected and one of which is actual.
 #[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct GotExpected<T> {

crates/primitives-traits/src/integer_list.rs

@@ -1,3 +1,4 @@
+use alloc::vec::Vec;
 use bytes::BufMut;
 use core::fmt;
 use derive_more::Deref;
@@ -8,9 +9,6 @@ use serde::{
     Deserialize, Deserializer, Serialize, Serializer,
 };
 
-#[cfg(not(feature = "std"))]
-use alloc::vec::Vec;
-
 /// Uses Roaring Bitmaps to hold a list of integers. It provides really good compression with the
 /// capability to access its elements without decoding it.
 #[derive(Clone, PartialEq, Default, Deref)]

crates/primitives-traits/src/lib.rs

@@ -9,7 +9,6 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(not(feature = "std"))]
 #[macro_use]
 extern crate alloc;
 

crates/primitives-traits/src/request.rs

@@ -1,5 +1,6 @@
 //! EIP-7685 requests.
 
+use alloc::vec::Vec;
 pub use alloy_consensus::Request;
 use alloy_eips::eip7685::{Decodable7685, Encodable7685};
 use alloy_rlp::{Decodable, Encodable};
@@ -8,9 +9,6 @@ use reth_codecs::{add_arbitrary_tests, Compact};
 use revm_primitives::Bytes;
 use serde::{Deserialize, Serialize};
 
-#[cfg(not(feature = "std"))]
-use alloc::vec::Vec;
-
 /// A list of EIP-7685 requests.
 #[derive(
     Debug,

crates/primitives-traits/src/withdrawal.rs

@@ -1,12 +1,10 @@
 //! [EIP-4895](https://eips.ethereum.org/EIPS/eip-4895) Withdrawal types.
 
+use alloc::vec::Vec;
 use alloy_rlp::{RlpDecodableWrapper, RlpEncodableWrapper};
 use derive_more::{AsRef, Deref, DerefMut, From, IntoIterator};
 use reth_codecs::{add_arbitrary_tests, Compact};
 
-#[cfg(not(feature = "std"))]
-use alloc::vec::Vec;
-
 /// Re-export from `alloy_eips`.
 #[doc(inline)]
 pub use alloy_eips::eip4895::Withdrawal;