chore: Misc. style fixes

Author: jbencin

stacks-common/src/types/mod.rs

@@ -700,12 +700,7 @@ impl Address for StacksAddress {
     }
 
     fn from_string(s: &str) -> Option<StacksAddress> {
-        let (version, bytes) = match c32_address_decode(s) {
-            Ok((v, b)) => (v, b),
-            Err(_) => {
-                return None;
-            }
-        };
+        let (version, bytes) = c32_address_decode(s).ok()?;
 
         if bytes.len() != 20 {
             return None;

stackslib/src/chainstate/stacks/miner.rs

@@ -2585,8 +2585,7 @@ impl StacksBlockBuilder {
         event_observer: Option<&dyn MemPoolEventDispatcher>,
         burnchain: &Burnchain,
     ) -> Result<(StacksBlock, ExecutionCost, u64), Error> {
-        if let TransactionPayload::Coinbase(..) = coinbase_tx.payload {
-        } else {
+        if !matches!(coinbase_tx.payload, TransactionPayload::Coinbase(..)) {
             return Err(Error::MemPoolError(
                 "Not a coinbase transaction".to_string(),
             ));

stackslib/src/clarity_vm/database/marf.rs

@@ -294,10 +294,8 @@ impl ReadOnlyMarfStore<'_> {
     }
 
     pub fn trie_exists_for_block(&mut self, bhh: &StacksBlockId) -> Result<bool, DatabaseError> {
-        self.marf.with_conn(|conn| match conn.has_block(bhh) {
-            Ok(res) => Ok(res),
-            Err(e) => Err(DatabaseError::IndexError(e)),
-        })
+        self.marf
+            .with_conn(|conn| conn.has_block(bhh).map_err(DatabaseError::IndexError))
     }
 }
 

stackslib/src/core/mempool.rs

@@ -492,35 +492,25 @@ impl FromStr for MemPoolWalkTxTypes {
     type Err = &'static str;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
-            "TokenTransfer" => {
-                return Ok(Self::TokenTransfer);
-            }
-            "SmartContract" => {
-                return Ok(Self::SmartContract);
-            }
-            "ContractCall" => {
-                return Ok(Self::ContractCall);
-            }
-            _ => {
-                return Err("Unknown mempool tx walk type");
-            }
+            "TokenTransfer" => Ok(Self::TokenTransfer),
+            "SmartContract" => Ok(Self::SmartContract),
+            "ContractCall" => Ok(Self::ContractCall),
+            _ => Err("Unknown mempool tx walk type"),
         }
     }
 }
 
 impl MemPoolWalkTxTypes {
     pub fn all() -> HashSet<MemPoolWalkTxTypes> {
-        [
+        HashSet::from([
             MemPoolWalkTxTypes::TokenTransfer,
             MemPoolWalkTxTypes::SmartContract,
             MemPoolWalkTxTypes::ContractCall,
-        ]
-        .into_iter()
-        .collect()
+        ])
     }
 
     pub fn only(selected: &[MemPoolWalkTxTypes]) -> HashSet<MemPoolWalkTxTypes> {
-        selected.iter().map(|x| x.clone()).collect()
+        selected.iter().cloned().collect()
     }
 }
 
@@ -554,13 +544,7 @@ impl Default for MemPoolWalkSettings {
             consider_no_estimate_tx_prob: 5,
             nonce_cache_size: 1024 * 1024,
             candidate_retry_cache_size: 64 * 1024,
-            txs_to_consider: [
-                MemPoolWalkTxTypes::TokenTransfer,
-                MemPoolWalkTxTypes::SmartContract,
-                MemPoolWalkTxTypes::ContractCall,
-            ]
-            .into_iter()
-            .collect(),
+            txs_to_consider: MemPoolWalkTxTypes::all(),
             filter_origins: HashSet::new(),
             tenure_cost_limit_per_block_percentage: None,
         }
@@ -573,13 +557,7 @@ impl MemPoolWalkSettings {
             consider_no_estimate_tx_prob: 5,
             nonce_cache_size: 1024 * 1024,
             candidate_retry_cache_size: 64 * 1024,
-            txs_to_consider: [
-                MemPoolWalkTxTypes::TokenTransfer,
-                MemPoolWalkTxTypes::SmartContract,
-                MemPoolWalkTxTypes::ContractCall,
-            ]
-            .into_iter()
-            .collect(),
+            txs_to_consider: MemPoolWalkTxTypes::all(),
             filter_origins: HashSet::new(),
             tenure_cost_limit_per_block_percentage: None,
         }