chore: bump rust to edition 2024 by yongkangc · Pull Request #18692 · paradigmxyz/reth

yongkangc · 2025-09-25T02:39:12Z

…ss-let-if-seq clippy warning Refactored the backfill threshold calculation logic to eliminate a `let mut` variable that was immediately reassigned. Combined the conditions into a single if-else chain to improve readability and satisfy the `useless-let-if-seq` clippy lint. This change maintains the same logic flow but avoids the pattern that triggers the clippy warning when upgrading to Rust 2024 edition.

Copilot

Pull Request Overview

This PR bumps the Rust edition from 2021 to 2024 across the entire Reth codebase. The key changes involve adopting new Rust 2024 syntax features, particularly the chained let patterns in conditional statements, updating configuration files, and making necessary adjustments for compatibility.

Adoption of Rust 2024 edition syntax, primarily chained let patterns in if let statements
Updates to configuration files including Cargo.toml, rustfmt.toml, and various example manifests
Safety-related changes to unsafe function calls and environment variable usage

Reviewed Changes

Copilot reviewed 109 out of 113 changed files in this pull request and generated 2 comments.

File	Description
Cargo.toml	Updates edition to 2024 and adds rust_2024_incompatible_pat warning
rustfmt.toml	Sets style_edition to 2021 for consistent formatting
examples/	Updates Cargo.toml files to use edition 2024
crates/	Widespread adoption of Rust 2024 chained let patterns and unsafe call syntax

Files not reviewed (1)

Cargo.lock: Language not supported

Comments suppressed due to low confidence (3)

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

bin/reth-bench/src/main.rs

crates/cli/util/src/sigsegv_handler.rs

crates/transaction-pool/src/test_utils/mock.rs

codspeed-hq · 2025-09-25T08:55:13Z

CodSpeed Performance Report

Merging #18692 will not alter performance

_{Comparing yk/update_rust_2024 (d297bf8) with main (a31dce9)}

Summary

✅ 77 untouched

Rust 2024's stricter match ergonomics don't allow binding modifiers (ref mut) in or-patterns when the default binding mode is not 'move'. Split the or-pattern into separate match arms to comply with Rust 2024.

The key insight is that ref mut is: - Forbidden when matching &mut T (default binding mode is not move) - Allowed when matching T (default binding mode is move) Split the macro into two patterns: - For &mut self: match without ref mut, rely on auto-deref - For owned self: use ref mut in or-pattern (allowed in Rust 2024) Also updated macro invocations to distinguish the cases: - set_ methods: set_value!(&mut self => field) - with_ methods: set_value!(self => field)

Clippy complained about the mutable variable pattern. Refactored to: 1. First determine which block number to use (downloaded > buffered > target) 2. Then compute the threshold check once This maintains the same logic priority: downloaded finalized block takes precedence, then buffered finalized, then target block number.

The logic must check in this specific order: 1. First check buffered finalized OR use target_block_number 2. Then potentially override with downloaded_block if it matches Previous attempts incorrectly checked downloaded_block first, changing the precedence. This restores the exact original behavior where the downloaded block can override the initial value.

- error: `if _ { .. } else { .. }` is an expression --> crates/engine/tree/src/tree/mod.rs:2041:9 | 2041 | / let mut exceeds_backfill_threshold = if let Some(buffered_finalized) = sync_target_state 2042 | | .as_ref() 2043 | | .and_then(|state| self.state.buffer.block(&state.finalized_block_hash)) ... | 2060 | | self.exceeds_backfill_run_threshold(canonical_tip_num, downloaded_block.number); 2061 | | } | |_________^ | = note: you might not need `mut` at all = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#useless_let_if_seq = note: `-D clippy::useless-let-if-seq` implied by `-D warnings` = help: to override `-D warnings` add `#[allow(clippy::useless_let_if_seq)]` help: it is more idiomatic to write | 2041 ~ let <mut> exceeds_backfill_threshold = if let (Some(downloaded_block), Some(ref state)) = (downloaded_block, sync_target_state) && 2042 + downloaded_block.hash == state.finalized_block_hash { self.exceeds_backfill_run_threshold(canonical_tip_num, downloaded_block.number) } else { if let Some(buffered_finalized) = sync_target_state 2043 + .as_ref() 2044 + .and_then(|state| self.state.buffer.block(&state.finalized_block_hash)) 2045 + { 2046 + // if we have buffered the finalized block, we should check how far 2047 + // we're off 2048 + self.exceeds_backfill_run_threshold(canonical_tip_num, buffered_finalized.number()) 2049 + } else { 2050 + // check if the distance exceeds the threshold for backfill sync 2051 + self.exceeds_backfill_run_threshold(canonical_tip_num, target_block_number) 2052 + } }; |

