chore: Apply 2024 formatting

Author: Techassi

.pre-commit-config.yaml

@@ -20,8 +20,6 @@ repos:
   - repo: https://github.com/doublify/pre-commit-rust
     rev: eeee35a89e69d5772bdee97db1a6a898467b686e # 1.0
     hooks:
-      - id: fmt
-        args: ["--all", "--", "--check"]
       - id: clippy
         args: ["--all-targets", "--all-features", "--", "-D", "warnings"]
 
@@ -101,3 +99,11 @@ repos:
         entry: make regenerate-nix
         stages: [pre-commit, pre-merge-commit, manual]
         pass_filenames: false
+
+      - id: cargo-rustfmt
+        name: cargo-rustfmt
+        language: system
+        # Pinning to a specific rustc version, so that we get consistent formatting
+        entry: cargo +nightly-2025-01-15 fmt --all -- --check
+        stages: [pre-commit]
+        pass_filenames: false

.vscode/settings.json

@@ -1,3 +1,11 @@
 {
-  "rust-analyzer.showUnlinkedFileNotification": false
+  "rust-analyzer.showUnlinkedFileNotification": false,
+  "rust-analyzer.cargo.features": "all",
+  "rust-analyzer.rustfmt.overrideCommand": [
+    "rustfmt",
+    "+nightly-2025-01-15",
+    "--edition",
+    "2024",
+    "--"
+  ],
 }

rust/helm-sys/src/lib.rs

@@ -5,7 +5,7 @@
 
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 
-use std::ffi::{c_char, CStr, CString};
+use std::ffi::{CStr, CString, c_char};
 
 pub const HELM_ERROR_PREFIX: &str = "ERROR:";
 

rust/stackable-cockpit/src/common/manifest.rs

@@ -1,5 +1,4 @@
 use serde::{Deserialize, Serialize};
-
 #[cfg(feature = "openapi")]
 use utoipa::ToSchema;
 

rust/stackable-cockpit/src/engine/kind/mod.rs

@@ -1,6 +1,6 @@
 use std::process::Stdio;
 
-use snafu::{ensure, OptionExt, ResultExt, Snafu};
+use snafu::{OptionExt, ResultExt, Snafu, ensure};
 use tokio::{io::AsyncWriteExt, process::Command};
 use tracing::{debug, info, instrument};
 
@@ -141,12 +141,9 @@ impl Cluster {
             .await
             .context(CommandFailedToRunSnafu)?;
 
-        ensure!(
-            output.status.success(),
-            CommandErroredOutSnafu {
-                error: String::from_utf8_lossy(&output.stderr)
-            }
-        );
+        ensure!(output.status.success(), CommandErroredOutSnafu {
+            error: String::from_utf8_lossy(&output.stderr)
+        });
 
         let output = String::from_utf8_lossy(&output.stdout);
         Ok(output.lines().any(|name| name == cluster_name))

rust/stackable-cockpit/src/helm.rs

@@ -74,7 +74,9 @@ pub enum InstallReleaseError {
     /// This error indicates that the Helm release is already installed at a
     /// different version than requested. Installation is skipped. Existing
     /// releases should be uninstalled with 'stackablectl op un \<NAME\>'.
-    #[snafu(display("release {name} ({current_version}) already installed, skipping requested version {requested_version}"))]
+    #[snafu(display(
+        "release {name} ({current_version}) already installed, skipping requested version {requested_version}"
+    ))]
     ReleaseAlreadyInstalled {
         name: String,
         current_version: String,
@@ -130,8 +132,7 @@ impl Display for InstallReleaseStatus {
                 write!(
                     f,
                     "The release {} ({}) is already installed and no specific version was requested, skipping.",
-                    release_name,
-                    current_version
+                    release_name, current_version
                 )
             }
             InstallReleaseStatus::Installed(release_name) => {
@@ -230,7 +231,7 @@ pub fn install_release_from_repo_or_registry(
                     return Ok(InstallReleaseStatus::ReleaseAlreadyInstalledUnspecified {
                         release_name: release_name.to_string(),
                         current_version,
-                    })
+                    });
                 }
             }
         }

rust/stackable-cockpit/src/oci.rs

@@ -128,12 +128,9 @@ pub async fn get_oci_index<'a>() -> Result<HashMap<&'a str, ChartSourceMetadata>
         HELM_REPO_NAME_TEST,
         HELM_REPO_NAME_DEV,
     ] {
-        source_index_files.insert(
-            repo_name,
-            ChartSourceMetadata {
-                entries: HashMap::new(),
-            },
-        );
+        source_index_files.insert(repo_name, ChartSourceMetadata {
+            entries: HashMap::new(),
+        });
     }
     let base_url = format!("https://{HELM_OCI_BASE}/api/v2.0");
 

rust/stackable-cockpit/src/platform/cluster/resource_request.rs

@@ -1,12 +1,11 @@
 use std::fmt::Display;
 
-#[cfg(feature = "openapi")]
-use utoipa::ToSchema;
-
 use k8s_openapi::apimachinery::pkg::api::resource::Quantity;
 use serde::{Deserialize, Serialize};
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{cpu::CpuQuantity, memory::MemoryQuantity};
+#[cfg(feature = "openapi")]
+use utoipa::ToSchema;
 
 use crate::utils::k8s::{Client, Error};
 

rust/stackable-cockpit/src/platform/credentials.rs

@@ -1,6 +1,6 @@
 use std::fmt::Display;
 
-use kube::{core::DynamicObject, ResourceExt};
+use kube::{ResourceExt, core::DynamicObject};
 use serde::Serialize;
 use snafu::{OptionExt, ResultExt, Snafu};
 

rust/stackable-cockpit/src/platform/demo/spec.rs

@@ -1,7 +1,6 @@
 use serde::{Deserialize, Serialize};
 use snafu::{OptionExt, ResultExt, Snafu};
 use tracing::{debug, info, instrument, warn};
-
 #[cfg(feature = "openapi")]
 use utoipa::ToSchema;