input-output-hk · stanislav-tkach · Feb 20, 2025 · Feb 20, 2025 · Feb 20, 2025 · Feb 20, 2025
diff --git a/earthly/rust/Earthfile b/earthly/rust/Earthfile
@@ -31,7 +31,7 @@ rust-base:
     # This is our base Host toolset, and rustup.
     # Never use `rust-toolchain.toml` in CI as it breaks builds.
     # The only toolchain supported is the one installed here.
-    FROM rust:1.83.0-slim-bookworm
+    FROM rust:1.85.0-slim-bookworm
 
     WORKDIR /root
 
@@ -365,7 +365,7 @@ REMOVE_SOURCE_FINGERPRINTS:
 
 # TODO(bkioshn): https://github.com/input-output-hk/catalyst-ci/issues/322
 # Installing Rust
-# Code reference from [rust1.83.0-slim-bookworm](https://github.com/rust-lang/docker-rust/blob/63f877a36f8ba9d9b4b35cd49df3327264510886/stable/bookworm/slim/Dockerfile)
+# Code reference from [rust1.85.0-slim-bookworm](https://github.com/rust-lang/docker-rust/blob/63f877a36f8ba9d9b4b35cd49df3327264510886/stable/bookworm/slim/Dockerfile)
 INSTALL_RUST:
     FUNCTION
 
@@ -374,7 +374,7 @@ INSTALL_RUST:
     ENV RUSTUP_HOME=/usr/local/rustup 
     ENV CARGO_HOME=/usr/local/cargo 
     ENV PATH=/usr/local/cargo/bin:$PATH 
-    ENV RUST_VERSION=1.83.0
+    ENV RUST_VERSION=1.85.0
 
     IF [ "$TARGETARCH" = "amd64" ]
         LET PLATFORM = "x86_64-unknown-linux-gnu"

diff --git a/earthly/rust/stdcfgs/cargo_manifest/project.toml b/earthly/rust/stdcfgs/cargo_manifest/project.toml
@@ -1,5 +1,5 @@
 [package]
-edition = "2021"
+edition = "2024"
 
 [lints.rust]
 warnings = "deny"

diff --git a/earthly/rust/stdcfgs/cargo_manifest/workspace.toml b/earthly/rust/stdcfgs/cargo_manifest/workspace.toml
@@ -1,5 +1,5 @@
 [workspace.package]
-edition = "2021"
+edition = "2024"
 
 [workspace.lints.rust]
 warnings = "deny"

diff --git a/earthly/rust/stdcfgs/clippy.toml b/earthly/rust/stdcfgs/clippy.toml
@@ -1,4 +1,5 @@
 allow-unwrap-in-tests = true
 allow-expect-in-tests = true
 allow-panic-in-tests = true
-arithmetic-side-effects-allowed = ["num_bigint::BigInt"]
+allow-indexing-slicing-in-tests = true
+arithmetic-side-effects-allowed = ["num_bigint::BigInt", "cardano_blockchain_types::Slot"]
diff --git a/earthly/rust/stdcfgs/rust-toolchain.toml b/earthly/rust/stdcfgs/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.83"
-profile = "default"
+channel = "1.85"
+profile = "default"
diff --git a/earthly/rust/stdcfgs/rustfmt.toml b/earthly/rust/stdcfgs/rustfmt.toml
@@ -21,7 +21,7 @@
 unstable_features = true
 
 # Compatibility:
-edition = "2021"
+edition = "2024"
 
 # Tabs & spaces - Defaults, listed for clarity
 tab_spaces = 4

diff --git a/examples/rust/Cargo.toml b/examples/rust/Cargo.toml
@@ -8,7 +8,7 @@ members = [
 [workspace.package]
 version = "0.0.1"
 license = "MIT OR Apache-2.0"
-edition = "2021"
+edition = "2024"
 
 [workspace.lints.rust]
 warnings = "deny"

diff --git a/examples/rust/clippy.toml b/examples/rust/clippy.toml
@@ -1,4 +1,5 @@
 allow-unwrap-in-tests = true
 allow-expect-in-tests = true
 allow-panic-in-tests = true
-arithmetic-side-effects-allowed = ["num_bigint::BigInt"]
+allow-indexing-slicing-in-tests = true
+arithmetic-side-effects-allowed = ["num_bigint::BigInt", "cardano_blockchain_types::Slot"]
diff --git a/examples/rust/crates/foo/benches/benchmark.rs b/examples/rust/crates/foo/benches/benchmark.rs
@@ -1,5 +1,5 @@
 //! Simple benchmark example
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 
 /// fibonacci calculates the nth fibonacci number
 fn fibonacci(n: u64) -> u64 {

diff --git a/examples/rust/rust-toolchain.toml b/examples/rust/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.83"
-profile = "default"
+channel = "1.85"
+profile = "default"
diff --git a/examples/rust/rustfmt.toml b/examples/rust/rustfmt.toml
@@ -21,7 +21,7 @@
 unstable_features = true
 
 # Compatibility:
-edition = "2021"
+edition = "2024"
 
 # Tabs & spaces - Defaults, listed for clarity
 tab_spaces = 4