Update Rust to v1.89 (smol-dot#2159)

* Update Rust to v1.89

* Use `addr()` instead of `as usize`

Author: tomaka

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
   test-64bits:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.88
+      image: rust:1.89
     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.88
+      image: rust:1.89
     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.88
+      image: rust:1.89
     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.88
+      image: rust:1.89
     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.88
+      image: rust:1.89
     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.88
+      image: rust:1.89
     steps:
     - uses: actions/checkout@v4
     - uses: Swatinem/rust-cache@v2
@@ -122,7 +122,7 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.88
+      image: rust:1.89
     steps:
       # Checks `rustfmt` formatting
       - uses: actions/checkout@v4
@@ -136,7 +136,7 @@ jobs:
   clippy:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.88
+      image: rust:1.89
     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.88
+      image: rust:1.89
     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.88
+      image: rust:1.89
     steps:
       - uses: actions/checkout@v4
         with:
@@ -83,7 +83,7 @@ jobs:
   build-rust-doc:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.88
+      image: rust:1.89
     steps:
       - uses: actions/checkout@v4
         with:
@@ -104,7 +104,7 @@ jobs:
   build-tests-coverage:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.88
+      image: rust:1.89
     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.88
+      image: rust:1.89
     steps:
       - uses: actions/checkout@v4
       - run: rustup target add wasm32-unknown-unknown
@@ -245,7 +245,7 @@ jobs:
   crates-io-publish:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.88
+      image: rust:1.89
     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.88
+      image: rust:1.89
     steps:
     - uses: actions/checkout@v4
     # Note: `cargo update --workspace` doesn't seem to have any effect.

full-node/src/consensus_service.rs

@@ -114,10 +114,6 @@ pub struct Config {
     pub slot_duration_author_ratio: u16,
 }
 
-/// Identifier for a blocks request to be performed.
-#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
-pub struct BlocksRequestId(usize);
-
 /// Summary of the state of the [`ConsensusService`].
 #[derive(Debug, Clone)]
 pub struct SyncState {

full-node/src/json_rpc_service/chain_head_subscriptions.rs

@@ -305,7 +305,7 @@ pub async fn spawn_chain_head_subscription_task(config: Config) -> String {
     return_value
 }
 
-fn convert_runtime_spec(runtime: &executor::CoreVersion) -> methods::MaybeRuntimeSpec {
+fn convert_runtime_spec(runtime: &'_ executor::CoreVersion) -> methods::MaybeRuntimeSpec<'_> {
     let runtime = runtime.decode();
     methods::MaybeRuntimeSpec::Valid {
         spec: methods::RuntimeSpec {

full-node/src/json_rpc_service/requests_handler.rs

@@ -832,7 +832,7 @@ pub fn spawn_requests_handler(config: Config) {
     }));
 }
 
-fn convert_runtime_version(runtime_spec: &executor::CoreVersion) -> methods::RuntimeVersion {
+fn convert_runtime_version(runtime_spec: &'_ executor::CoreVersion) -> methods::RuntimeVersion<'_> {
     let runtime_spec = runtime_spec.decode();
     methods::RuntimeVersion {
         spec_name: runtime_spec.spec_name.into(),

lib/src/chain/blocks_tree.rs

@@ -246,7 +246,7 @@ impl<T> NonFinalizedTree<T> {
 
     /// Returns the header of all known non-finalized blocks in the chain without any specific
     /// order.
-    pub fn iter_unordered(&self) -> impl Iterator<Item = header::HeaderRef> {
+    pub fn iter_unordered(&'_ self) -> impl Iterator<Item = header::HeaderRef<'_>> {
         self.blocks
             .iter_unordered()
             .map(move |(_, b)| header::decode(&b.header, self.block_number_bytes).unwrap())
@@ -256,7 +256,7 @@ impl<T> NonFinalizedTree<T> {
     ///
     /// The returned items are guaranteed to be in an order in which the parents are found before
     /// their children.
-    pub fn iter_ancestry_order(&self) -> impl Iterator<Item = header::HeaderRef> {
+    pub fn iter_ancestry_order(&'_ self) -> impl Iterator<Item = header::HeaderRef<'_>> {
         self.blocks
             .iter_ancestry_order()
             .map(move |(_, b)| header::decode(&b.header, self.block_number_bytes).unwrap())
@@ -281,7 +281,7 @@ impl<T> NonFinalizedTree<T> {
 
     /// Builds a [`chain_information::ChainInformationRef`] struct that might later be used to
     /// build a new [`NonFinalizedTree`].
-    pub fn as_chain_information(&self) -> chain_information::ValidChainInformationRef {
+    pub fn as_chain_information(&'_ self) -> chain_information::ValidChainInformationRef<'_> {
         let attempt = chain_information::ChainInformationRef {
             finalized_block_header: header::decode(
                 &self.finalized_block_header,
@@ -376,7 +376,7 @@ impl<T> NonFinalizedTree<T> {
     }
 
     /// Returns consensus information about the current best block of the chain.
-    pub fn best_block_consensus(&self) -> chain_information::ChainInformationConsensusRef {
+    pub fn best_block_consensus(&'_ self) -> chain_information::ChainInformationConsensusRef<'_> {
         match (
             &self.finalized_consensus,
             self.blocks_by_best_score

lib/src/chain/blocks_tree/finality.rs

@@ -71,11 +71,11 @@ impl<T> NonFinalizedTree<T> {
     /// verification is nonetheless deterministic.
     // TODO: expand the documentation about how blocks with authorities changes have to be finalized before any further block can be finalized
     pub fn verify_justification(
-        &mut self,
+        &'_ mut self,
         consensus_engine_id: [u8; 4],
         scale_encoded_justification: &[u8],
         randomness_seed: [u8; 32],
-    ) -> Result<FinalityApply<T>, JustificationVerifyError> {
+    ) -> Result<FinalityApply<'_, T>, JustificationVerifyError> {
         match (&self.finality, &consensus_engine_id) {
             (Finality::Grandpa { .. }, b"FRNK") => {
                 // Turn justification into a strongly-typed struct.
@@ -121,10 +121,10 @@ impl<T> NonFinalizedTree<T> {
     /// A randomness seed must be provided and will be used during the verification. Note that the
     /// verification is nonetheless deterministic.
     pub fn verify_grandpa_commit_message(
-        &mut self,
+        &'_ mut self,
         scale_encoded_commit: &[u8],
         randomness_seed: [u8; 32],
-    ) -> Result<FinalityApply<T>, CommitVerifyError> {
+    ) -> Result<FinalityApply<'_, T>, CommitVerifyError> {
         // The code below would panic if the chain doesn't use Grandpa.
         if !matches!(self.finality, Finality::Grandpa { .. }) {
             return Err(CommitVerifyError::NotGrandpa);
@@ -202,9 +202,9 @@ impl<T> NonFinalizedTree<T> {
     /// If necessary, the current best block will be updated to be a descendant of the
     /// newly-finalized block.
     pub fn set_finalized_block(
-        &mut self,
+        &'_ mut self,
         block_hash: &[u8; 32],
-    ) -> Result<SetFinalizedBlockIter<T>, SetFinalizedError> {
+    ) -> Result<SetFinalizedBlockIter<'_, T>, SetFinalizedError> {
         let block_index = match self.blocks_by_hash.get(block_hash) {
             Some(idx) => *idx,
             None => return Err(SetFinalizedError::UnknownBlock),
@@ -311,9 +311,9 @@ impl<T> NonFinalizedTree<T> {
     /// Panics if `block_index_to_finalize` isn't a valid node in the tree.
     ///
     fn set_finalized_block_inner(
-        &mut self,
+        &'_ mut self,
         block_index_to_finalize: fork_tree::NodeIndex,
-    ) -> SetFinalizedBlockIter<T> {
+    ) -> SetFinalizedBlockIter<'_, T> {
         let new_finalized_block = self.blocks.get_mut(block_index_to_finalize).unwrap();
 
         // Update `self.finality`.

lib/src/chain/chain_information.rs

@@ -61,7 +61,7 @@ impl From<ValidChainInformation> for ChainInformation {
 
 impl ValidChainInformation {
     /// Gives access to the information.
-    pub fn as_ref(&self) -> ChainInformationRef {
+    pub fn as_ref(&'_ self) -> ChainInformationRef<'_> {
         From::from(&self.inner)
     }
 }

lib/src/chain/fork_tree.rs

@@ -259,7 +259,7 @@ impl<T> ForkTree<T> {
     ///
     /// Panics if the [`NodeIndex`] is invalid.
     ///
-    pub fn prune_ancestors(&mut self, node_index: NodeIndex) -> PruneAncestorsIter<T> {
+    pub fn prune_ancestors(&'_ mut self, node_index: NodeIndex) -> PruneAncestorsIter<'_, T> {
         self.prune_ancestors_inner(node_index, false)
     }
 
@@ -274,15 +274,15 @@ impl<T> ForkTree<T> {
     ///
     /// Panics if the [`NodeIndex`] is invalid.
     ///
-    pub fn prune_uncles(&mut self, node_index: NodeIndex) -> PruneAncestorsIter<T> {
+    pub fn prune_uncles(&'_ mut self, node_index: NodeIndex) -> PruneAncestorsIter<'_, T> {
         self.prune_ancestors_inner(node_index, true)
     }
 
     fn prune_ancestors_inner(
-        &mut self,
+        &'_ mut self,
         node_index: NodeIndex,
         uncles_only: bool,
-    ) -> PruneAncestorsIter<T> {
+    ) -> PruneAncestorsIter<'_, T> {
         let iter = self.first_root.unwrap();
 
         // `first_root` is updated ahead of the removal of the nodes. The update strategy is as