clippy: warn on if_not_else (autofix) (#14092)

* clippy: warn on if_not_else

Co-Authored-By: zerosnacks <95942363+zerosnacks@users.noreply.github.com>

* refactor: use contains_key + remove instead of if-let remove

Simpler branch flip that preserves the original structure.

Co-Authored-By: zerosnacks <95942363+zerosnacks@users.noreply.github.com>

* fix: resolve new if_not_else and redundant_else findings after merge

Co-Authored-By: zerosnacks <95942363+zerosnacks@users.noreply.github.com>

* fix: flip if_not_else in keychain authorize

Co-Authored-By: zerosnacks <95942363+zerosnacks@users.noreply.github.com>

* fix: use multi-line format for blob_hashes if-else

Co-Authored-By: zerosnacks <95942363+zerosnacks@users.noreply.github.com>

* fix: rustfmt prefers single-line if-else here

Co-Authored-By: zerosnacks <95942363+zerosnacks@users.noreply.github.com>

---------

Co-authored-by: zerosnacks <95942363+zerosnacks@users.noreply.github.com>

Author: decofe

Cargo.toml

@@ -56,6 +56,7 @@ explicit_iter_loop = "warn"
 from_iter_instead_of_collect = "warn"
 if_then_some_else_none = "warn"
 implicit_clone = "warn"
+if_not_else = "warn"
 imprecise_flops = "warn"
 iter_on_empty_collections = "warn"
 iter_with_drain = "warn"

benches/src/lib.rs

@@ -175,13 +175,13 @@ impl BenchmarkProject {
                 .status()
                 .wrap_err("Failed to run npm install")?;
 
-            if !status.success() {
+            if status.success() {
+                sh_println!("  ✅ npm install completed successfully");
+            } else {
                 sh_println!(
                     "  ⚠️  Warning: npm install failed with exit code: {:?}",
                     status.code()
                 );
-            } else {
-                sh_println!("  ✅ npm install completed successfully");
             }
         }
         Ok(())

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

@@ -1384,11 +1384,7 @@ impl<N: Network> Backend<N> {
             gas_priority_fee: max_priority_fee_per_gas,
             max_fee_per_blob_gas: max_fee_per_blob_gas
                 .or_else(|| {
-                    if !blob_hashes.is_empty() {
-                        evm_env.block_env.blob_gasprice()
-                    } else {
-                        Some(0)
-                    }
+                    if blob_hashes.is_empty() { Some(0) } else { evm_env.block_env.blob_gasprice() }
                 })
                 .unwrap_or_default(),
             kind: match to {

crates/anvil/src/lib.rs

@@ -470,10 +470,10 @@ pub fn init_tracing() -> LoggingManager {
         // Mutate the given filter to include `node` logs if it is not already present.
         // This prevents the unexpected behaviour of not seeing any node logs if a RUST_LOG
         // is already present that doesn't set it.
-        let rust_log_val = if !rust_log_val.contains("node") {
-            format!("{rust_log_val},node=info")
-        } else {
+        let rust_log_val = if rust_log_val.contains("node") {
             rust_log_val
+        } else {
+            format!("{rust_log_val},node=info")
         };
 
         let env_filter: EnvFilter =

crates/cast/src/args.rs

@@ -195,10 +195,10 @@ pub async fn run_command(args: CastArgs) -> Result<()> {
             print_tokens(&tokens);
         }
         CastSubcommand::AbiEncode { sig, packed, args } => {
-            if !packed {
-                sh_println!("{}", SimpleCast::abi_encode(&sig, &args)?)?
-            } else {
+            if packed {
                 sh_println!("{}", SimpleCast::abi_encode_packed(&sig, &args)?)?
+            } else {
+                sh_println!("{}", SimpleCast::abi_encode(&sig, &args)?)?
             }
         }
         CastSubcommand::AbiEncodeEvent { sig, args } => {

crates/cast/src/cmd/keychain.rs

@@ -546,7 +546,9 @@ async fn run_check(wallet_address: Address, key_address: Address, rpc: RpcOpts)
 
     // Expiry: show human-readable date and whether it's expired.
     let expiry_str = format_expiry(info.expiry);
-    if info.expiry != u64::MAX {
+    if info.expiry == u64::MAX {
+        sh_println!("Expiry:         {}", expiry_str)?;
+    } else {
         let now = std::time::SystemTime::now()
             .duration_since(std::time::UNIX_EPOCH)
             .unwrap_or_default()
@@ -556,8 +558,6 @@ async fn run_check(wallet_address: Address, key_address: Address, rpc: RpcOpts)
         } else {
             sh_println!("Expiry:         {}", expiry_str)?;
         }
-    } else {
-        sh_println!("Expiry:         {}", expiry_str)?;
     }
 
     sh_println!("Spending Limits: {}", if info.enforceLimits { "enforced" } else { "none" })?;
@@ -579,7 +579,17 @@ async fn run_authorize(
 ) -> Result<()> {
     let enforce = enforce_limits || !limits.is_empty();
 
-    let calldata = if !allowed_calls.is_empty() {
+    let calldata = if allowed_calls.is_empty() {
+        // Use the legacy authorizeKey when no scopes are needed.
+        IAccountKeychain::authorizeKeyCall {
+            keyId: key_address,
+            signatureType: key_type,
+            expiry,
+            enforceLimits: enforce,
+            limits,
+        }
+        .abi_encode()
+    } else {
         // Use the T3+ authorizeKey overload with KeyRestrictions when scopes are provided.
         let sig_type_u8 = match key_type {
             SignatureType::Secp256k1 => 0u8,
@@ -603,16 +613,6 @@ async fn run_authorize(
             config: restrictions,
         }
         .abi_encode()
-    } else {
-        // Use the legacy authorizeKey when no scopes are needed.
-        IAccountKeychain::authorizeKeyCall {
-            keyId: key_address,
-            signatureType: key_type,
-            expiry,
-            enforceLimits: enforce,
-            limits,
-        }
-        .abi_encode()
     };
 
     send_keychain_tx(calldata, tx_opts, &send_tx).await
@@ -783,10 +783,10 @@ fn print_key_entry(entry: &tempo::KeyEntry) -> Result<()> {
     if let Some(key_address) = entry.key_address {
         sh_println!("Key Address:  {key_address}")?;
 
-        if key_address != entry.wallet_address {
-            sh_println!("Mode:         keychain (access key)")?;
-        } else {
+        if key_address == entry.wallet_address {
             sh_println!("Mode:         direct (EOA)")?;
+        } else {
+            sh_println!("Mode:         keychain (access key)")?;
         }
     } else {
         sh_println!("Key Address:  (not set)")?;

crates/cheatcodes/src/json.rs

@@ -503,7 +503,7 @@ fn encode(values: Vec<DynSolValue>) -> Vec<u8> {
 /// Canonicalize a json path key to always start from the root of the document.
 /// Read more about json path syntax: <https://goessner.net/articles/JsonPath/>
 pub(super) fn canonicalize_json_path(path: &str) -> Cow<'_, str> {
-    if !path.starts_with('$') { format!("${path}").into() } else { path.into() }
+    if path.starts_with('$') { path.into() } else { format!("${path}").into() }
 }
 
 /// Converts a JSON [`Value`] to a [`DynSolValue`] by trying to guess encoded type. For safer

crates/cheatcodes/src/test/assert.rs

@@ -467,10 +467,10 @@ fn assert_eq<'a, T: PartialEq>(left: &'a T, right: &'a T) -> ComparisonResult<'a
 }
 
 fn assert_not_eq<'a, T: PartialEq>(left: &'a T, right: &'a T) -> ComparisonResult<'a, T> {
-    if left != right {
-        Ok(())
-    } else {
+    if left == right {
         Err(ComparisonAssertionError { kind: AssertionKind::Ne, left, right })
+    } else {
+        Ok(())
     }
 }
 

crates/cheatcodes/src/test/expect.rs

@@ -1244,10 +1244,10 @@ pub(crate) fn get_emit_mismatch_message(
                     {
                         let (expected_name, expected_value) = &expected_params[param_idx];
                         let (_actual_name, actual_value) = &actual_params[param_idx];
-                        let param_name = if !expected_name.is_empty() {
-                            expected_name
-                        } else {
+                        let param_name = if expected_name.is_empty() {
                             &format!("param{param_idx}")
+                        } else {
+                            expected_name
                         };
                         return format!(
                             "{param_name}: expected={expected_value}, got={actual_value}",

crates/cheatcodes/src/test/revert_handlers.rs

@@ -198,7 +198,10 @@ pub(crate) fn handle_expect_revert(
 
         // If we expect no reverts with a specific reason/reverter, but got a revert,
         // we need to check if it matches our criteria
-        if !matches!(status, return_ok!()) {
+        if matches!(status, return_ok!()) {
+            // No revert occurred, which is what we expected
+            Ok(success_return())
+        } else {
             // We got a revert, but we expected 0 reverts
             // We need to check if this revert matches our expected criteria
 
@@ -266,9 +269,6 @@ pub(crate) fn handle_expect_revert(
                     }
                 }
             }
-        } else {
-            // No revert occurred, which is what we expected
-            Ok(success_return())
         }
     } else {
         ensure!(!matches!(status, return_ok!()), "next call did not revert as expected");