error: `if _ { .. } else { .. }` is an expression --> crates/engine/tree/src/tree/mod.rs:2041:9 | 2041 | / let mut exceeds_backfill_threshold = if let Some(buffered_finalized) = sync_target_state 2042 | | .as_ref() 2043 | | .and_then(|state| self.state.buffer.block(&state.finalized_block_hash)) ... | 2060 | | self.exceeds_backfill_run_threshold(canonical_tip_num, downloaded_block.number); 2061 | | } | |_________^ | = note: you might not need `mut` at all = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#useless_let_if_seq = note: `-D clippy::useless-let-if-seq` implied by `-D warnings` = help: to override `-D warnings` add `#[allow(clippy::useless_let_if_seq)]` help: it is more idiomatic to write | 2041 ~ let <mut> exceeds_backfill_threshold = if let (Some(downloaded_block), Some(ref state)) = (downloaded_block, sync_target_state) && 2042 + downloaded_block.hash == state.finalized_block_hash { self.exceeds_backfill_run_threshold(canonical_tip_num, downloaded_block.number) } else { if let Some(buffered_finalized) = sync_target_state 2043 + .as_ref() 2044 + .and_then(|state| self.state.buffer.block(&state.finalized_block_hash)) 2045 + { 2046 + // if we have buffered the finalized block, we should check how far 2047 + // we're off 2048 + self.exceeds_backfill_run_threshold(canonical_tip_num, buffered_finalized.number()) 2049 + } else { 2050 + // check if the distance exceeds the threshold for backfill sync 2051 + self.exceeds_backfill_run_threshold(canonical_tip_num, target_block_number) 2052 + } }; |

…d logic

Updated the backfill threshold logic to utilize a match expression instead of an if-let statement. This change improves readability and adheres to idiomatic Rust practices, addressing clippy warnings regarding unnecessary mutable variables.

yongkangc · 2025-09-25T09:53:13Z

crates/engine/tree/src/tree/mod.rs


        // check if the downloaded block is the tracked finalized block
-        let mut exceeds_backfill_threshold = if let Some(buffered_finalized) = sync_target_state
+        let mut exceeds_backfill_threshold = match sync_target_state


refactored the logic here, because clippy was giving a hard time with

