chore: upgrade rust version to 1.85.0

Address the new clippy warnings

Author: carver

.circleci/config.yml

@@ -52,7 +52,7 @@ executors:
     environment:
       IMAGE_NAME: portalnetwork/trin
     docker:
-      - image: cimg/rust:1.81.0
+      - image: cimg/rust:1.85.0
   docker-nightly:
     docker:
       - image: rustlang/rust:nightly
@@ -153,7 +153,7 @@ jobs:
     resource_class: xlarge
     executor:
       name: rust/default
-      tag: 1.81.0
+      tag: 1.85.0
     environment:
       RUSTFLAGS: "-D warnings"
       RUST_LOG: "debug"
@@ -174,7 +174,7 @@ jobs:
     resource_class: xlarge
     executor:
       name: rust/default
-      tag: 1.81.0
+      tag: 1.85.0
     environment:
       RUSTFLAGS: "-D warnings"
       RUST_LOG: "debug"
@@ -211,7 +211,7 @@ jobs:
     resource_class: 2xlarge
     executor:
       name: rust/default
-      tag: 1.81.0
+      tag: 1.85.0
     environment:
       RUSTFLAGS: "-D warnings"
       RUST_LOG: "debug,html5ever=error,selectors=error,discv5::service=info"
@@ -231,7 +231,7 @@ jobs:
   check-workspace-crates:
     executor:
       name: rust/default
-      tag: 1.81.0
+      tag: 1.85.0
     # parallelism level should be set to the amount of simulators we have or greater
     # The reason for this is the CI code currently only supports 1 input at a time
     # if we have a parallelism level of 5 and 6 sims one test runner will get 2 test sims and fail

Cargo.toml

@@ -32,7 +32,7 @@ keywords = ["ethereum", "portal-network"]
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/ethereum/trin"
-rust-version = "1.81.0"
+rust-version = "1.85.0"
 version = "0.2.1"
 
 [workspace.dependencies]

bin/trin-execution/src/evm/block_executor.rs

@@ -63,7 +63,7 @@ pub struct BlockExecutor<'a> {
     cumulative_gas_used: u64,
 }
 
-impl<'a> BlockExecutor<'a> {
+impl BlockExecutor<'_> {
     pub fn new(database: EvmDB) -> Self {
         let state_database = State::builder()
             .with_database(database)

bin/trin-execution/src/trie_walker/mod.rs

@@ -126,10 +126,7 @@ impl<DB: TrieWalkerDb> Iterator for TrieWalker<DB> {
     type Item = TrieProof;
 
     fn next(&mut self) -> Option<Self::Item> {
-        let next_proof = match self.stack.pop() {
-            Some(next_proof) => next_proof,
-            None => return None,
-        };
+        let next_proof = self.stack.pop()?;
 
         let TrieProof { path, proof } = &next_proof;
         let last_node = proof.last().expect("Proof is empty");

book/src/developers/quick_setup.md

@@ -83,7 +83,7 @@ rustc --version
 You should see something like:
 
 ```bash
-rustc 1.81.0 (051478957 2024-07-21)
+rustc 1.85.0 (4d91de4e4 2025-02-17)
 ```
 
 Next, install the required dependencies:

crates/ethportal-api/src/types/ping_extensions/extensions/type_0.rs

@@ -165,10 +165,7 @@ impl FromStr for ClientInfo {
     type Err = anyhow::Error;
 
     fn from_str(string: &str) -> Result<Self, anyhow::Error> {
-        ensure!(
-            string.as_bytes().len() <= 200,
-            "Client info string is too long"
-        );
+        ensure!(string.len() <= 200, "Client info string is too long");
         let parts: Vec<&str> = string.split('/').collect();
 
         if parts.len() != 4 {

crates/ethportal-api/src/types/state_trie/nibbles.rs

@@ -51,12 +51,12 @@ impl Encode for Nibbles {
             buf.push(0);
             self.nibbles
                 .chunks_exact(2)
-                .for_each(|x| buf.push(x[0] << 4 | x[1]));
+                .for_each(|x| buf.push((x[0] << 4) | x[1]));
         } else {
             buf.push(0x10 | self.nibbles[0]);
             self.nibbles[1..]
                 .chunks_exact(2)
-                .for_each(|x| buf.push(x[0] << 4 | x[1]));
+                .for_each(|x| buf.push((x[0] << 4) | x[1]));
         }
     }
 

crates/validation/src/merkle/safe_arith.rs

@@ -1,6 +1,6 @@
-///
-/// Code sourced from:
-/// https://github.com/sigp/lighthouse/blob/bf533c8e42/consensus/safe_arith/src/lib.rs
+//!
+//! Code sourced from:
+//! https://github.com/sigp/lighthouse/blob/bf533c8e42/consensus/safe_arith/src/lib.rs
 
 /// Extension trait for iterators, providing a safe replacement for `sum`.
 pub trait SafeArithIter<T> {

rust-toolchain.toml

@@ -2,4 +2,4 @@
 # The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy.
 # https://rust-lang.github.io/rustup/concepts/profiles.html
 profile = "default"
-channel = "1.81.0"
+channel = "1.85.0"

testing/utp/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.81.0-bullseye AS builder
+FROM rust:1.85.0-bullseye AS builder
 
 RUN apt-get update \
  && apt-get install clang -y \