chore: cargo clippy fixes to prepare for the rustc upgrade: 1.95.0 -> 1.97.0

Cargo.Bazel.json.lock

@@ -1,5 +1,5 @@
 {
-  "checksum": "607398f501234430d179782f3255247d0fadba6fd387c0f0b07470d4b0ba3875",
+  "checksum": "3400af9d008b727142c1e50ae09873d3bf926c4b7b2ef5503bd51c4cb1616726",
   "crates": {
     "abnf 0.12.0": {
       "name": "abnf",
@@ -22116,7 +22116,7 @@
               "target": "ethers_core"
             },
             {
-              "id": "ethnum 1.3.2",
+              "id": "ethnum 1.5.3",
               "target": "ethnum"
             },
             {
@@ -23571,7 +23571,7 @@
             ],
             "cfg(windows)": [
               {
-                "id": "windows-sys 0.59.0",
+                "id": "windows-sys 0.61.2",
                 "target": "windows_sys"
               }
             ]
@@ -26373,14 +26373,14 @@
       ],
       "license_file": null
     },
-    "ethnum 1.3.2": {
+    "ethnum 1.5.3": {
       "name": "ethnum",
-      "version": "1.3.2",
+      "version": "1.5.3",
       "package_url": "https://github.com/nlordell/ethnum-rs",
       "repository": {
         "Http": {
-          "url": "https://static.crates.io/crates/ethnum/1.3.2/download",
-          "sha256": "0198b9d0078e0f30dedc7acbb21c974e838fc8fae3ee170128658a98cb2c1c04"
+          "url": "https://static.crates.io/crates/ethnum/1.5.3/download",
+          "sha256": "40404c3f5f511ec4da6fe866ddf6a717c309fdbb69fbbad7b0f3edab8f2e835f"
         }
       },
       "targets": [
@@ -26418,7 +26418,7 @@
           "selects": {}
         },
         "edition": "2021",
-        "version": "1.3.2"
+        "version": "1.5.3"
       },
       "license": "MIT OR Apache-2.0",
       "license_ids": [
@@ -34642,7 +34642,7 @@
               "target": "pin_project_lite"
             },
             {
-              "id": "socket2 0.5.9",
+              "id": "socket2 0.6.1",
               "target": "socket2"
             },
             {
@@ -63730,7 +63730,7 @@
             ],
             "cfg(not(all(target_family = \"wasm\", target_os = \"unknown\")))": [
               {
-                "id": "socket2 0.5.9",
+                "id": "socket2 0.6.1",
                 "target": "socket2"
               }
             ]
@@ -70330,7 +70330,7 @@
                 "alias": "libc_errno"
               },
               {
-                "id": "windows-sys 0.59.0",
+                "id": "windows-sys 0.61.2",
                 "target": "windows_sys"
               }
             ],
@@ -71286,7 +71286,7 @@
             ],
             "cfg(windows)": [
               {
-                "id": "windows-sys 0.59.0",
+                "id": "windows-sys 0.61.2",
                 "target": "windows_sys"
               }
             ]
@@ -71401,7 +71401,7 @@
             ],
             "cfg(windows)": [
               {
-                "id": "windows-sys 0.59.0",
+                "id": "windows-sys 0.61.2",
                 "target": "windows_sys"
               }
             ]
@@ -81542,7 +81542,7 @@
             ],
             "cfg(windows)": [
               {
-                "id": "windows-sys 0.59.0",
+                "id": "windows-sys 0.61.2",
                 "target": "windows_sys"
               }
             ],
@@ -101321,7 +101321,7 @@
     "erased-serde 0.3.28",
     "escargot 0.5.7",
     "ethers-core 2.0.8",
-    "ethnum 1.3.2",
+    "ethnum 1.5.3",
     "evm_rpc_client 0.4.0",
     "evm_rpc_types 3.1.1",
     "exec 0.3.1",

Cargo.Bazel.toml.lock

@@ -4095,7 +4095,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users 0.5.0",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4557,9 +4557,9 @@ dependencies = [
 
 [[package]]
 name = "ethnum"
