From c4025063dedfbf9bdc7a6e032bdc0fefd20a4c93 Mon Sep 17 00:00:00 2001 From: 4l0n50 Date: Fri, 15 Dec 2023 18:52:40 +0100 Subject: [PATCH] Clippy --- evm/src/generation/mod.rs | 2 +- evm/src/generation/prover_input.rs | 2 +- evm/src/generation/state.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/evm/src/generation/mod.rs b/evm/src/generation/mod.rs index 1919b40d..8f568d90 100644 --- a/evm/src/generation/mod.rs +++ b/evm/src/generation/mod.rs @@ -341,7 +341,7 @@ fn simulate_cpu_between_labels_and_get_user_jumps( final_label: &str, state: &mut GenerationState, ) -> Result<(), ProgramError> { - if let Some(_) = state.jumpdest_addresses { + if state.jumpdest_addresses.is_some() { Ok(()) } else { const JUMP_OPCODE: u8 = 0x56; diff --git a/evm/src/generation/prover_input.rs b/evm/src/generation/prover_input.rs index 3a298e81..926b876d 100644 --- a/evm/src/generation/prover_input.rs +++ b/evm/src/generation/prover_input.rs @@ -410,7 +410,7 @@ impl<'a> Iterator for CodeIterator<'a> { } let opcode = code[*pos]; let old_pos = *pos; - *pos += if opcode >= PUSH1_OPCODE && opcode <= PUSH32_OPCODE { + *pos += if (PUSH1_OPCODE..=PUSH32_OPCODE).contains(&opcode) { (opcode - PUSH1_OPCODE + 2).into() } else { 1 diff --git a/evm/src/generation/state.rs b/evm/src/generation/state.rs index de07c942..1c50cc29 100644 --- a/evm/src/generation/state.rs +++ b/evm/src/generation/state.rs @@ -177,7 +177,7 @@ impl GenerationState { pub(crate) fn soft_clone(&self) -> GenerationState { Self { inputs: self.inputs.clone(), - registers: self.registers.clone(), + registers: self.registers, memory: self.memory.clone(), traces: Traces::default(), rlp_prover_inputs: self.rlp_prover_inputs.clone(),