Merge pull request #1315 from Chia-Network/rust-2024

Update to Rust 2024

Author: Rigidity

.github/workflows/benchmark.yml

@@ -131,7 +131,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Set up rust
-        uses: dtolnay/rust-toolchain@1.85.0
+        uses: dtolnay/rust-toolchain@1.92.0
 
       - uses: chia-network/actions/create-venv@main
         id: create-venv
@@ -175,7 +175,7 @@ jobs:
           fetch-depth: 1
 
       - name: Set up rust
-        uses: dtolnay/rust-toolchain@1.85.0
+        uses: dtolnay/rust-toolchain@1.92.0
 
       - name: cargo bench
         run: |

.github/workflows/build-crate.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Set up Rust
-        uses: dtolnay/rust-toolchain@1.85.0
+        uses: dtolnay/rust-toolchain@1.92.0
         with:
           components: rustfmt, clippy
 

.github/workflows/build-wheels.yml

@@ -288,7 +288,7 @@ jobs:
           fetch-depth: 1
 
       - name: Install rust
-        uses: dtolnay/rust-toolchain@1.85.0
+        uses: dtolnay/rust-toolchain@1.92.0
         with:
           components: rustfmt, clippy
 
@@ -302,7 +302,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.85.0
+      - uses: dtolnay/rust-toolchain@1.92.0
         with:
           components: clippy
 

.rustfmt.toml

@@ -1 +1 @@
-edition = "2021"
+edition = "2024"

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "chia"
 version = "0.35.0"
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 description = "A meta-crate that exports all of the Chia crates in the workspace."
 authors = [
@@ -50,6 +50,9 @@ cast_lossless = "allow"
 similar_names = "allow"
 implicit_hasher = "allow"
 
+# TODO: This will be cleaned up separately
+collapsible_if = "allow"
+
 [dependencies]
 chia-bls = { workspace = true, optional = true }
 chia-secp = { workspace = true, optional = true }

crates/chia-bls/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "chia-bls"
 version = "0.35.0"
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 description = "BLS signature, verification and aggregation functions for the Chia blockchain"
 authors = ["Arvid Norberg <arvid@chia.net>"]

crates/chia-bls/benches/cache.rs

@@ -1,8 +1,8 @@
 use chia_bls::aggregate_verify;
-use chia_bls::{sign, BlsCache, SecretKey, Signature};
-use criterion::{criterion_group, criterion_main, Criterion};
+use chia_bls::{BlsCache, SecretKey, Signature, sign};
+use criterion::{Criterion, criterion_group, criterion_main};
 use rand::rngs::StdRng;
-use rand::{seq::SliceRandom, Rng, SeedableRng};
+use rand::{Rng, SeedableRng, seq::SliceRandom};
 
 fn cache_benchmark(c: &mut Criterion) {
     let mut rng = StdRng::seed_from_u64(1337);

crates/chia-bls/benches/derive_key.rs

@@ -1,5 +1,5 @@
 use chia_bls::{DerivableKey, SecretKey};
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use rand::rngs::StdRng;
 use rand::{Rng, SeedableRng};
 use std::time::Instant;

crates/chia-bls/benches/parse.rs

@@ -1,7 +1,7 @@
-use chia_bls::sign;
 use chia_bls::Signature;
+use chia_bls::sign;
 use chia_bls::{PublicKey, SecretKey};
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use rand::rngs::StdRng;
 use rand::{Rng, SeedableRng};
 

crates/chia-bls/benches/sign.rs

@@ -1,5 +1,5 @@
-use chia_bls::{sign, SecretKey};
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use chia_bls::{SecretKey, sign};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use rand::rngs::StdRng;
 use rand::{Rng, SeedableRng};