fmt

Author: taikoonwang

crates/cheatcodes/src/inspector.rs

@@ -1798,7 +1798,7 @@ impl Cheatcodes {
     }
 
     #[cold]
-    fn meter_gas_end(&mut self, interpreter: &mut Interpreter) {
+    fn meter_gas_end(&mut self, interpreter: &Interpreter) {
         // Remove recorded gas if we exit frame.
         if will_exit(interpreter.instruction_result) {
             self.gas_metering.paused_frames.pop();
@@ -1812,7 +1812,7 @@ impl Cheatcodes {
     }
 
     #[cold]
-    fn meter_gas_check(&mut self, interpreter: &mut Interpreter) {
+    fn meter_gas_check(&self, interpreter: &mut Interpreter) {
         if will_exit(interpreter.instruction_result) {
             // Reset gas if spent is less than refunded.
             // This can happen if gas was paused / resumed or reset.
@@ -1833,7 +1833,7 @@ impl Cheatcodes {
     ///   cache) from mapped source address to the target address.
     /// - generates arbitrary value and saves it in target address storage.
     #[cold]
-    fn arbitrary_storage_end(&mut self, interpreter: &mut Interpreter, ecx: Ecx) {
+    fn arbitrary_storage_end(&mut self, interpreter: &Interpreter, ecx: Ecx) {
         let (key, target_address) = if interpreter.current_opcode() == op::SLOAD {
             (try_or_return!(interpreter.stack().peek(0)), interpreter.contract().target_address)
         } else {
@@ -1867,7 +1867,7 @@ impl Cheatcodes {
 
     /// Records storage slots reads and writes.
     #[cold]
-    fn record_accesses(&mut self, interpreter: &mut Interpreter) {
+    fn record_accesses(&mut self, interpreter: &Interpreter) {
         let Some(access) = &mut self.accesses else { return };
         match interpreter.current_opcode() {
             op::SLOAD => {
@@ -1883,7 +1883,7 @@ impl Cheatcodes {
     }
 
     #[cold]
-    fn record_state_diffs(&mut self, interpreter: &mut Interpreter, ecx: Ecx) {
+    fn record_state_diffs(&mut self, interpreter: &Interpreter, ecx: Ecx) {
         let Some(account_accesses) = &mut self.recorded_account_diffs_stack else { return };
         match interpreter.current_opcode() {
             op::SELFDESTRUCT => {

crates/config/src/etherscan.rs

@@ -138,7 +138,7 @@ impl ResolvedEtherscanConfigs {
             match config {
                 Ok(c) if c.chain == Some(chain) => return Some(Ok(c)),
                 Err(e) => return Some(Err(e)),
-                _ => continue,
+                Ok(_) => {}
             }
         }
         None

crates/config/src/lib.rs

@@ -1960,9 +1960,8 @@ impl Config {
             }
             if let Ok(entries) = cache_dir.as_path().read_dir() {
                 for entry in entries.flatten().filter(|x| x.path().is_dir()) {
-                    match Chain::from_str(&entry.file_name().to_string_lossy()) {
-                        Ok(chain) => cache.chains.push(Self::list_foundry_chain_cache(chain)?),
-                        Err(_) => continue,
+                    if let Ok(chain) = Chain::from_str(&entry.file_name().to_string_lossy()) {
+                        cache.chains.push(Self::list_foundry_chain_cache(chain)?);
                     }
                 }
                 Ok(cache)

crates/evm/evm/src/executors/invariant/mod.rs

@@ -663,7 +663,7 @@ impl<'a> InvariantExecutor<'a> {
     /// Makes sure that the contract exists in the project. If so, it returns its artifact
     /// identifier.
     fn validate_selected_contract(
-        &mut self,
+        &self,
         contract: String,
         selectors: &[FixedBytes<4>],
     ) -> Result<String> {

crates/evm/evm/src/inspectors/stack.rs

@@ -487,7 +487,7 @@ impl InspectorStackRefMut<'_> {
     /// Should be called on the top-level call of inner context (depth == 0 &&
     /// self.in_inner_context) Decreases sender nonce for CALLs to keep backwards compatibility
     /// Updates tx.origin to the value before entering inner context
-    fn adjust_evm_data_for_inner_context(&mut self, ecx: &mut EvmContext<&mut dyn DatabaseExt>) {
+    fn adjust_evm_data_for_inner_context(&self, ecx: &mut EvmContext<&mut dyn DatabaseExt>) {
         let inner_context_data =
             self.inner_context_data.as_ref().expect("should be called in inner context");
         ecx.env.tx.caller = inner_context_data.original_origin;
@@ -717,7 +717,7 @@ impl InspectorStackRefMut<'_> {
     }
 
     /// Invoked at the beginning of a new top-level (0 depth) frame.
-    fn top_level_frame_start(&mut self, ecx: &mut EvmContext<&mut dyn DatabaseExt>) {
+    fn top_level_frame_start(&mut self, ecx: &EvmContext<&mut dyn DatabaseExt>) {
         if self.enable_isolation {
             // If we're in isolation mode, we need to keep track of the state at the beginning of
             // the frame to be able to roll back on revert

crates/evm/fuzz/src/inspector.rs

@@ -60,7 +60,7 @@ impl<DB: Database> Inspector<DB> for Fuzzer {
 
 impl Fuzzer {
     /// Collects `stack` and `memory` values into the fuzz dictionary.
-    fn collect_data(&mut self, interpreter: &Interpreter) {
+    fn collect_data(&self, interpreter: &Interpreter) {
         self.fuzz_state.collect_values(interpreter.stack().data().iter().copied().map(Into::into));
 
         // TODO: disabled for now since it's flooding the dictionary

crates/fmt/src/formatter.rs

@@ -322,11 +322,7 @@ impl<'a, W: Write> Formatter<'a, W> {
     /// If the block style is configured to [SingleLineBlockStyle::Preserve],
     /// lookup whether there was a newline introduced in `[start_from, end_at]` range
     /// where `end_at` is the start of the block.
-    fn should_attempt_block_single_line(
-        &self,
-        stmt: &mut Statement,
-        start_from: usize,
-    ) -> bool {
+    fn should_attempt_block_single_line(&self, stmt: &mut Statement, start_from: usize) -> bool {
         match self.config.single_line_statement_blocks {
             SingleLineBlockStyle::Single => true,
             SingleLineBlockStyle::Multi => false,

crates/forge/src/cmd/install.rs

@@ -432,7 +432,7 @@ impl Installer<'_> {
                     sh_println!("[{i}] {c} selected")?;
                     return Ok(c.clone())
                 }
-                _ => continue,
+                _ => {}
             }
         }
     }

crates/script/src/lib.rs

@@ -414,7 +414,6 @@ impl ScriptArgs {
                 bytecodes.push((format!("Unknown{unknown_c}"), init_code, deployed_code));
                 unknown_c += 1;
             }
-            continue;
         }
 
         let mut prompt_user = false;

crates/verify/src/etherscan/mod.rs

@@ -214,7 +214,7 @@ impl EtherscanVerificationProvider {
 
     /// Configures the API request to the Etherscan API using the given [`VerifyArgs`].
     async fn prepare_verify_request(
-        &mut self,
+        &self,
         args: &VerifyArgs,
         context: &VerificationContext,
     ) -> Result<(Client, VerifyContract)> {
@@ -305,7 +305,7 @@ impl EtherscanVerificationProvider {
     /// If `--flatten` is set to `true` then this will send with [`CodeFormat::SingleFile`]
     /// otherwise this will use the [`CodeFormat::StandardJsonInput`]
     pub async fn create_verify_request(
-        &mut self,
+        &self,
         args: &VerifyArgs,
         context: &VerificationContext,
     ) -> Result<VerifyContract> {
@@ -353,7 +353,7 @@ impl EtherscanVerificationProvider {
     /// constructor arguments was provided, read them and encode. Otherwise,
     /// return whatever was set in the [VerifyArgs] args.
     async fn constructor_args(
-        &mut self,
+        &self,
         args: &VerifyArgs,
         context: &VerificationContext,
     ) -> Result<Option<String>> {