Merge pull request #5695 from stacks-network/fix/clippy-ci-unnecessary-lazy-evaluations

Fix clippy::unnecessary_lazy_evaluations throughout stacks core

Author: jferrant

stackslib/src/chainstate/stacks/db/accounts.rs

@@ -79,9 +79,8 @@ impl FromRow<MinerPaymentSchedule> for MinerPaymentSchedule {
         let stacks_block_height = u64::from_column(row, "stacks_block_height")?;
         let vtxindex: u32 = row.get_unwrap("vtxindex");
 
-        let schedule_type: HeaderTypeNames = row
-            .get("schedule_type")
-            .unwrap_or_else(|_e| HeaderTypeNames::Epoch2);
+        let schedule_type: HeaderTypeNames =
+            row.get("schedule_type").unwrap_or(HeaderTypeNames::Epoch2);
 
         let coinbase = coinbase_text
             .parse::<u128>()

stackslib/src/chainstate/stacks/db/mod.rs

@@ -442,9 +442,8 @@ impl FromRow<StacksHeaderInfo> for StacksHeaderInfo {
             .parse::<u64>()
             .map_err(|_| db_error::ParseError)?;
 
-        let header_type: HeaderTypeNames = row
-            .get("header_type")
-            .unwrap_or_else(|_e| HeaderTypeNames::Epoch2);
+        let header_type: HeaderTypeNames =
+            row.get("header_type").unwrap_or(HeaderTypeNames::Epoch2);
         let stacks_header: StacksBlockHeaderTypes = {
             match header_type {
                 HeaderTypeNames::Epoch2 => StacksBlockHeader::from_row(row)?.into(),

stackslib/src/chainstate/stacks/miner.rs

@@ -2408,11 +2408,11 @@ impl StacksBlockBuilder {
                                         .elapsed()
                                         .as_millis()
                                         .try_into()
-                                        .unwrap_or_else(|_| i64::MAX);
+                                        .unwrap_or(i64::MAX);
                                     let time_estimate_ms: u64 = time_estimate_ms
                                         .try_into()
                                         // should be unreachable
-                                        .unwrap_or_else(|_| 0);
+                                        .unwrap_or(0);
                                     update_timings.push((txinfo.tx.txid(), time_estimate_ms));
                                 }
 

stackslib/src/cost_estimates/pessimistic.rs

@@ -143,7 +143,7 @@ impl Samples {
     fn flush_sqlite(&self, tx: &SqliteTransaction, identifier: &str) {
         let sql = "INSERT OR REPLACE INTO pessimistic_estimator
                      (estimate_key, current_value, samples) VALUES (?, ?, ?)";
-        let current_value = u64_to_sql(self.mean()).unwrap_or_else(|_| i64::MAX);
+        let current_value = u64_to_sql(self.mean()).unwrap_or(i64::MAX);
         tx.execute(sql, params![identifier, current_value, self.to_json()])
             .expect("SQLite failure");
     }

stackslib/src/monitoring/mod.rs

@@ -132,7 +132,7 @@ pub fn set_last_block_transaction_count(transactions_in_block: u64) {
     // Saturating cast from u64 to i64
     #[cfg(feature = "monitoring_prom")]
     prometheus::LAST_BLOCK_TRANSACTION_COUNT
-        .set(i64::try_from(transactions_in_block).unwrap_or_else(|_| i64::MAX));
+        .set(i64::try_from(transactions_in_block).unwrap_or(i64::MAX));
 }
 
 /// Log `execution_cost` as a ratio of `block_limit`.
@@ -162,7 +162,7 @@ pub fn set_last_mined_block_transaction_count(transactions_in_block: u64) {
     // Saturating cast from u64 to i64
     #[cfg(feature = "monitoring_prom")]
     prometheus::LAST_MINED_BLOCK_TRANSACTION_COUNT
-        .set(i64::try_from(transactions_in_block).unwrap_or_else(|_| i64::MAX));
+        .set(i64::try_from(transactions_in_block).unwrap_or(i64::MAX));
 }
 
 pub fn increment_btc_ops_sent_counter() {