fix linting

Author: taikoonwang

crates/anvil/src/eth/backend/mem/mod.rs

@@ -964,8 +964,8 @@ impl Backend {
             // Defaults to block number for compatibility with existing state files.
             let fork_num_and_hash = self.get_fork().map(|f| (f.block_number(), f.block_hash()));
 
+            let best_number = state.best_block_number.unwrap_or(block.number.to::<U64>());
             if let Some((number, hash)) = fork_num_and_hash {
-                let best_number = state.best_block_number.unwrap_or(block.number.to::<U64>());
                 trace!(target: "backend", state_block_number=?best_number, fork_block_number=?number);
                 // If the state.block_number is greater than the fork block number, set best number
                 // to the state block number.
@@ -988,7 +988,6 @@ impl Backend {
                     self.blockchain.storage.write().best_hash = hash;
                 }
             } else {
-                let best_number = state.best_block_number.unwrap_or(block.number.to::<U64>());
                 self.blockchain.storage.write().best_number = best_number;
 
                 // Set the current best block hash;

crates/anvil/tests/it/txpool.rs

@@ -26,10 +26,8 @@ async fn geth_txpool() {
     let tx = WithOtherFields::new(tx);
 
     // send a few transactions
-    let mut txs = Vec::new();
     for _ in 0..10 {
-        let tx_hash = provider.send_transaction(tx.clone()).await.unwrap();
-        txs.push(tx_hash);
+        let _ = provider.send_transaction(tx.clone()).await.unwrap();
     }
 
     // we gave a 20s block time, should be plenty for us to get the txpool's content

crates/evm/fuzz/src/strategies/param.rs

@@ -136,7 +136,7 @@ pub fn fuzz_param_from_state(
                 .prop_map(move |value| {
                     let mut fuzzed_addr = Address::from_word(value);
                     if !deployed_libs.contains(&fuzzed_addr) {
-                        DynSolValue::Address(fuzzed_addr)
+                        // No need to do anything
                     } else {
                         let mut rng = StdRng::seed_from_u64(0x1337); // use deterministic rng
 
@@ -151,9 +151,8 @@ pub fn fuzz_param_from_state(
                                 break;
                             }
                         }
-
-                        DynSolValue::Address(fuzzed_addr)
                     }
+                    DynSolValue::Address(fuzzed_addr)
                 })
                 .boxed()
         }

crates/fmt/src/formatter.rs

@@ -2093,15 +2093,11 @@ impl<W: Write> Visitor for Formatter<'_, W> {
         let (ident, string) = (ident.safe_unwrap(), string.safe_unwrap());
         return_source_if_disabled!(self, loc, ';');
 
-        let pragma_descriptor = if ident.name == "solidity" {
-            // There are some issues with parsing Solidity's versions with crates like `semver`:
-            // 1. Ranges like `>=0.4.21<0.6.0` or `>=0.4.21 <0.6.0` are not parseable at all.
-            // 2. Versions like `0.8.10` got transformed into `^0.8.10` which is not the same.
-            // TODO: semver-solidity crate :D
-            &string.string
-        } else {
-            &string.string
-        };
+        // There are some issues with parsing Solidity's versions with crates like `semver`:
+        // 1. Ranges like `>=0.4.21<0.6.0` or `>=0.4.21 <0.6.0` are not parseable at all.
+        // 2. Versions like `0.8.10` got transformed into `^0.8.10` which is not the same.
+        // TODO: semver-solidity crate :D
+        let pragma_descriptor = &string.string;
 
         write_chunk!(self, string.loc.end(), "pragma {} {};", &ident.name, pragma_descriptor)?;
 

crates/forge/src/cmd/clone.rs

@@ -556,10 +556,8 @@ fn dump_sources(meta: &Metadata, root: &PathBuf, no_reorg: bool) -> Result<Vec<R
                 PathBuf::from(&r.path)
             };
             r.path = new_path.to_string_lossy().to_string();
-            remappings.push(r);
-        } else {
-            remappings.push(r);
         }
+        remappings.push(r);
     }
 
     Ok(remappings.into_iter().map(|r| r.into_relative(root)).collect())

crates/test-utils/src/util.rs

@@ -237,7 +237,7 @@ pub fn initialize(target: &Path) {
 
     // Initialize the global template if necessary.
     let mut lock = crate::fd_lock::new_lock(TEMPLATE_LOCK.as_path());
-    let mut _read = Some(lock.read().unwrap());
+    let mut _read = lock.read().unwrap();
     if fs::read(&*TEMPLATE_LOCK).unwrap() != b"1" {
         // We are the first to acquire the lock:
         // - initialize a new empty temp project;
@@ -248,7 +248,7 @@ pub fn initialize(target: &Path) {
         // but `TempProject` does not currently allow this: https://github.com/foundry-rs/compilers/issues/22
 
         // Release the read lock and acquire a write lock, initializing the lock file.
-        _read = None;
+        drop(_read);
 
         let mut write = lock.write().unwrap();
 
@@ -291,7 +291,7 @@ pub fn initialize(target: &Path) {
 
         // Release the write lock and acquire a new read lock.
         drop(write);
-        _read = Some(lock.read().unwrap());
+        _read = lock.read().unwrap();
     }
 
     println!("- copying template dir from {}", tpath.display());