chore: fix clippy & forge-std external test (#12698)

* chore: fix clippy

* bump forge-std

* bump solady to pick up fuzz test fix

Author: grandizzy

crates/cheatcodes/src/evm.rs

@@ -191,9 +191,8 @@ impl Display for AccountStateDiffs {
             for (slot, slot_changes) in &self.state_diff {
                 match &slot_changes.slot_info {
                     Some(slot_info) => {
-                        if slot_info.decoded.is_some() {
+                        if let Some(decoded) = &slot_info.decoded {
                             // Have slot info with decoded values - show decoded values
-                            let decoded = slot_info.decoded.as_ref().unwrap();
                             writeln!(
                                 f,
                                 "@ {slot} ({}, {}): {} → {}",

crates/cheatcodes/src/test/revert_handlers.rs

@@ -240,21 +240,23 @@ pub(crate) fn handle_expect_revert(
                     let decoded_revert = decode_revert(retdata.to_vec());
 
                     // Provide more specific error messages based on what was expected
-                    if expected_revert.reverter.is_some() && expected_revert.reason.is_some() {
-                        Err(fmt_err!(
-                            "call reverted with '{}' from {}, but expected 0 reverts with reason '{}' from {}",
-                            stringify(&decoded_revert),
-                            expected_revert.reverted_by.unwrap_or_default(),
-                            stringify(expected_reason.unwrap_or_default()),
-                            expected_revert.reverter.unwrap()
-                        ))
-                    } else if expected_revert.reverter.is_some() {
-                        Err(fmt_err!(
-                            "call reverted with '{}' from {}, but expected 0 reverts from {}",
-                            stringify(&decoded_revert),
-                            expected_revert.reverted_by.unwrap_or_default(),
-                            expected_revert.reverter.unwrap()
-                        ))
+                    if let Some(reverter) = expected_revert.reverter {
+                        if expected_revert.reason.is_some() {
+                            Err(fmt_err!(
+                                "call reverted with '{}' from {}, but expected 0 reverts with reason '{}' from {}",
+                                stringify(&decoded_revert),
+                                expected_revert.reverted_by.unwrap_or_default(),
+                                stringify(expected_reason.unwrap_or_default()),
+                                reverter
+                            ))
+                        } else {
+                            Err(fmt_err!(
+                                "call reverted with '{}' from {}, but expected 0 reverts from {}",
+                                stringify(&decoded_revert),
+                                expected_revert.reverted_by.unwrap_or_default(),
+                                reverter
+                            ))
+                        }
                     } else {
                         Err(fmt_err!(
                             "call reverted with '{}' when it was expected not to revert",

crates/forge/tests/cli/ext_integration.rs

@@ -6,7 +6,7 @@ use foundry_test_utils::util::ExtTester;
 // <https://github.com/foundry-rs/forge-std>
 #[test]
 fn forge_std() {
-    ExtTester::new("foundry-rs", "forge-std", "a6d71da563bbb8d6eef8fbec3a16c61c603d2764")
+    ExtTester::new("foundry-rs", "forge-std", "b69e66b0ff79924d487d49bf7fb47c9ec326acba")
         // Skip fork tests.
         .args(["--nmc", "Fork"])
         .verbosity(2)
@@ -64,7 +64,7 @@ fn sablier_v2_core() {
 // <https://github.com/Vectorized/solady>
 #[test]
 fn solady() {
-    ExtTester::new("Vectorized", "solady", "701406e8126cfed931645727b274df303fbcd94d").run();
+    ExtTester::new("Vectorized", "solady", "fda607f2b8084112cbc0b261c8f6239687b8a15c").run();
 }
 
 // <https://github.com/pcaversaccio/snekmate>