From f2221b060123b3f6dd8281d8e2db6a4d7ae53848 Mon Sep 17 00:00:00 2001
From: Stacky McStackface <github@stackable.de>
Date: Wed, 2 Apr 2025 13:41:16 +0000
Subject: [PATCH] chore: Generated commit to update templated files since the
 last template run up to
 stackabletech/operator-templating@9b315fb9473b3933500c3c990e0668126637c93e

Reference-to: stackabletech/operator-templating@9b315fb (Bump Rust to 1.85.0)
---
 .github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md | 8 ++++----
 .github/workflows/build.yml                            | 2 +-
 .vscode/settings.json                                  | 7 +++++++
 rust-toolchain.toml                                    | 2 +-
 rustfmt.toml                                           | 6 +++++-
 5 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md b/.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md
index 86537df2..f871fb97 100644
--- a/.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md
+++ b/.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md
@@ -1,4 +1,4 @@
-# Bump Rust Dependencies for Stackable Release XX.(X)X
+# Bump Rust Dependencies for Stackable Release YY.M.X
 
 <!--
     Make sure to update the link in 'issues/.github/ISSUE_TEMPLATE/pre-release-operator-rust-deps.md'
@@ -32,7 +32,7 @@ Part of <https://github.com/stackabletech/issues/issues/TRACKING_ISSUE>
 
 ```[tasklist]
 ### Bump Rust Dependencies
-- [ ] Bump `stackable-operator` and friends.
-- [ ] Bump `product-version`.
-- [ ] Bump all other dependencies.
+- [ ] Bump `stackable-operator` and friends
+- [ ] Bump `product-config`
+- [ ] Bump all other dependencies
 ```
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6dfae3b1..37b95cfc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ env:
   CARGO_TERM_COLOR: always
   CARGO_INCREMENTAL: '0'
   CARGO_PROFILE_DEV_DEBUG: '0'
-  RUST_TOOLCHAIN_VERSION: "1.84.1"
+  RUST_TOOLCHAIN_VERSION: "1.85.0"
   PYTHON_VERSION: "3.12"
   RUSTFLAGS: "-D warnings"
   RUSTDOCFLAGS: "-D warnings"
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..ddcd8aac
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+    "rust-analyzer.rustfmt.overrideCommand": [
+        "rustfmt",
+        "+nightly-2025-01-15",
+        "--"
+    ],
+}
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index e7cf0381..fb21da0f 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 # DO NOT EDIT, this file is generated by operator-templating
 [toolchain]
-channel = "1.84.1"
+channel = "1.85.0"
diff --git a/rustfmt.toml b/rustfmt.toml
index e25d3967..07217b21 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -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