-version = "1.3.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0198b9d0078e0f30dedc7acbb21c974e838fc8fae3ee170128658a98cb2c1c04"
+checksum = "40404c3f5f511ec4da6fe866ddf6a717c309fdbb69fbbad7b0f3edab8f2e835f"
 dependencies = [
  "serde",
 ]
@@ -5940,7 +5940,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.5.9",
+ "socket2 0.6.1",
  "system-configuration 0.7.0",
  "tokio",
  "tower-layer",
@@ -10788,7 +10788,7 @@ dependencies = [
  "quinn-udp",
  "rustc-hash 2.1.1",
  "rustls 0.23.27",
- "socket2 0.5.9",
+ "socket2 0.6.1",
  "thiserror 2.0.18",
  "tokio",
  "tracing",
@@ -11820,7 +11820,7 @@ dependencies = [
  "errno 0.3.10",
  "libc",
  "linux-raw-sys 0.12.1",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -11963,7 +11963,7 @@ dependencies = [
  "security-framework 3.5.1",
  "security-framework-sys",
  "webpki-root-certs",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -11984,7 +11984,7 @@ dependencies = [
  "security-framework 3.5.1",
  "security-framework-sys",
  "webpki-root-certs",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -13658,7 +13658,7 @@ dependencies = [
  "getrandom 0.3.4",
  "once_cell",
  "rustix 1.1.4",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]

Cargo.toml

@@ -653,7 +653,7 @@ ed25519-dalek = { version = "2.2.0", features = [
     "pem",
     "hazmat",
 ] }
-ethnum = { version = "1.3.2", features = ["serde"] }
+ethnum = { version = "1.5.3", features = ["serde"] }
 evm_rpc_client = "0.4.0"
 evm_rpc_types = "3.1.0"
 flate2 = "1.0.31"

bazel/rust.MODULE.bazel

@@ -455,7 +455,7 @@ crate.spec(
 crate.spec(
     features = ["serde"],
     package = "ethnum",
-    version = "^1.3.2",
+    version = "^1.5.3",
 )
 crate.spec(
     package = "evm_rpc_client",

rs/bitcoin/ckbtc/minter/src/state.rs

@@ -1230,13 +1230,7 @@ impl CkBtcMinterState {
     ) -> Option<&ConsolidateUtxosRequest> {
         self.current_consolidate_utxos_request
             .as_ref()
-            .and_then(|req| {
-                if req.block_index == block_index {
-                    Some(req)
-                } else {
-                    None
-                }
-            })
+            .filter(|&req| req.block_index == block_index)
     }
 
     /// Push a new ConsolidateUtxosRequest.
@@ -1821,7 +1815,7 @@ impl CkBtcMinterState {
                     .get(&input.previous_output)
                     .copied()
                     .unwrap_or_else(|| {
-                        panic!("BUG: no account for outpoint {:?}", &input.previous_output)
+                        panic!("BUG: no account for outpoint {:?}", input.previous_output)
                     }),
             )
         }

rs/bitcoin/ckbtc/minter/src/state/eventlog.rs

@@ -496,7 +496,7 @@ impl EventLogger for CkBtcEventLogger {
                         None => {
                             return Err(ReplayLogError::InconsistentLog(format!(
                                 "Cannot replace a non-existent transaction {}",
-                                &old_txid
+                                old_txid
                             )));
                         }
                     };

rs/bitcoin/ckbtc/minter/src/tx.rs

@@ -42,7 +42,7 @@ pub struct DisplayOutpoint<'a>(pub &'a OutPoint);
 
 impl fmt::Display for DisplayOutpoint<'_> {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(fmt, "{}:{}", &self.0.txid, self.0.vout)
+        write!(fmt, "{}:{}", self.0.txid, self.0.vout)
     }
 }
 

rs/boundary_node/ic_boundary/src/rate_limiting/generic.rs

@@ -110,13 +110,8 @@ impl Bucket {
         }
 
         if let Some(v) = self.rule.canister_id {
-            if let Some(x) = ctx.canister_id {
-                // If we have a canister id - compare it
-                if x != v {
-                    return None;
-                }
-            } else {
-                // Otherwise ignore this rule
+            // If we have a canister id - compare it, otherwise ignore this rule
+            if ctx.canister_id? != v {
                 return None;
             }
         }
@@ -127,14 +122,10 @@ impl Bucket {
             return None;
         }
 
-        if let Some(rgx) = &self.rule.methods_regex {
-            if let Some(v) = ctx.method {
-                if !rgx.is_match(v) {
-                    return None;
-                }
-            } else {
-                return None;
-            }
+        if let Some(rgx) = &self.rule.methods_regex
+            && !rgx.is_match(ctx.method?)
+        {
+            return None;
         }
 
         if let Some(v) = self.rule.ip

rs/canister_client/src/cbor.rs

@@ -30,7 +30,7 @@ pub fn parse_query_response(message: &CBOR) -> Result<RequestStatus, String> {
         )),
         None => Err(format!(
             "Key '{:?}' not found in '{:?}'",
-            status_key, &content
+            status_key, content
         )),
     }?;
 

rs/canister_client/src/http_client.rs

@@ -240,7 +240,7 @@ impl HttpClient {
             let readable_response = if is_update_call {
                 format!("{:?}", serde_cbor::from_slice::<Value>(&parsed_body))
             } else {
-                format!("{:?}", &std::str::from_utf8(&parsed_body))
+                format!("{:?}", std::str::from_utf8(&parsed_body))
             };
 
             return Err(format!(

rs/canister_sandbox/src/replica_controller/sandboxed_execution_controller.rs

@@ -1519,7 +1519,7 @@ impl SandboxedExecutionController {
             .get_ref()
             .resource_limits()
             .maximum_state_delta
-            .and_then(|d| if d.get() != 0 { Some(d) } else { None })
+            .filter(|&d| d.get() != 0)
             .unwrap_or(self.default_subnet_heap_delta_capacity);
         heap_delta_capacity / MAX_SANDBOXES_RSS_TO_HEAP_DELTA_RATIO
     }

rs/canister_sandbox/src/rpc.rs

@@ -252,7 +252,7 @@ impl<Message> ReplyManager<Message> {
 
     pub fn flush_with_errors(&self) {
         let mut mut_repr = self.repr.lock().unwrap();
-        for (_cookie, cell) in mut_repr.cells.iter() {
+        for cell in mut_repr.cells.values() {
             cell.post_result(Err(Error::ServerError));
         }
         mut_repr.cells.clear();

rs/config/src/crypto.rs

@@ -156,15 +156,15 @@ impl CryptoConfig {
         if permissions_owner != 0o700 {
             return Err(format!(
                 "Crypto state directory {} has permissions {:#o}, disallowing owner access",
-                &dir.display(),
+                dir.display(),
                 unix_permission_bits
             ));
         }
         let permissions_all = unix_permission_bits & 0o007;
         if permissions_all != 0 {
             return Err(format!(
                 "Crypto state directory {} has permissions {:#o}, allowing general access",
-                &dir.display(),
+                dir.display(),
                 unix_permission_bits
             ));
         }

rs/consensus/dkg/src/lib.rs

@@ -1009,7 +1009,7 @@ mod tests {
                     "Configs: {:?}",
                     summary.dkg.configs
                 );
-                for (dkg_id, _) in summary.dkg.configs.iter() {
+                for dkg_id in summary.dkg.configs.keys() {
                     assert_eq!(dkg_id.target_subnet, NiDkgTargetSubnet::Local);
                 }
                 assert_eq!(summary.dkg.transcripts_for_remote_subnets.len(), 0);
@@ -1568,7 +1568,7 @@ mod tests {
                         PoolReader::new(&pool_1).get_highest_finalized_summary_block();
                     if let BlockPayload::Summary(summary) = block.payload.as_ref() {
                         assert_eq!(summary.dkg.configs.len(), 2);
-                        for (dkg_id, _) in summary.dkg.configs.iter() {
+                        for dkg_id in summary.dkg.configs.keys() {
                             assert_eq!(dkg_id.target_subnet, NiDkgTargetSubnet::Local);
                         }
                     } else {