Skip to content

chore(template): Bump Rust to 1.85.0 #495

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.

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

Merged
merged 7 commits into from
Apr 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion config/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# IMPORTANT
# If you change the Rust toolchain version here, make sure to also change
# docker-images/ubi8-rust-builder/Dockerfile & docker-images/ubi9-rust-builder/Dockerfile
rust_version: 1.84.1
rust_version: 1.85.0

# This nightly version is only used for cargo fmt invocations, because we use nightly-only
# rustfmt config options in rustfmt.toml. The version should be kept in line with the version
Expand Down
7 changes: 7 additions & 0 deletions template/.vscode/settings.json.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"rust-analyzer.rustfmt.overrideCommand": [
"rustfmt",
"+{[rust_nightly_version}]",
"--"
],
}
6 changes: 5 additions & 1 deletion template/rustfmt.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# This file includes unstable features, so you need to run "cargo +nightly fmt" to format your code.
# It's also ok to use the stable toolchain by simple running "cargo fmt", but using the nigthly formatter is prefered.

# https://doc.rust-lang.org/nightly/edition-guide/rust-2024/rustfmt-style-edition.html
style_edition = "2024"
imports_granularity = "Crate"
group_imports = "StdExternalCrate"
group_imports = "StdExternalCrate"
reorder_impl_items = true
use_field_init_shorthand = true