From 0ff2827a799a5a77c40b169bee07f9ca415b78d9 Mon Sep 17 00:00:00 2001 From: Hoa Nguyen Date: Sat, 30 Nov 2024 18:09:49 +0700 Subject: [PATCH] refactor: use is_none_or instead of map_or (#13035) --- crates/net/eth-wire/src/capability.rs | 2 +- crates/primitives-traits/src/account.rs | 2 +- crates/revm/src/batch.rs | 2 +- crates/static-file/types/src/lib.rs | 2 +- crates/tracing/src/formatter.rs | 2 +- crates/transaction-pool/src/maintain.rs | 2 +- crates/transaction-pool/src/pool/best.rs | 2 +- crates/trie/trie/src/trie_cursor/subnode.rs | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crates/net/eth-wire/src/capability.rs b/crates/net/eth-wire/src/capability.rs index 3d8c61800..1e1bb1b20 100644 --- a/crates/net/eth-wire/src/capability.rs +++ b/crates/net/eth-wire/src/capability.rs @@ -335,7 +335,7 @@ pub fn shared_capability_offsets( // highest wins, others are ignored if shared_capabilities .get(&peer_capability.name) - .map_or(true, |v| peer_capability.version > v.version) + .is_none_or(|v| peer_capability.version > v.version) { shared_capabilities.insert( peer_capability.name.clone(), diff --git a/crates/primitives-traits/src/account.rs b/crates/primitives-traits/src/account.rs index c8504f3b6..398294b09 100644 --- a/crates/primitives-traits/src/account.rs +++ b/crates/primitives-traits/src/account.rs @@ -49,7 +49,7 @@ impl Account { pub fn is_empty(&self) -> bool { self.nonce == 0 && self.balance.is_zero() && - self.bytecode_hash.map_or(true, |hash| hash == KECCAK_EMPTY) + self.bytecode_hash.is_none_or(|hash| hash == KECCAK_EMPTY) } /// Returns an account bytecode's hash. diff --git a/crates/revm/src/batch.rs b/crates/revm/src/batch.rs index 01b0bd421..36708b5ff 100644 --- a/crates/revm/src/batch.rs +++ b/crates/revm/src/batch.rs @@ -112,7 +112,7 @@ impl BlockBatchRecord { /// Returns the [`BundleRetention`] for the given block based on the configured prune modes. pub fn bundle_retention(&self, block_number: BlockNumber) -> BundleRetention { - if self.tip.map_or(true, |tip| { + if self.tip.is_none_or(|tip| { !self .prune_modes .account_history diff --git a/crates/static-file/types/src/lib.rs b/crates/static-file/types/src/lib.rs index 4e9bf90f1..4fc9c545e 100644 --- a/crates/static-file/types/src/lib.rs +++ b/crates/static-file/types/src/lib.rs @@ -92,7 +92,7 @@ impl StaticFileTargets { ] .iter() .all(|(target_block_range, highest_static_fileted_block)| { - target_block_range.map_or(true, |target_block_range| { + target_block_range.is_none_or(|target_block_range| { *target_block_range.start() == highest_static_fileted_block.map_or(0, |highest_static_fileted_block| { highest_static_fileted_block + 1 diff --git a/crates/tracing/src/formatter.rs b/crates/tracing/src/formatter.rs index 1322377f1..202a92136 100644 --- a/crates/tracing/src/formatter.rs +++ b/crates/tracing/src/formatter.rs @@ -54,7 +54,7 @@ impl LogFormat { .unwrap_or_else(|_| // If `RUST_LOG_TARGET` is not set, show target in logs only if the max enabled // level is higher than INFO (DEBUG, TRACE) - filter.max_level_hint().map_or(true, |max_level| max_level > tracing::Level::INFO)); + filter.max_level_hint().is_none_or(|max_level| max_level > tracing::Level::INFO)); match self { Self::Json => { diff --git a/crates/transaction-pool/src/maintain.rs b/crates/transaction-pool/src/maintain.rs index 6cf2faad9..cb75af7db 100644 --- a/crates/transaction-pool/src/maintain.rs +++ b/crates/transaction-pool/src/maintain.rs @@ -461,7 +461,7 @@ impl FinalizedBlockTracker { let finalized = finalized_block?; self.last_finalized_block .replace(finalized) - .map_or(true, |last| last < finalized) + .is_none_or(|last| last < finalized) .then_some(finalized) } } diff --git a/crates/transaction-pool/src/pool/best.rs b/crates/transaction-pool/src/pool/best.rs index a4c91aae7..ed94bc676 100644 --- a/crates/transaction-pool/src/pool/best.rs +++ b/crates/transaction-pool/src/pool/best.rs @@ -57,7 +57,7 @@ impl Iterator for BestTransactionsWithFees { if best.transaction.max_fee_per_gas() >= self.base_fee as u128 && best.transaction .max_fee_per_blob_gas() - .map_or(true, |fee| fee >= self.base_fee_per_blob_gas as u128) + .is_none_or(|fee| fee >= self.base_fee_per_blob_gas as u128) { return Some(best); } diff --git a/crates/trie/trie/src/trie_cursor/subnode.rs b/crates/trie/trie/src/trie_cursor/subnode.rs index c928028eb..457c1ba46 100644 --- a/crates/trie/trie/src/trie_cursor/subnode.rs +++ b/crates/trie/trie/src/trie_cursor/subnode.rs @@ -76,7 +76,7 @@ impl CursorSubNode { pub fn state_flag(&self) -> bool { self.node .as_ref() - .map_or(true, |node| self.nibble < 0 || node.state_mask.is_bit_set(self.nibble as u8)) + .is_none_or(|node| self.nibble < 0 || node.state_mask.is_bit_set(self.nibble as u8)) } /// Returns `true` if the tree flag is set for the current nibble. @@ -84,7 +84,7 @@ impl CursorSubNode { pub fn tree_flag(&self) -> bool { self.node .as_ref() - .map_or(true, |node| self.nibble < 0 || node.tree_mask.is_bit_set(self.nibble as u8)) + .is_none_or(|node| self.nibble < 0 || node.tree_mask.is_bit_set(self.nibble as u8)) } /// Returns `true` if the current nibble has a root hash.