Skip to content

Commit 5506c14

Browse files
committed
rust-toolchain in TOML and upgrade default MSRV to 1.88.0
1 parent 2d7f699 commit 5506c14

File tree

8 files changed

+31
-11
lines changed

8 files changed

+31
-11
lines changed

be-rust-axum/rust-template/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
name = "{{project-name}}"
44
version = "0.1.0"
55
edition = "2024"
6-
rust-version = "1.86"
6+
rust-version = "1.88"
77
description = "{{project-name}} component - from the OpenDevStack Rust QuickStarter."
88
license = "MIT OR Apache-2.0"
99
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Axum - Rust web framework
3-
description: "Axum is an ergonomic and modular web framework built with Tokio, Tower, and Hyper; written in Rust. Technologies: Axum 0.8.x, Rust 1.86.x"
3+
description: "Axum is an ergonomic and modular web framework built with Tokio, Tower, and Hyper; written in Rust. Technologies: Axum 0.8.x, Rust 1.88.x"
44
supplier: https://github.com/tokio-rs/axum
55
version: 4.x
66
type: ods

be-rust-axum/rust-template/rust-toolchain

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[toolchain]
2+
channel = "1.88.0"
Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
1-
# rustfmt configurations from master branch, check rustfmt version
2-
# (cargo fmt --version).
31
# https://github.com/rust-lang/rustfmt/blob/master/Configurations.md
4-
5-
edition = "2021"
6-
tab_spaces = 2
2+
# ─────────────────────────────────────────────
3+
# 📦 Edition
4+
edition = "2024"
5+
# ─────────────────────────────────────────────
6+
# 📚 Import organization
7+
group_imports = "StdExternalCrate" # Group: std, external crates, then local
8+
imports_granularity = "Module" # One use per module line (avoids merge conflicts)
9+
reorder_imports = true # Ensure deterministic ordering
10+
# ─────────────────────────────────────────────
11+
# 📐 Formatting rules
12+
use_field_init_shorthand = true # Use shorthand: { foo } instead of { foo: foo }
13+
match_block_trailing_comma = true # Add trailing commas in multiline match arms
14+
trailing_comma = "Always" # Always use trailing commas in multiline
15+
newline_style = "Unix" # Use \n (LF) for line endings
16+
tab_spaces = 2 # Use 2 spaces per indentation level
17+
max_width = 100 # Line length limit
18+
# ─────────────────────────────────────────────
19+
# 🧼 Style preferences
20+
normalize_doc_attributes = true # Normalize #[doc] to /// comments
21+
wrap_comments = true # Automatically wrap long doc/comments
22+
format_code_in_doc_comments = true # Format Rust code inside doc comments
23+
blank_lines_upper_bound = 1 # Avoid excessive vertical whitespace
24+
blank_lines_lower_bound = 0 # Allow compact block spacing when possible
25+
# ─────────────────────────────────────────────

common/jenkins-agents/rust/ocp-config/bc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ parameters:
1919
- name: RUST_VERSION
2020
description: "The Rust version"
2121
required: true
22-
value: "1.86.0"
22+
value: "1.88.0"
2323
- name: RUST_TOOLCHAIN
2424
description: "The Rust target toolchain"
2525
required: true

docs/modules/jenkins-agents/pages/rust.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Rust installation is managed by `rustup`, which offers a convenient way to load
1111

1212
And, the version defined in the `rust-toolchain` file is the one that the Jenkins Agent will use (even if it is not the default). That file MUST be in the root of the projects' repository.
1313

14-
Default Minimum Supported Rust Version (MSRV) **1.86**.
14+
Default Minimum Supported Rust Version (MSRV) **1.88**.
1515

1616
Default Rust edition in use is **2024**. See https://doc.rust-lang.org/edition-guide/introduction.html[Rust Edition Guide] for further information.
1717

docs/modules/quickstarters/pages/be-rust-axum.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ It contains the basic setup for Docker, Jenkins, SonarQube and OpenShift.
7171

7272
== Frameworks used
7373

74-
* https://www.rust-lang.org/[Rust 1.86.x]
74+
* https://www.rust-lang.org/[Rust 1.88.x]
7575
* https://github.com/tokio-rs/axum[Axum 0.8.x]
7676
* https://nexte.st/[Nextest 0.9.x]
7777
* https://github.com/taiki-e/cargo-llvm-cov/[LLVM coverage 0.6.x]

0 commit comments

Comments
 (0)