chore: fix clippy (#9333)

Author: grandizzy

crates/cast/bin/tx.rs

@@ -252,7 +252,7 @@ where
         };
 
         if self.state.to.is_none() && code.is_none() {
-            let has_value = self.tx.value.map_or(false, |v| !v.is_zero());
+            let has_value = self.tx.value.is_some_and(|v| !v.is_zero());
             let has_auth = self.auth.is_some();
             // We only allow user to omit the recipient address if transaction is an EIP-7702 tx
             // without a value.

crates/cheatcodes/src/json.rs

@@ -682,7 +682,7 @@ mod tests {
         match value {
             DynSolValue::Tuple(_) | DynSolValue::CustomStruct { .. } => true,
             DynSolValue::Array(v) | DynSolValue::FixedArray(v) => {
-                v.first().map_or(false, contains_tuple)
+                v.first().is_some_and(contains_tuple)
             }
             _ => false,
         }

crates/cheatcodes/src/test/expect.rs

@@ -633,7 +633,7 @@ pub(crate) fn handle_expect_emit(
             return false
         }
         // Maybe match source address.
-        if event_to_fill_or_check.address.map_or(false, |addr| addr != log.address) {
+        if event_to_fill_or_check.address.is_some_and(|addr| addr != log.address) {
             return false;
         }
         // Maybe match data.

crates/common/src/provider/mod.rs

@@ -137,7 +137,7 @@ impl ProviderBuilder {
             .wrap_err_with(|| format!("invalid provider URL: {url_str:?}"));
 
         // Use the final URL string to guess if it's a local URL.
-        let is_local = url.as_ref().map_or(false, |url| guess_local_url(url.as_str()));
+        let is_local = url.as_ref().is_ok_and(|url| guess_local_url(url.as_str()));
 
         Self {
             url,

crates/evm/core/src/backend/mod.rs

@@ -1972,7 +1972,7 @@ pub fn update_state<DB: Database>(
     persistent_accounts: Option<&HashSet<Address>>,
 ) -> Result<(), DB::Error> {
     for (addr, acc) in state.iter_mut() {
-        if !persistent_accounts.map_or(false, |accounts| accounts.contains(addr)) {
+        if !persistent_accounts.is_some_and(|accounts| accounts.contains(addr)) {
             acc.info = db.basic(*addr)?.unwrap_or_default();
             for (key, val) in acc.storage.iter_mut() {
                 val.present_value = db.storage(*addr, *key)?;

crates/evm/core/src/utils.rs

@@ -236,7 +236,7 @@ pub fn create2_handler_register<I: InspectorExt>(
             if create2_overrides_inner
                 .borrow()
                 .last()
-                .map_or(false, |(depth, _)| *depth == ctx.evm.journaled_state.depth())
+                .is_some_and(|(depth, _)| *depth == ctx.evm.journaled_state.depth())
             {
                 let (_, call_inputs) = create2_overrides_inner.borrow_mut().pop().unwrap();
                 outcome = ctx.external.call_end(&mut ctx.evm, &call_inputs, outcome);

crates/evm/coverage/src/anchors.rs

@@ -171,7 +171,7 @@ pub fn find_anchor_branch(
 /// Calculates whether `element` is within the range of the target `location`.
 fn is_in_source_range(element: &SourceElement, location: &SourceLocation) -> bool {
     // Source IDs must match.
-    let source_ids_match = element.index().map_or(false, |a| a as usize == location.source_id);
+    let source_ids_match = element.index().is_some_and(|a| a as usize == location.source_id);
     if !source_ids_match {
         return false;
     }

crates/fmt/src/comments.rs

@@ -112,7 +112,7 @@ impl CommentWithMetadata {
                     // line has something
                     // check if the last comment after code was a postfix comment
                     if last_comment
-                        .map_or(false, |last| last.loc.end() > code_end && !last.is_prefix())
+                        .is_some_and(|last| last.loc.end() > code_end && !last.is_prefix())
                     {
                         // get the indent size of the next item of code
                         let next_indent_len = src[comment.loc().end()..]

crates/fmt/src/formatter.rs

@@ -88,7 +88,7 @@ struct Context {
 impl Context {
     /// Returns true if the current function context is the constructor
     pub(crate) fn is_constructor_function(&self) -> bool {
-        self.function.as_ref().map_or(false, |f| matches!(f.ty, FunctionTy::Constructor))
+        self.function.as_ref().is_some_and(|f| matches!(f.ty, FunctionTy::Constructor))
     }
 }
 
@@ -341,7 +341,7 @@ impl<'a, W: Write> Formatter<'a, W> {
                     _ => stmt.loc().start(),
                 };
 
-                self.find_next_line(start_from).map_or(false, |loc| loc >= end_at)
+                self.find_next_line(start_from).is_some_and(|loc| loc >= end_at)
             }
         }
     }
@@ -560,7 +560,7 @@ impl<'a, W: Write> Formatter<'a, W> {
     fn write_doc_block_line(&mut self, comment: &CommentWithMetadata, line: &str) -> Result<()> {
         if line.trim().starts_with('*') {
             let line = line.trim().trim_start_matches('*');
-            let needs_space = line.chars().next().map_or(false, |ch| !ch.is_whitespace());
+            let needs_space = line.chars().next().is_some_and(|ch| !ch.is_whitespace());
             write!(self.buf(), " *{}", if needs_space { " " } else { "" })?;
             self.write_comment_line(comment, line)?;
             self.write_whitespace_separator(true)?;
@@ -1945,7 +1945,7 @@ impl<W: Write> Visitor for Formatter<'_, W> {
         )?;
 
         // EOF newline
-        if self.last_char().map_or(true, |char| char != '\n') {
+        if self.last_char() != Some('\n') {
             writeln!(self.buf())?;
         }
 
@@ -3259,7 +3259,7 @@ impl<W: Write> Visitor for Formatter<'_, W> {
 
                 // we can however check if the contract `is` the `base`, this however also does
                 // not cover all cases
-                let is_contract_base = self.context.contract.as_ref().map_or(false, |contract| {
+                let is_contract_base = self.context.contract.as_ref().is_some_and(|contract| {
                     contract.base.iter().any(|contract_base| {
                         contract_base
                             .name
@@ -3280,7 +3280,7 @@ impl<W: Write> Visitor for Formatter<'_, W> {
                     let mut base_or_modifier =
                         self.visit_to_chunk(loc.start(), Some(loc.end()), base)?;
                     let is_lowercase =
-                        base_or_modifier.content.chars().next().map_or(false, |c| c.is_lowercase());
+                        base_or_modifier.content.chars().next().is_some_and(|c| c.is_lowercase());
                     if is_lowercase && base_or_modifier.content.ends_with("()") {
                         base_or_modifier.content.truncate(base_or_modifier.content.len() - 2);
                     }

crates/forge/bin/cmd/init.rs

@@ -88,7 +88,7 @@ impl InitArgs {
             }
         } else {
             // if target is not empty
-            if root.read_dir().map_or(false, |mut i| i.next().is_some()) {
+            if root.read_dir().is_ok_and(|mut i| i.next().is_some()) {
                 if !force {
                     eyre::bail!(
                         "Cannot run `init` on a non-empty directory.\n\

crates/forge/src/runner.rs

@@ -296,7 +296,7 @@ impl ContractRunner<'_> {
                 warnings,
             )
         }
-        let call_after_invariant = after_invariant_fns.first().map_or(false, |after_invariant_fn| {
+        let call_after_invariant = after_invariant_fns.first().is_some_and(|after_invariant_fn| {
             let match_sig = after_invariant_fn.name == "afterInvariant";
             if !match_sig {
                 warnings.push(format!(

crates/script/src/transaction.rs

@@ -152,7 +152,7 @@ impl ScriptTransactionBuilder {
         // Add the additional contracts created in this transaction, so we can verify them later.
         created_contracts.retain(|contract| {
             // Filter out the contract that was created by the transaction itself.
-            self.transaction.contract_address.map_or(true, |addr| addr != contract.address)
+            self.transaction.contract_address != Some(contract.address)
         });
 
         self.transaction.additional_contracts = created_contracts;

crates/script/src/verify.rs

@@ -116,7 +116,7 @@ impl VerifyBundle {
             if data.split_at(create2_offset).1.starts_with(bytecode) {
                 let constructor_args = data.split_at(create2_offset + bytecode.len()).1.to_vec();
 
-                if artifact.source.extension().map_or(false, |e| e.to_str() == Some("vy")) {
+                if artifact.source.extension().is_some_and(|e| e.to_str() == Some("vy")) {
                     warn!("Skipping verification of Vyper contract: {}", artifact.name);
                 }