clippy lints

Author: JereSalo

crates/vm/levm/src/db/cache.rs

@@ -22,11 +22,9 @@ pub fn get_account_mut<'cache>(
     if let Some(call_frame) = call_frame {
         if !call_frame.backup.contains_key(address) {
             if let Some(account) = account_option.as_ref() {
-                call_frame
-                    .backup
-                    .insert(address.clone(), Some((*account).clone()));
+                call_frame.backup.insert(*address, Some((*account).clone()));
             } else {
-                call_frame.backup.insert(address.clone(), None);
+                call_frame.backup.insert(*address, None);
             }
         }
     }
@@ -47,15 +45,10 @@ pub fn insert_account(
 
     // insert account_option cloned into call_frame backup if not already there
     if let Some(call_frame) = call_frame {
-        if !call_frame.backup.contains_key(&address) {
-            if let Some(account) = account_option.as_ref() {
-                call_frame
-                    .backup
-                    .insert(address.clone(), Some((*account).clone()));
-            } else {
-                call_frame.backup.insert(address.clone(), None);
-            }
-        }
+        call_frame
+            .backup
+            .entry(address)
+            .or_insert_with(|| account_option.as_ref().map(|account| (*account).clone()));
     }
 
     account_option
@@ -70,13 +63,11 @@ pub fn remove_account(
 
     // insert account_option cloned into call_frame backup if not already there
     if let Some(call_frame) = call_frame {
-        if !call_frame.backup.contains_key(&address) {
+        if !call_frame.backup.contains_key(address) {
             if let Some(account) = account_option.as_ref() {
-                call_frame
-                    .backup
-                    .insert(address.clone(), Some((*account).clone()));
+                call_frame.backup.insert(*address, Some((*account).clone()));
             } else {
-                call_frame.backup.insert(address.clone(), None);
+                call_frame.backup.insert(*address, None);
             }
         }
     }

crates/vm/levm/src/opcode_handlers/system.rs

@@ -1,5 +1,4 @@
 use crate::{
-    account,
     call_frame::CallFrame,
     constants::{CREATE_DEPLOYMENT_FAIL, INIT_CODE_MAX_SIZE, REVERT_FOR_CALL, SUCCESS_FOR_CALL},
     db::cache,
@@ -734,9 +733,10 @@ impl<'a> VM<'a> {
                     .push(address_to_word(new_address))?;
 
                 for (address, account_opt) in new_call_frame.backup {
-                    if !current_call_frame.backup.contains_key(&address) {
-                        current_call_frame.backup.insert(address, account_opt);
-                    }
+                    current_call_frame
+                        .backup
+                        .entry(address)
+                        .or_insert(account_opt);
                 }
             }
             TxResult::Revert(err) => {
@@ -877,9 +877,10 @@ impl<'a> VM<'a> {
             TxResult::Success => {
                 current_call_frame.stack.push(SUCCESS_FOR_CALL)?;
                 for (address, account_opt) in new_call_frame.backup {
-                    if !current_call_frame.backup.contains_key(&address) {
-                        current_call_frame.backup.insert(address, account_opt);
-                    }
+                    current_call_frame
+                        .backup
+                        .entry(address)
+                        .or_insert(account_opt);
                 }
             }
             TxResult::Revert(_) => {