Update code base to Rust edition 2024 (#2086)

* Update Cargo.toml

* Run rustfmt

* Fix all compilation errors in library

* Fix all other compilation errors

* Fix all warnings

* Future is now in prelude

* No need for manual noop waker anymore

* Update Rust version in CI

* Remove all unnecessary ` + '_`

* More removal

* Fix errors regarding noop waker

* Remove many more unnecessary `<'_>`

* Rustfmt

Author: tomaka

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
   test-64bits:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.82
+      image: rust:1.85
     steps:
     - uses: actions/checkout@v4
     - uses: Swatinem/rust-cache@v2
@@ -39,7 +39,7 @@ jobs:
   test-32bits:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.82
+      image: rust:1.85
     steps:
     - run: apt-get update && apt install -y libc6-dev-i386
     - uses: actions/checkout@v4
@@ -50,7 +50,7 @@ jobs:
   wasm-node-check:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.82
+      image: rust:1.85
     steps:
     - uses: actions/checkout@v4
     - run: rustup target add wasm32-unknown-unknown
@@ -67,7 +67,7 @@ jobs:
   check-features:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.82
+      image: rust:1.85
     steps:
     - uses: actions/checkout@v4
     - uses: Swatinem/rust-cache@v2
@@ -101,7 +101,7 @@ jobs:
   check-no-std:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.82
+      image: rust:1.85
     steps:
     - uses: actions/checkout@v4
     - run: rustup target add thumbv7m-none-eabi
@@ -113,7 +113,7 @@ jobs:
   check-rustdoc-links:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.82
+      image: rust:1.85
     steps:
     - uses: actions/checkout@v4
     - uses: Swatinem/rust-cache@v2
@@ -122,7 +122,7 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.82
+      image: rust:1.85
     steps:
       # Checks `rustfmt` formatting
       - uses: actions/checkout@v4
@@ -136,7 +136,7 @@ jobs:
   clippy:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.82
+      image: rust:1.85
     steps:
       - uses: actions/checkout@v4
         # Since build artifacts are specific to a nightly version, we pin the specific nightly
@@ -177,7 +177,7 @@ jobs:
   wasm-node-versions-match:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.82
+      image: rust:1.85
     steps:
       - uses: actions/checkout@v4
       - run: apt-get update && apt install -y jq

.github/workflows/deploy.yml

@@ -56,7 +56,7 @@ jobs:
   build-js-doc:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.82
+      image: rust:1.85
     steps:
       - uses: actions/checkout@v4
         with:
@@ -83,7 +83,7 @@ jobs:
   build-rust-doc:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.82
+      image: rust:1.85
     steps:
       - uses: actions/checkout@v4
         with:
@@ -104,7 +104,7 @@ jobs:
   build-tests-coverage:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.82
+      image: rust:1.85
     steps:
       - run: apt update && apt install -y jq
       - run: rustup component add llvm-tools-preview
@@ -174,7 +174,7 @@ jobs:
   npm-publish:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.82
+      image: rust:1.85
     steps:
       - uses: actions/checkout@v4
       - run: rustup target add wasm32-unknown-unknown
@@ -218,7 +218,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           # Ideally we don't want to install any toolchain, but the GH action doesn't support this.
-          toolchain: 1.82
+          toolchain: 1.85
           profile: minimal
       - uses: Swatinem/rust-cache@v2
       - id: compute-tag  # Compute the tag that we might push.
@@ -245,7 +245,7 @@ jobs:
   crates-io-publish:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.82
+      image: rust:1.85
     steps:
       - uses: actions/checkout@v4
       - run: cargo publish --dry-run --locked

.github/workflows/periodic-cargo-update.yml

@@ -9,7 +9,7 @@ jobs:
   cargo-update:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.82
+      image: rust:1.85
     steps:
     - uses: actions/checkout@v4
     # Note: `cargo update --workspace` doesn't seem to have any effect.

Cargo.toml

@@ -11,7 +11,7 @@ members = [
 [workspace.package]
 authors = ["Parity Technologies <admin@parity.io>", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/smol-dot/smoldot"
 include = ["**/*.rs"]  # Only Rust files are included, as anything else might be a test fixture.
 

full-node/bin/cli.rs

@@ -32,8 +32,8 @@
 use smoldot::{
     identity::seed_phrase,
     libp2p::{
-        multiaddr::{Multiaddr, Protocol},
         PeerId,
+        multiaddr::{Multiaddr, Protocol},
     },
 };
 use std::{io, net::SocketAddr, path::PathBuf};

full-node/src/consensus_service.rs

@@ -24,14 +24,13 @@
 // TODO: doc
 // TODO: re-review this once finished
 
-use crate::{database_thread, jaeger_service, network_service, LogCallback, LogLevel};
+use crate::{LogCallback, LogLevel, database_thread, jaeger_service, network_service};
 
 use futures_channel::{mpsc, oneshot};
 use futures_lite::FutureExt as _;
 use futures_util::{
-    future,
+    SinkExt as _, StreamExt as _, future,
     stream::{self, FuturesUnordered},
-    SinkExt as _, StreamExt as _,
 };
 use hashbrown::HashSet;
 use rand::seq::IteratorRandom;
@@ -52,9 +51,7 @@ use smoldot::{
 use std::{
     array,
     borrow::Cow,
-    cmp,
-    future::Future,
-    iter,
+    cmp, iter,
     num::NonZero,
     pin::Pin,
     sync::Arc,
@@ -227,7 +224,7 @@ impl ConsensusService {
                         match database.to_chain_information(&finalized_block_hash) {
                             Ok(info) => info,
                             Err(full_sqlite::StorageAccessError::Corrupted(err)) => {
-                                return Err(InitError::DatabaseCorruption(err))
+                                return Err(InitError::DatabaseCorruption(err));
                             }
                             Err(full_sqlite::StorageAccessError::IncompleteStorage)
                             | Err(full_sqlite::StorageAccessError::UnknownBlock) => unreachable!(),
@@ -240,7 +237,7 @@ impl ConsensusService {
                         Ok(Some((code, _))) => code,
                         Ok(None) => return Err(InitError::FinalizedCodeMissing),
                         Err(full_sqlite::StorageAccessError::Corrupted(err)) => {
-                            return Err(InitError::DatabaseCorruption(err))
+                            return Err(InitError::DatabaseCorruption(err));
                         }
                         Err(full_sqlite::StorageAccessError::IncompleteStorage)
                         | Err(full_sqlite::StorageAccessError::UnknownBlock) => unreachable!(),
@@ -253,7 +250,7 @@ impl ConsensusService {
                         Ok(Some((hp, _))) => Some(hp),
                         Ok(None) => None,
                         Err(full_sqlite::StorageAccessError::Corrupted(err)) => {
-                            return Err(InitError::DatabaseCorruption(err))
+                            return Err(InitError::DatabaseCorruption(err));
                         }
                         Err(full_sqlite::StorageAccessError::IncompleteStorage)
                         | Err(full_sqlite::StorageAccessError::UnknownBlock) => unreachable!(),
@@ -1138,23 +1135,25 @@ impl SyncBackground {
                                     request: all::DesiredRequest::StorageGetMerkleProof {
                                         block_hash: missing_item.hash,
                                         state_trie_root: [0; 32], // TODO: wrong, but field value unused so it's fine temporarily
-                                        keys: vec![trie::nibbles_to_bytes_suffix_extend(
-                                            missing_item
-                                                .trie_node_key_nibbles
-                                                .into_iter()
-                                                // In order to download more than one item at a time,
-                                                // we add some randomly-generated nibbles to the
-                                                // requested key. The request will target the missing
-                                                // key plus a few other random keys.
-                                                .chain((0..32).map(|_| {
-                                                    rand::Rng::gen_range(
-                                                        &mut rand::thread_rng(),
-                                                        0..16,
-                                                    )
-                                                }))
-                                                .map(|n| trie::Nibble::try_from(n).unwrap()),
-                                        )
-                                        .collect::<Vec<_>>()],
+                                        keys: vec![
+                                            trie::nibbles_to_bytes_suffix_extend(
+                                                missing_item
+                                                    .trie_node_key_nibbles
+                                                    .into_iter()
+                                                    // In order to download more than one item at a time,
+                                                    // we add some randomly-generated nibbles to the
+                                                    // requested key. The request will target the missing
+                                                    // key plus a few other random keys.
+                                                    .chain((0..32).map(|_| {
+                                                        rand::Rng::gen_range(
+                                                            &mut rand::thread_rng(),
+                                                            0..16,
+                                                        )
+                                                    }))
+                                                    .map(|n| trie::Nibble::try_from(n).unwrap()),
+                                            )
+                                            .collect::<Vec<_>>(),
+                                        ],
                                     },
                                     database_catch_up_type: DbCatchUpType::Database,
                                 };
@@ -3042,12 +3041,12 @@ pub async fn execute_block_and_insert(
             Err(RuntimeCallError::RuntimeStartError(error)) => {
                 return Err(ExecuteBlockError::VerificationFailure(
                     ExecuteBlockVerificationFailureError::RuntimeStartError(error),
-                ))
+                ));
             }
             Err(RuntimeCallError::RuntimeExecutionError(error)) => {
                 return Err(ExecuteBlockError::InvalidBlock(
                     ExecuteBlockInvalidBlockError::RuntimeExecutionError(error),
-                ))
+                ));
             }
             Err(RuntimeCallError::DatabaseParentAccess(error)) => {
                 return Err(ExecuteBlockError::VerificationFailure(
@@ -3058,17 +3057,17 @@ pub async fn execute_block_and_insert(
                             parameter: call_parameter.to_owned(),
                         },
                     },
-                ))
+                ));
             }
             Err(RuntimeCallError::ForbiddenHostFunction) => {
                 return Err(ExecuteBlockError::VerificationFailure(
                     ExecuteBlockVerificationFailureError::ForbiddenHostFunction,
-                ))
+                ));
             }
             Err(RuntimeCallError::DatabaseInvalidStateTrieVersion) => {
                 return Err(ExecuteBlockError::VerificationFailure(
                     ExecuteBlockVerificationFailureError::DatabaseInvalidStateTrieVersion,
-                ))
+                ));
             }
         }
     }
