chore: remove prelude

crates/interpreter/src/instructions.rs

@@ -12,12 +12,4 @@ pub mod opcode;
 mod stack;
 mod system;
 
-mod prelude {
-    pub(super) use crate::primitives::{
-        Bytes, Spec, SpecId, SpecId::*, B160, B256, KECCAK_EMPTY, U256,
-    };
-    pub(super) use crate::{gas, Host, InstructionResult, Interpreter};
-    pub(super) use core::cmp::Ordering;
-}
-
 pub use opcode::{OpCode, OPCODE_JUMPMAP};

crates/interpreter/src/instructions/arithmetic.rs

@@ -1,5 +1,9 @@
 use super::i256::{i256_div, i256_mod};
-use super::prelude::*;
+use crate::{
+    gas,
+    primitives::{Spec, U256},
+    Host, InstructionResult, Interpreter,
+};
 
 pub(super) fn wrapped_add(interpreter: &mut Interpreter, _host: &mut dyn Host) {
     gas!(interpreter, gas::VERYLOW);

crates/interpreter/src/instructions/bitwise.rs

@@ -1,5 +1,10 @@
 use super::i256::{i256_cmp, i256_sign, two_compl, Sign};
-use super::prelude::*;
+use crate::{
+    gas,
+    primitives::{Spec, U256},
+    Host, InstructionResult, Interpreter,
+};
+use core::cmp::Ordering;
 
 pub(super) fn lt(interpreter: &mut Interpreter, _host: &mut dyn Host) {
     gas!(interpreter, gas::VERYLOW);

crates/interpreter/src/instructions/control.rs

@@ -1,4 +1,8 @@
-use super::prelude::*;
+use crate::{
+    gas,
+    primitives::{Spec, U256},
+    Host, InstructionResult, Interpreter,
+};
 
 pub(super) fn jump(interpreter: &mut Interpreter, _host: &mut dyn Host) {
     gas!(interpreter, gas::MID);

crates/interpreter/src/instructions/host.rs

@@ -1,13 +1,11 @@
-use super::prelude::*;
-use crate::MAX_INITCODE_SIZE;
 use crate::{
-    alloc::boxed::Box,
-    alloc::vec::Vec,
     gas::{self, COLD_ACCOUNT_ACCESS_COST, WARM_STORAGE_READ_COST},
     interpreter::Interpreter,
+    primitives::{Bytes, Spec, SpecId::*, B160, B256, U256},
     return_ok, return_revert, CallContext, CallInputs, CallScheme, CreateInputs, CreateScheme,
-    Host, InstructionResult, Transfer,
+    Host, InstructionResult, Transfer, MAX_INITCODE_SIZE,
 };
+use alloc::{boxed::Box, vec::Vec};
 use core::cmp::min;
 use revm_primitives::BLOCK_HASH_HISTORY;
 

crates/interpreter/src/instructions/host_env.rs

@@ -1,4 +1,8 @@
-use super::prelude::*;
+use crate::{
+    gas,
+    primitives::{Spec, SpecId::*},
+    Host, InstructionResult, Interpreter,
+};
 
 // EIP-1344: ChainID opcode
 pub(super) fn chainid<SPEC: Spec>(interpreter: &mut Interpreter, host: &mut dyn Host) {

crates/interpreter/src/instructions/i256.rs

@@ -1,4 +1,4 @@
-use super::prelude::*;
+use crate::primitives::U256;
 use core::cmp::Ordering;
 
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]

crates/interpreter/src/instructions/memory.rs

@@ -1,4 +1,8 @@
-use super::prelude::*;
+use crate::{
+    gas,
+    primitives::{Spec, U256},
+    Host, InstructionResult, Interpreter,
+};
 use core::cmp::max;
 
 pub(super) fn mload(interpreter: &mut Interpreter, _host: &mut dyn Host) {

crates/interpreter/src/instructions/opcode.rs

@@ -1,6 +1,11 @@
 //! EVM opcode definitions and utilities.
 
-use super::{prelude::*, *};
+use super::*;
+use crate::{
+    gas,
+    primitives::{Spec, SpecId},
+    Host, Interpreter,
+};
 use core::fmt;
 
 macro_rules! opcodes {

crates/interpreter/src/instructions/stack.rs

@@ -1,4 +1,8 @@
-use super::prelude::*;
+use crate::{
+    gas,
+    primitives::{Spec, U256},
+    Host, InstructionResult, Interpreter,
+};
 
 pub(super) fn pop(interpreter: &mut Interpreter, _host: &mut dyn Host) {
     gas!(interpreter, gas::BASE);

crates/interpreter/src/instructions/system.rs

@@ -1,4 +1,8 @@
-use super::prelude::*;
+use crate::{
+    gas,
+    primitives::{Spec, B256, KECCAK_EMPTY, U256},
+    Host, InstructionResult, Interpreter,
+};
 
 pub(super) fn keccak256(interpreter: &mut Interpreter, _host: &mut dyn Host) {
     pop!(interpreter, from, len);

crates/interpreter/src/interpreter/analysis.rs

@@ -115,7 +115,7 @@ impl BytecodeLocked {
         if self.is_empty() {
             KECCAK_EMPTY
         } else {
-            keccak256(&self.original_bytecode_slice())
+            keccak256(self.original_bytecode_slice())
         }
     }