diff --git a/earthly/rust/Earthfile b/earthly/rust/Earthfile index 5d7aa3212..e584d8a11 100644 --- 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/7001c1a7a222d985a13582ec652f500a3cd40f89/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 index f9a409dce..7540160f6 100644 --- 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 index a7d731c43..4f9e1bfd6 100644 --- 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 index caa289b27..a03fd62fd 100644 --- 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 +allow-indexing-slicing-in-tests = true arithmetic-side-effects-allowed = ["num_bigint::BigInt"] diff --git a/earthly/rust/stdcfgs/rust-toolchain.toml b/earthly/rust/stdcfgs/rust-toolchain.toml index eb1d97945..5bedd373f 100644 --- a/earthly/rust/stdcfgs/rust-toolchain.toml +++ b/earthly/rust/stdcfgs/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.83" -profile = "default" \ No newline at end of file +channel = "1.85" +profile = "default" diff --git a/earthly/rust/stdcfgs/rustfmt.toml b/earthly/rust/stdcfgs/rustfmt.toml index 905bde2d0..18fac85ed 100644 --- 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/earthly/rust/tools/Earthfile b/earthly/rust/tools/Earthfile index a24b19646..bb20d3c34 100644 --- a/earthly/rust/tools/Earthfile +++ b/earthly/rust/tools/Earthfile @@ -53,7 +53,7 @@ tool-refinery: DO +CARGO_BINSTALL --package=refinery_cli --version=0.8.14 --executable=refinery tool-cargo-deny: - DO +CARGO_BINSTALL --package=cargo-deny --version=0.16.1 + DO +CARGO_BINSTALL --package=cargo-deny --version=0.17.0 tool-cargo-modules: DO +CARGO_BINSTALL --package=cargo-modules --version=0.17.0 --test_param="--help" diff --git a/examples/rust/Cargo.toml b/examples/rust/Cargo.toml index cd92e7316..f2f93da87 100644 --- a/examples/rust/Cargo.toml +++ b/examples/rust/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -resolver = "2" +resolver = "3" members = [ "crates/foo", "crates/bar", @@ -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 index caa289b27..a03fd62fd 100644 --- 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 +allow-indexing-slicing-in-tests = true arithmetic-side-effects-allowed = ["num_bigint::BigInt"] diff --git a/examples/rust/crates/foo/benches/benchmark.rs b/examples/rust/crates/foo/benches/benchmark.rs index 676602d37..6bb77bdfd 100644 --- 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 index eb1d97945..5bedd373f 100644 --- a/examples/rust/rust-toolchain.toml +++ b/examples/rust/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.83" -profile = "default" \ No newline at end of file +channel = "1.85" +profile = "default" diff --git a/examples/rust/rustfmt.toml b/examples/rust/rustfmt.toml index 905bde2d0..18fac85ed 100644 --- 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