@@ -3086,7 +3085,7 @@ pub async fn execute_block_and_insert(
                 Some(None) => {
                     return Err(ExecuteBlockError::InvalidBlock(
                         ExecuteBlockInvalidBlockError::EmptyCode,
-                    ))
+                    ));
                 }
                 None => {
                     let parent_block_hash = *parent_block_hash;
@@ -3104,7 +3103,7 @@ pub async fn execute_block_and_insert(
                         Ok(None) => {
                             return Err(ExecuteBlockError::VerificationFailure(
                                 ExecuteBlockVerificationFailureError::ParentCodeEmptyInDatabase,
-                            ))
+                            ));
                         }
                         Err(error) => return Err(ExecuteBlockError::VerificationFailure(
                             ExecuteBlockVerificationFailureError::DatabaseParentAccess {

full-node/src/jaeger_service.rs

@@ -36,9 +36,7 @@
 
 use smol::{future, net::UdpSocket};
 use smoldot::libp2p::PeerId;
-use std::{
-    convert::TryFrom as _, future::Future, io, net::SocketAddr, num::NonZero, pin::Pin, sync::Arc,
-};
+use std::{convert::TryFrom as _, io, net::SocketAddr, num::NonZero, pin::Pin, sync::Arc};
 
 /// Configuration for a [`JaegerService`].
 pub struct Config<'a> {

full-node/src/json_rpc_service.rs

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::{consensus_service, database_thread, network_service, LogCallback, LogLevel};
+use crate::{LogCallback, LogLevel, consensus_service, database_thread, network_service};
 use futures_channel::oneshot;
 use futures_util::FutureExt;
 use smol::{
@@ -24,14 +24,13 @@ use smol::{
 };
 use smoldot::json_rpc::{methods, service};
 use std::{
-    future::Future,
     io, mem,
     net::SocketAddr,
     num::NonZero,
     pin::Pin,
     sync::{
-        atomic::{AtomicU32, Ordering},
         Arc,
+        atomic::{AtomicU32, Ordering},
     },
     time::Duration,
 };
@@ -125,7 +124,7 @@ impl JsonRpcService {
                             return Err(InitError::ListenError {
                                 bind_address: *addr,
                                 error,
-                            })
+                            });
                         }
                     };
 
@@ -135,7 +134,7 @@ impl JsonRpcService {
                     return Err(InitError::ListenError {
                         bind_address: *addr,
                         error,
-                    })
+                    });
                 }
             },
             None => (None, None),

