chore: aggregate PRs (#12493)

This PR aggregates changes from the following PRs:

- Closes #12448 by @\strmfos
- Closes #12465 by @\wedjob0X
- Closes #12485 by @\Doryu001
- Closes #12487 by @\kilavvy
- Closes #12492 by @\avorylli

Author: DaniPopes

crates/cheatcodes/src/evm.rs

@@ -1497,7 +1497,7 @@ fn get_recorded_state_diffs(ccx: &mut CheatsCtxt) -> BTreeMap<Address, AccountSt
                             });
                         let layout = storage_layouts.get(&storage_access.account);
                         // Update state diff. Do not overwrite the initial value if already set.
-                        match account_diff.state_diff.entry(storage_access.slot) {
+                        let entry = match account_diff.state_diff.entry(storage_access.slot) {
                             Entry::Vacant(slot_state_diff) => {
                                 // Get storage layout info for this slot
                                 // Include mapping slots if available for the account
@@ -1509,9 +1509,8 @@ fn get_recorded_state_diffs(ccx: &mut CheatsCtxt) -> BTreeMap<Address, AccountSt
 
                                 let slot_info = layout.and_then(|layout| {
                                     let decoder = SlotIdentifier::new(layout.clone());
-                                    decoder
-                                        .identify(&storage_access.slot, mapping_slots)
-                                        .or_else(|| {
+                                    decoder.identify(&storage_access.slot, mapping_slots).or_else(
+                                        || {
                                             // Create a map of new values for bytes/string
                                             // identification. These values are used to determine
                                             // the length of the data which helps determine how many
@@ -1524,43 +1523,31 @@ fn get_recorded_state_diffs(ccx: &mut CheatsCtxt) -> BTreeMap<Address, AccountSt
                                                 &storage_access.slot,
                                                 &current_base_slot_values,
                                             )
-                                        })
-                                        .map(|mut info| {
-                                            // Always decode values first
-                                            info.decode_values(
-                                                storage_access.previousValue,
-                                                storage_access.newValue,
-                                            );
-
-                                            // Then handle long bytes/strings if applicable
-                                            if info.is_bytes_or_string() {
-                                                info.decode_bytes_or_string_values(
-                                                    &storage_access.slot,
-                                                    &raw_changes_by_slot,
-                                                );
-                                            }
-
-                                            info
-                                        })
+                                        },
+                                    )
                                 });
 
                                 slot_state_diff.insert(SlotStateDiff {
                                     previous_value: storage_access.previousValue,
                                     new_value: storage_access.newValue,
                                     slot_info,
-                                });
+                                })
                             }
-                            Entry::Occupied(mut slot_state_diff) => {
-                                let entry = slot_state_diff.get_mut();
+                            Entry::Occupied(slot_state_diff) => {
+                                let entry = slot_state_diff.into_mut();
                                 entry.new_value = storage_access.newValue;
-
-                                // Update decoded values if we have slot info
-                                if let Some(ref mut slot_info) = entry.slot_info {
-                                    slot_info.decode_values(
-                                        entry.previous_value,
-                                        storage_access.newValue,
-                                    );
-                                }
+                                entry
+                            }
+                        };
+
+                        // Update decoded values if we have slot info
+                        if let Some(slot_info) = &mut entry.slot_info {
+                            slot_info.decode_values(entry.previous_value, storage_access.newValue);
+                            if slot_info.is_bytes_or_string() {
+                                slot_info.decode_bytes_or_string_values(
+                                    &storage_access.slot,
+                                    &raw_changes_by_slot,
+                                );
                             }
                         }
                     }

crates/doc/src/preprocessor/git_source.rs

@@ -26,7 +26,7 @@ impl Preprocessor for GitSource {
     fn preprocess(&self, documents: Vec<Document>) -> Result<Vec<Document>, eyre::Error> {
         if let Some(ref repo) = self.repository {
             let repo = repo.trim_end_matches('/');
-            let commit = self.commit.clone().unwrap_or("master".to_owned());
+            let commit = self.commit.as_deref().unwrap_or("master");
             for document in &documents {
                 if document.from_library {
                     continue;

crates/script-sequence/src/sequence.rs

@@ -194,9 +194,10 @@ impl ScriptSequence {
 
         // TODO: ideally we want the name of the function here if sig is calldata
         let filename = sig_to_file_name(sig);
+        let filename_with_ext = format!("{filename}-latest.json");
 
-        broadcast.push(format!("{filename}-latest.json"));
-        cache.push(format!("{filename}-latest.json"));
+        broadcast.push(&filename_with_ext);
+        cache.push(&filename_with_ext);
 
         Ok((broadcast, cache))
     }
@@ -237,7 +238,6 @@ pub fn sig_to_file_name(sig: &str) -> String {
         return sig.to_string();
     }
 
-    // return sig as is
     sig.to_string()
 }
 

crates/script/src/simulate.rs

@@ -239,7 +239,7 @@ impl PreSimulationState {
             let mut script_config = self.script_config.clone();
             script_config.evm_opts.fork_url = Some(rpc.clone());
             let runner = script_config.get_runner().await?;
-            Ok((rpc.clone(), runner))
+            Ok((rpc, runner))
         });
         try_join_all(futs).await
     }

crates/sol-macro-gen/src/sol_macro_gen.rs

@@ -325,11 +325,7 @@ edition = "2021"
     }
 
     fn check_file_contents(&self, file_path: &Path, expected_contents: &str) -> Result<()> {
-        eyre::ensure!(
-            file_path.is_file() && file_path.exists(),
-            "{} is not a file",
-            file_path.display()
-        );
+        eyre::ensure!(file_path.is_file(), "{} is not a file", file_path.display());
         let file_contents = &fs::read_to_string(file_path).wrap_err("Failed to read file")?;
 
         // Format both