chore: update rust toolchain, migrate to 2024 edition #3535

tediou5 · 2025-05-14T02:37:31Z

let_chains is already stable.
duration_constructors_lite was forked from duration_constructors and contains only the non-controversial parts(rust-lang/rust#120301).

Most of the changes are simply moves triggered by the updated fmt rules.

The only difference comes from the updated lifetime-capture rules in RPIT(https://doc.rust-lang.org/edition-guide/rust-2024/rpit-lifetime-capture.html):

subspace/crates/subspace-farmer/src/farm/plotted_pieces.rs

Line 64 in c65631e

) -> Option<impl Future<Output = Option<Piece>> + use<FarmIndex>> {
https://github.com/tediou5/subspace/blob/c65631e55bd8076f0b75ad790f657ab79dff8a89/crates/subspace-farmer/src/single_disk_farm/farming.rs#L131-L143

Code contributor checklist:

I have read, understood and followed contributing guide

vedhavyas

Would be ideal if you could derive the edition from the workspace Cargo.toml.

Rest looks good

vedhavyas · 2025-05-14T07:21:30Z

crates/subspace-farmer/src/lib.rs

@@ -3,14 +3,13 @@
    array_windows,
    assert_matches,
    btree_extract_if,
-    duration_constructors,


is this just a rename or anything changed that we should be aware of ?

For the record, the lite version includes from_mins and from_hours, we use from_mins only.
(Days, weeks, and larger time units have issues with daylight saving time, civil time, and scientific time rust-lang/rust#140881)

crates/subspace-farmer/src/single_disk_farm/farming.rs

teor2345

I've had a look at all the manual commits, and they look ok. I'll be reviewing the other ones by running the commands in the commit message, and checking the command outputs.

You could simplify/combine both your cargo fix commands using:
cargo clippy --locked --all-targets --all-features --fix --all

domains/runtime/auto-id/build.rs

domains/pallets/messenger/src/lib.rs

crates/subspace-farmer/src/farm/plotted_pieces.rs

teor2345 · 2025-05-28T23:29:46Z

crates/sc-consensus-subspace-rpc/src/lib.rs

@@ -806,8 +806,7 @@ where
            );

            return Err(Error::StringError(format!(
-                "Request limit ({}) exceed the server limit: {} ",
-                limit, MAX_SEGMENT_HEADERS_PER_REQUEST
+                "Request limit ({limit}) exceed the server limit: {MAX_SEGMENT_HEADERS_PER_REQUEST} "


This doesn't need to be fixed in this PR, but there's an odd extra space at the end of this log message. A search and replace could fix them all at once.

Yes, I found more than one. After merging this pull request, I will submit a separate pull request to fix them.

rust-toolchain.toml

…tures runtime-benchmarks,cuda --fix --all -- -D warnings

…tures rocm --fix --all -- -D warnings

teor2345

Thanks for this change, I'll try and get it in now to avoid further conflicts.

How I Reviewed

For other reviewers/audit, I've left search and replace commands on each commit.

This command gets you the initial commit to base these automatic changes on:

git checkout -b update-rust-edition-auto 76d0a35f5d993ae031f2962575077b83decb8756^

Here is my branch with all those commits, which matches this PR exactly, except for an extra whitespace fix to make some of my tooling stop warning:
https://github.com/autonomys/subspace/tree/update-rust-edition-auto

Future Work

There are some missed feature clippy fixes, which can be done in another PR:

cargo clippy --locked --all-targets --features std,shim,test-ethereum,kzg,binary,serde,parallel,cluster,numa,default-library,testing,with-tracing --fix --all
cargo clippy --locked --all-targets --features no_std --fix --all

~~It might also be a good idea to update the rustfmt.toml edition to 2024.~~

teor2345 · 2025-06-02T01:58:43Z

Cargo.toml

+[workspace.package]
+edition = "2021"
+


This commit contains this manual change, and a search and replace:

fastmod --accept-all --fixed-strings 'edition = "2021"' 'edition.workspace = true' --extensions rs

teor2345 · 2025-06-02T02:12:11Z

domains/runtime/auto-id/build.rs

-        std::env::set_var("WASM_BUILD_TYPE", "release");
+        // SAFETY: no concurrent writing or reading here, build scripts are single threaded.
+        unsafe { std::env::set_var("WASM_BUILD_TYPE", "release") };


Search and replace:

fastmod --accept-all --fixed-strings 'std::env::set_var("WASM_BUILD_TYPE", "release");' '// SAFETY: no concurrent writing or reading here, build scripts are single threaded. unsafe { std::env::set_var("WASM_BUILD_TYPE", "release") };'

teor2345 · 2025-06-02T02:16:07Z

crates/sc-consensus-subspace/src/lib.rs

-#![feature(let_chains, try_blocks, duration_constructors)]
+#![feature(let_chains, try_blocks, duration_constructors_lite)]


Search and replace:

fastmod --accept-all --fixed-strings 'duration_constructors' 'duration_constructors_lite'

teor2345 · 2025-06-02T02:22:23Z

crates/subspace-farmer/src/lib.rs

@@ -3,14 +3,13 @@
    array_windows,
    assert_matches,
    btree_extract_if,
-    duration_constructors,


For the record, the lite version includes from_mins and from_hours, we use from_mins only.
(Days, weeks, and larger time units have issues with daylight saving time, civil time, and scientific time rust-lang/rust#140881)

teor2345 · 2025-06-02T02:46:51Z

crates/subspace-farmer/src/farm/plotted_pieces.rs

@@ -61,7 +61,7 @@ where
    pub fn read_piece(
        &self,
        piece_index: PieceIndex,
-    ) -> Option<impl Future<Output = Option<Piece>> + 'static> {
+    ) -> Option<impl Future<Output = Option<Piece>> + use<FarmIndex>> {


Automatically performed (but the 'static needs to be manually removed):

cargo fix --broken-code

teor2345 · 2025-06-02T02:56:58Z

shared/subspace-proof-of-space-gpu/src/cuda.rs

-extern "C" {
+unsafe extern "C" {


Possibly fixed/suggested by (I don't have Linux locally):

cargo fix --broken-code --features cuda

teor2345 · 2025-06-02T02:57:03Z

shared/subspace-proof-of-space-gpu/src/rocm.rs

-extern "C" {
+unsafe extern "C" {


Possibly fixed/suggested by (I don't have Linux locally):

cargo fix --broken-code --features cuda

teor2345 · 2025-06-02T02:58:36Z

crates/pallet-domains/src/lib.rs

-        if pre_dispatch {
-            if let Some(future_slot) = T::BlockSlot::future_slot(current_block_number) {
+        if pre_dispatch
+            && let Some(future_slot) = T::BlockSlot::future_slot(current_block_number) {
                ensure!(slot_number <= *future_slot, BundleError::SlotInTheFuture)
            }
-        }


Command can be simplified to:

cargo clippy --locked --all-targets --features runtime-benchmarks,cuda --fix --all

I couldn't automatically compile/fix cuda or x86_64/aes because I don't have the OS/hardware, so I reviewed them manually instead.

teor2345 · 2025-06-02T03:23:50Z

crates/subspace-networking/src/node_runner.rs

-                self.handle_remove_listeners(&[address.clone()]);
+                self.handle_remove_listeners(std::slice::from_ref(address));


Recommended by cargo clippy, clone() does not have side effects here.

Nitpick for future changes: usually we'd use std::slice; at the top of the file and slice::from_ref here.

teor2345 · 2025-06-02T03:36:55Z

crates/pallet-domains/src/lib.rs

-#![feature(array_windows, let_chains, variant_count)]
+#![feature(array_windows, variant_count)]


This can be automated using:

fastmod --accept-all --fixed-strings '#![feature(let_chains)]' '' fastmod --accept-all --fixed-strings 'let_chains,' '' cargo fmt --all

teor2345

I fixed a clippy warning hidden behind a feature that wasn't automatically fixed in this PR.

teor2345 · 2025-06-02T07:40:24Z

These tests took more than 90 minutes on macOS, they usually take 10-30 minutes, probably some race condition:

   SLOW [>4980.000s] domain-client-operator tests::test_xdm_channel_allowlist_removed_after_xdm_resp_relaying
   SLOW [>4980.000s] domain-client-operator tests::test_xdm_false_invalid_fraud_proof

I restarted the whole set of merge checks (it's not possible to restart just one check in the merge queue).

tediou5 requested review from nazar-pc, teor2345, NingLin-P and vedhavyas as code owners May 14, 2025 02:37

vedhavyas reviewed May 14, 2025

View reviewed changes

This comment was marked as resolved.

Sign in to view

tediou5 force-pushed the chore/update-rust-toolchain-and-edition branch from c65631e to 511d7ca Compare May 16, 2025 10:52

tediou5 requested review from teor2345 and vedhavyas May 16, 2025 10:53

This comment was marked as resolved.

Sign in to view

tediou5 force-pushed the chore/update-rust-toolchain-and-edition branch 2 times, most recently from f8fb5f0 to b9e8ad0 Compare May 21, 2025 03:22

This comment was marked as resolved.

Sign in to view

nazar-pc mentioned this pull request May 28, 2025

Faster PoT verification for CPUs that support AVX512F+VAES #3552

Merged

1 task

teor2345 reviewed May 28, 2025

View reviewed changes

rust-toolchain.toml Outdated Show resolved Hide resolved

tediou5 added 3 commits June 1, 2025 08:58

feat: derive the edition from the workspace Cargo.toml

76d0a35

chore: update rust toolchain and edition

c7266f8

fix: set_var is unsafe now

01af654

This comment was marked as resolved.

Sign in to view

tediou5 added 8 commits June 1, 2025 14:28

fix: remove the unnecessary binding modifier

ff6cdea

fix: rename feature duration_constructors => duration_constructors_lite

8e253d7

fix: capture more lifetime to adjusted the RPIT lifetime capture rules

cd16809

fix: extern blocks must be unsafe

fdb55de

chore: run cargo -Zgitoxide -Zgit clippy --locked --all-targets --fea…

543b372

…tures runtime-benchmarks,cuda --fix --all -- -D warnings

chore: run cargo -Zgitoxide -Zgit clippy --locked --all-targets --fea…

500f33a

…tures rocm --fix --all -- -D warnings

chore(clippy): replace clone with std::slice::from_ref

71f66d3

chore: cargo fmt --all

5788435

feat: remove let_chains feature

ad37d83

tediou5 force-pushed the chore/update-rust-toolchain-and-edition branch from b9e8ad0 to ad37d83 Compare June 1, 2025 14:36

This comment was marked as resolved.

Sign in to view

tediou5 requested a review from teor2345 June 1, 2025 14:44

teor2345 previously approved these changes Jun 2, 2025

View reviewed changes

teor2345 added 3 commits June 2, 2025 13:59

Fix another slice::from_ref and some dead code

272b30b

Remove extra newline in subspace-gateway/Cargo.toml

dc3b82e

Use rustfmt 2024 edition

62e7ae5

teor2345 dismissed their stale review via 62e7ae5 June 2, 2025 04:02

teor2345 approved these changes Jun 2, 2025

View reviewed changes

teor2345 enabled auto-merge June 2, 2025 04:03

teor2345 added this pull request to the merge queue Jun 2, 2025

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 2, 2025

teor2345 added this pull request to the merge queue Jun 2, 2025

Merged via the queue into autonomys:main with commit 20ce4d9 Jun 2, 2025
10 checks passed

This was referenced Jun 2, 2025

Benchmarks for balance transfer check extension #3557

Merged

Implement PoT proving and verification optimized for AES (aarch64) #3561

Merged

Fix XDM tests which occasionally timeout in CI #3562

Open

		#![feature(let_chains, try_blocks, duration_constructors)]
		#![feature(let_chains, try_blocks, duration_constructors_lite)]

		self.handle_remove_listeners(&[address.clone()]);
		self.handle_remove_listeners(std::slice::from_ref(address));

		#![feature(array_windows, let_chains, variant_count)]
		#![feature(array_windows, variant_count)]

chore: update rust toolchain, migrate to 2024 edition #3535

chore: update rust toolchain, migrate to 2024 edition #3535

Uh oh!

Conversation

tediou5 commented May 14, 2025

Code contributor checklist:

Uh oh!

vedhavyas left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

teor2345 left a comment • 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!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

teor2345 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

How I Reviewed

Future Work

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

teor2345 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

teor2345 commented Jun 2, 2025

Uh oh!

Uh oh!

Uh oh!

teor2345 left a comment •

edited

Loading

teor2345 left a comment •

edited

Loading