full-node/src/json_rpc_service/chain_head_subscriptions.rs

@@ -25,7 +25,6 @@ use smoldot::{
     json_rpc::{methods, service},
 };
 use std::{
-    future::Future,
     num::NonZero,
     pin::{self, Pin},
     sync::Arc,

full-node/src/json_rpc_service/legacy_api_subscriptions.rs

@@ -19,7 +19,7 @@ use hashbrown::HashMap;
 use smol::stream::StreamExt as _;
 use smoldot::{
     chain::fork_tree,
-    executor::{host::HostVmPrototype, CoreVersion},
+    executor::{CoreVersion, host::HostVmPrototype},
     trie,
 };
 use std::{collections::BTreeSet, iter, mem, num::NonZero, ops, pin::Pin, sync::Arc};
@@ -662,11 +662,8 @@ impl SubscribeStorage {
 
     /// Returns the next storage change notification.
     pub async fn next_storage_update(
-        &'_ mut self,
-    ) -> (
-        [u8; 32],
-        impl Iterator<Item = (Vec<u8>, Option<Vec<u8>>)> + '_,
-    ) {
+        &mut self,
+    ) -> ([u8; 32], impl Iterator<Item = (Vec<u8>, Option<Vec<u8>>)>) {
         'main_subscription: loop {
             // Get the active consensus service subscription, or subscribe if necessary.
             let subscription = match &mut self.subscription {