fix clippy

Author: yiweichi

crates/era-downloader/src/fs.rs

@@ -43,7 +43,7 @@ pub fn read_dir(
         .collect::<eyre::Result<Vec<_>>>()?;
     let mut checksums = checksums.ok_or_eyre("Missing file `checksums.txt` in the `dir`")?;
 
-    entries.sort_by(|(left, _), (right, _)| left.cmp(right));
+    entries.sort_by_key(|(left, _)| *left);
 
     Ok(stream::iter(entries.into_iter().skip(start_from as usize / BLOCKS_PER_FILE).map(
         move |(_, path)| {

crates/net/discv4/src/lib.rs

@@ -1628,7 +1628,7 @@ impl Discv4Service {
             .filter(|entry| entry.node.value.is_expired())
             .map(|n| n.node.value)
             .collect::<Vec<_>>();
-        nodes.sort_by(|a, b| a.last_seen.cmp(&b.last_seen));
+        nodes.sort_by_key(|a| a.last_seen);
         let to_ping = nodes.into_iter().map(|n| n.record).take(MAX_NODES_PING).collect::<Vec<_>>();
         for node in to_ping {
             self.try_ping(node, PingReason::RePing)

crates/scroll/alloy/evm/src/block/curie.rs

@@ -151,7 +151,7 @@ mod tests {
 
         // check oracle storage changeset
         let mut storage = oracle.storage.into_iter().collect::<Vec<(U256, StorageSlot)>>();
-        storage.sort_by(|(a, _), (b, _)| a.cmp(b));
+        storage.sort_by_key(|(a, _)| *a);
         for (got, expected) in storage.into_iter().zip(CURIE_L1_GAS_PRICE_ORACLE_STORAGE) {
             assert_eq!(got.0, expected.0);
             assert_eq!(got.1, StorageSlot { present_value: expected.1, ..Default::default() });

crates/scroll/alloy/evm/src/block/feynman.rs

@@ -148,7 +148,7 @@ mod tests {
 
         // check oracle storage changeset
         let mut storage = oracle.storage.into_iter().collect::<Vec<(U256, StorageSlot)>>();
-        storage.sort_by(|(a, _), (b, _)| a.cmp(b));
+        storage.sort_by_key(|(a, _)| *a);
         for (got, expected) in storage.into_iter().zip(FEYNMAN_L1_GAS_PRICE_ORACLE_STORAGE) {
             assert_eq!(got.0, expected.0);
             assert_eq!(got.1, StorageSlot { present_value: expected.1, ..Default::default() });

crates/scroll/alloy/evm/src/block/galileo_v2.rs

@@ -148,7 +148,7 @@ mod tests {
 
         // check oracle storage changeset
         let mut storage = oracle.storage.into_iter().collect::<Vec<(U256, StorageSlot)>>();
-        storage.sort_by(|(a, _), (b, _)| a.cmp(b));
+        storage.sort_by_key(|(a, _)| *a);
         for (got, expected) in storage.into_iter().zip(GALILEO_V2_L1_GAS_PRICE_ORACLE_STORAGE) {
             assert_eq!(got.0, expected.0);
             assert_eq!(got.1, StorageSlot { present_value: expected.1, ..Default::default() });

crates/scroll/evm/src/execute.rs

@@ -446,7 +446,7 @@ mod tests {
 
         // check oracle contract contains storage changeset
         let mut storage = oracle.storage.into_iter().collect::<Vec<(U256, StorageSlot)>>();
-        storage.sort_by(|(a, _), (b, _)| a.cmp(b));
+        storage.sort_by_key(|(a, _)| *a);
         for (got, expected) in storage.into_iter().zip(CURIE_L1_GAS_PRICE_ORACLE_STORAGE) {
             assert_eq!(got.0, expected.0);
             assert_eq!(got.1, StorageSlot { present_value: expected.1, ..Default::default() });

crates/stages/stages/src/stages/hashing_account.rs

@@ -99,7 +99,7 @@ impl AccountHashingStage {
             // Account State generator
             let mut account_cursor =
                 provider.tx_ref().cursor_write::<tables::PlainAccountState>()?;
-            accounts.sort_by(|a, b| a.0.cmp(&b.0));
+            accounts.sort_by_key(|a| a.0);
             for (addr, acc) in &accounts {
                 account_cursor.append(*addr, acc)?;
             }

crates/trie/common/src/updates.rs

@@ -130,7 +130,7 @@ impl TrieUpdates {
             .collect::<Vec<_>>();
 
         account_nodes.extend(self.removed_nodes.drain().map(|path| (path, None)));
-        account_nodes.sort_unstable_by(|a, b| a.0.cmp(&b.0));
+        account_nodes.sort_unstable_by_key(|a| a.0);
 
         let storage_tries = self
             .storage_tries
@@ -276,7 +276,7 @@ impl StorageTrieUpdates {
             .collect::<Vec<_>>();
 
         storage_nodes.extend(self.removed_nodes.into_iter().map(|path| (path, None)));
-        storage_nodes.sort_unstable_by(|a, b| a.0.cmp(&b.0));
+        storage_nodes.sort_unstable_by_key(|a| a.0);
 
         StorageTrieUpdatesSorted { is_deleted: self.is_deleted, storage_nodes }
     }

crates/trie/trie/src/verify.rs

@@ -141,7 +141,7 @@ impl<H: HashedCursorFactory + Clone> Iterator for StateRootBranchNodesIter<H> {
             // By sorting by the account we ensure that we continue with the partially processed
             // trie (the last of the previous run) first. We sort in reverse order because we pop
             // off of this Vec.
-            self.storage_tries.sort_unstable_by(|a, b| b.0.cmp(&a.0));
+            self.storage_tries.sort_unstable_by_key(|b| std::cmp::Reverse(b.0));
 
             // loop back to the top.
         }

deny.toml

@@ -62,6 +62,7 @@ exceptions = [
     # TODO: decide on MPL-2.0 handling
     # These dependencies are grandfathered in https://github.com/paradigmxyz/reth/pull/6980
     { allow = ["MPL-2.0"], name = "option-ext" },
+    { allow = ["MPL-2.0"], name = "webpki-root-certs" },
 ]
 
 # Skip the poseidon-bn254, bn254 and zktrie crates for license verification. We should at some point publish a license for them.