2041 ~ let <mut> exceeds_backfill_threshold = if let (Some(downloaded_block), Some(ref state)) = (downloaded_block, sync_target_state) && 2042 + downloaded_block.hash == state.finalized_block_hash { self.exceeds_backfill_run_threshold(canonical_tip_num, downloaded_block.number) } else { if let Some(buffered_finalized) = sync_target_state 2043 + .as_ref() 2044 + .and_then(|state| self.state.buffer.block(&state.finalized_block_hash)) 2045 + { 2046 + // if we have buffered the finalized block, we should check how far 2047 + // we're off 2048 + self.exceeds_backfill_run_threshold(canonical_tip_num, buffered_finalized.number()) 2049 + } else { 2050 + // check if the distance exceeds the threshold for backfill sync 2051 + self.exceeds_backfill_run_threshold(canonical_tip_num, target_block_number) 2052 + } };

cc @mattsse for review here

this match is equivalent so lgtm

Updated the backfill threshold logic to use a match expression, enhancing clarity and adhering to idiomatic Rust practices. This change addresses previous clippy warnings regarding mutable variables and maintains the same logic precedence for determining the block number.

* dev: (166 commits) chore: bump 1.8.3 (paradigmxyz#19379) chore: bump alloy-evm 0.21.3 chore: bump alloy 1.0.37 (paradigmxyz#18795) chore: bump version to 1.8.2 (paradigmxyz#18792) fix(rpc/engine): check osaka in getBlobsV1 (paradigmxyz#18669) fix: remove cancun check (paradigmxyz#18787) fix(rpc): fix eth_config impl (paradigmxyz#18744) feat: make more EVM and RPC conversions fallible (paradigmxyz#18685) chore: bump rust to edition 2024 (paradigmxyz#18692) chore: release 1.8.1 (paradigmxyz#18646) fix: Revert "chore: disable fee charge in env" (paradigmxyz#18645) chore(deps): bump CodSpeedHQ/action from 3 to 4 (paradigmxyz#18333) chore: update voc.config.to text to v1.8.0 (paradigmxyz#18644) chore: update version to 1.8.0 in Cargo.toml (paradigmxyz#18638) fix: check request gas limit before (paradigmxyz#18639) chore(observability): add tokio runtime with custom thread naming (paradigmxyz#18635) docs: update dashboard table and rpc urls (paradigmxyz#18637) feat: add osaka+bpo timestamps (paradigmxyz#18627) chore: disable fee charge in env (paradigmxyz#18634) chore: bump inspectors 0.30 (paradigmxyz#18633) ...

github-project-automation bot added this to Reth Tracker Sep 25, 2025

github-project-automation bot moved this to Backlog in Reth Tracker Sep 25, 2025

yongkangc self-assigned this Sep 25, 2025

yongkangc force-pushed the yk/update_rust_2024 branch from 56a4eb9 to 076d211 Compare September 25, 2025 02:59

yongkangc marked this pull request as ready for review September 25, 2025 03:00

yongkangc requested review from Rjected, RomanHodulak, fgimenez, gakonst, joshieDo, klkvr, mattsse, mediocregopher, rakita, rkrasiuk and shekhirin as code owners September 25, 2025 03:00

yongkangc added 10 commits September 25, 2025 07:31

bump up to 2024

3c8cd24

chore: remove redundant safety comments in codebase

8490548

style_edition = "2021"

8cdb8aa

fmt

1a12dad

clippy

733e5e7

fix clippy

cbe0e65

clippy

4829748

fix clippy

8f00668

Refactor code for improved readability and clippy compliance

46de09f

yongkangc force-pushed the yk/update_rust_2024 branch from d6fa538 to 992ef43 Compare September 25, 2025 07:31

fix

971abf7

yongkangc requested a review from Copilot September 25, 2025 08:09

Copilot AI reviewed Sep 25, 2025

View reviewed changes

bin/reth-bench/src/main.rs Show resolved Hide resolved

crates/cli/util/src/sigsegv_handler.rs Show resolved Hide resolved

github-project-automation bot moved this from Backlog to In Progress in Reth Tracker Sep 25, 2025

mattsse reviewed Sep 25, 2025

View reviewed changes

crates/transaction-pool/src/test_utils/mock.rs Show resolved Hide resolved

yongkangc added 5 commits September 25, 2025 08:56

fix: use separate match arms in set_value macro for Rust 2024

346cde7

Rust 2024's stricter match ergonomics don't allow binding modifiers (ref mut) in or-patterns when the default binding mode is not 'move'. Split the or-pattern into separate match arms to comply with Rust 2024.

fixing macro

0a1de97

fix

5c4175f

more fixes

a6c2a38

mattsse approved these changes Sep 25, 2025

View reviewed changes

yongkangc added 7 commits September 25, 2025 09:20

fix: allow clippy warning for useless_let_if_seq in backfill threshol…

45d2c35

…d logic

fix

efc1977

yongkangc commented Sep 25, 2025

View reviewed changes

fix: clippy

d297bf8

Updated the backfill threshold logic to use a match expression, enhancing clarity and adhering to idiomatic Rust practices. This change addresses previous clippy warnings regarding mutable variables and maintains the same logic precedence for determining the block number.

shekhirin approved these changes Sep 25, 2025

View reviewed changes

mediocregopher approved these changes Sep 25, 2025

View reviewed changes

mediocregopher added this pull request to the merge queue Sep 25, 2025

Merged via the queue into main with commit a047a05 Sep 25, 2025
41 checks passed

mediocregopher deleted the yk/update_rust_2024 branch September 25, 2025 12:35

github-project-automation bot moved this from In Progress to Done in Reth Tracker Sep 25, 2025

jenpaff moved this from Done to Completed in Reth Tracker Sep 29, 2025

shekhirin pushed a commit that referenced this pull request Sep 30, 2025

chore: bump rust to edition 2024 (#18692)

994d73e

theochap pushed a commit to ethereum-optimism/optimism that referenced this pull request Jan 22, 2026

chore: bump rust to edition 2024 (paradigmxyz/reth#18692)

1c5b09d

theochap pushed a commit to ethereum-optimism/optimism that referenced this pull request Feb 11, 2026

chore: bump rust to edition 2024 (paradigmxyz/reth#18692)

fa65118

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: bump rust to edition 2024#18692

chore: bump rust to edition 2024#18692
mediocregopher merged 28 commits intomainfrom
yk/update_rust_2024

yongkangc commented Sep 25, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codspeed-hq bot commented Sep 25, 2025 •

edited

Loading

Uh oh!

yongkangc Sep 25, 2025 •

edited

Loading

Uh oh!

yongkangc Sep 25, 2025

Uh oh!

mattsse Sep 25, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

yongkangc commented Sep 25, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codspeed-hq bot commented Sep 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CodSpeed Performance Report

Merging #18692 will not alter performance

Summary

Uh oh!

yongkangc Sep 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yongkangc Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

mattsse Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codspeed-hq bot commented Sep 25, 2025 •

edited

Loading

yongkangc Sep 25, 2025 •

edited

Loading