Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(rust): Update Rust version and revision #384

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

feat(rust): Update Rust version and revision #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
03afec9
Update Rust version and revision
stanislav-tkach Feb 20, 2025
d0ae1f6
Apply formatting from 2024 edition
stanislav-tkach Feb 20, 2025
ab0a9e7
Update editions in standard configs
stanislav-tkach Feb 20, 2025
2dcc770
Fix
stanislav-tkach Feb 20, 2025
4474954
Update rust version in earthly
stanislav-tkach Feb 20, 2025
8cbc029
Update link
stanislav-tkach Feb 21, 2025
5ae1949
Update cargo-deny version
stanislav-tkach Feb 21, 2025
8953d6b
Remove slot from exceptions
stanislav-tkach Feb 21, 2025
dcb9daa
Remove the resolver version in examples
stanislav-tkach Feb 21, 2025
7eb6f78
Use resolver 3 explicitly
stanislav-tkach Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions earthly/rust/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion earthly/rust/stdcfgs/cargo_manifest/project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
edition = "2021"
edition = "2024"

[lints.rust]
warnings = "deny"
Expand Down
2 changes: 1 addition & 1 deletion earthly/rust/stdcfgs/cargo_manifest/workspace.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace.package]
edition = "2021"
edition = "2024"

[workspace.lints.rust]
warnings = "deny"
Expand Down
1 change: 1 addition & 0 deletions earthly/rust/stdcfgs/clippy.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
4 changes: 2 additions & 2 deletions earthly/rust/stdcfgs/rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.83"
profile = "default"
channel = "1.85"
profile = "default"
2 changes: 1 addition & 1 deletion earthly/rust/stdcfgs/rustfmt.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
unstable_features = true

# Compatibility:
edition = "2021"
edition = "2024"

# Tabs & spaces - Defaults, listed for clarity
tab_spaces = 4
Expand Down
2 changes: 1 addition & 1 deletion earthly/rust/tools/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions examples/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
resolver = "2"
resolver = "3"
members = [
"crates/foo",
"crates/bar",
Expand All @@ -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"
Expand Down
1 change: 1 addition & 0 deletions examples/rust/clippy.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
2 changes: 1 addition & 1 deletion examples/rust/crates/foo/benches/benchmark.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions examples/rust/rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.83"
profile = "default"
channel = "1.85"
profile = "default"
2 changes: 1 addition & 1 deletion examples/rust/rustfmt.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
unstable_features = true

# Compatibility:
edition = "2021"
edition = "2024"

# Tabs & spaces - Defaults, listed for clarity
tab_spaces = 4
Expand Down