refactor unnamed interpolations

Author: xeniape

rust/stackable-cockpit/src/helm.rs

@@ -122,8 +122,7 @@ impl Display for InstallReleaseStatus {
             } => {
                 write!(
                     f,
-                    "The release {} ({}) is already installed (requested {}), skipping.",
-                    release_name, current_version, requested_version
+                    "The release {release_name} ({current_version}) is already installed (requested {requested_version}), skipping."
                 )
             }
             InstallReleaseStatus::ReleaseAlreadyInstalledUnspecified {
@@ -132,16 +131,11 @@ impl Display for InstallReleaseStatus {
             } => {
                 write!(
                     f,
-                    "The release {} ({}) is already installed and no specific version was requested, skipping.",
-                    release_name, current_version
+                    "The release {release_name} ({current_version}) is already installed and no specific version was requested, skipping."
                 )
             }
             InstallReleaseStatus::Installed(release_name) => {
-                write!(
-                    f,
-                    "The release {} was successfully installed.",
-                    release_name
-                )
+                write!(f, "The release {release_name} was successfully installed.")
             }
         }
     }
@@ -157,17 +151,12 @@ impl Display for UninstallReleaseStatus {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             UninstallReleaseStatus::NotInstalled(release_name) => {
-                write!(
-                    f,
-                    "The release {} is not installed, skipping.",
-                    release_name
-                )
+                write!(f, "The release {release_name} is not installed, skipping.")
             }
             UninstallReleaseStatus::Uninstalled(release_name) => {
                 write!(
                     f,
-                    "The release {} was successfully uninstalled.",
-                    release_name
+                    "The release {release_name} was successfully uninstalled."
                 )
             }
         }
@@ -282,10 +271,7 @@ fn install_release(
     );
 
     if let Some(error) = helm_sys::to_helm_error(&result) {
-        error!(
-            "Go wrapper function go_install_helm_release encountered an error: {}",
-            error
-        );
+        error!("Go wrapper function go_install_helm_release encountered an error: {error}");
 
         return Err(Error::InstallRelease {
             source: InstallReleaseError::HelmWrapper { error },
@@ -312,10 +298,7 @@ pub fn uninstall_release(
         let result = helm_sys::uninstall_helm_release(release_name, namespace, suppress_output);
 
         if let Some(err) = helm_sys::to_helm_error(&result) {
-            error!(
-                "Go wrapper function go_uninstall_helm_release encountered an error: {}",
-                err
-            );
+            error!("Go wrapper function go_uninstall_helm_release encountered an error: {err}");
 
             return Err(Error::UninstallRelease { error: err });
         }
@@ -325,10 +308,7 @@ pub fn uninstall_release(
         ));
     }
 
-    info!(
-        "The Helm release {} is not installed, skipping.",
-        release_name
-    );
+    info!("The Helm release {release_name} is not installed, skipping.");
 
     Ok(UninstallReleaseStatus::NotInstalled(
         release_name.to_string(),
@@ -352,10 +332,7 @@ pub fn list_releases(namespace: &str) -> Result<Vec<Release>, Error> {
     let result = helm_sys::list_helm_releases(namespace);
 
     if let Some(err) = helm_sys::to_helm_error(&result) {
-        error!(
-            "Go wrapper function go_helm_list_releases encountered an error: {}",
-            err
-        );
+        error!("Go wrapper function go_helm_list_releases encountered an error: {err}");
 
         return Err(Error::ListReleases { error: err });
     }
@@ -381,10 +358,7 @@ pub fn add_repo(repository_name: &str, repository_url: &str) -> Result<(), Error
     let result = helm_sys::add_helm_repository(repository_name, repository_url);
 
     if let Some(err) = helm_sys::to_helm_error(&result) {
-        error!(
-            "Go wrapper function go_add_helm_repo encountered an error: {}",
-            err
-        );
+        error!("Go wrapper function go_add_helm_repo encountered an error: {err}");
 
         return Err(Error::AddRepo { error: err });
     }
@@ -403,7 +377,7 @@ where
     let url = Url::parse(repo_url.as_ref()).context(UrlParseSnafu)?;
     let url = url.join(HELM_REPO_INDEX_FILE).context(UrlParseSnafu)?;
 
-    debug!("Using {} to retrieve Helm index file", url);
+    debug!("Using {url} to retrieve Helm index file");
 
     // TODO (Techassi): Use the FileTransferClient for that
     let index_file_content = reqwest::get(url)

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

@@ -32,8 +32,10 @@ impl Display for ResourceRequests {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
-            "CPU: {}, Memory: {}, PVC space: {}",
-            self.cpu.0, self.memory.0, self.pvc.0
+            "CPU: {cpu}, Memory: {memory}, PVC space: {pvc}",
+            cpu = self.cpu.0,
+            memory = self.memory.0,
+            pvc = self.pvc.0
         )
     }
 }
@@ -67,8 +69,8 @@ pub enum ResourceRequestsError {
 #[derive(Debug, Snafu)]
 pub enum ResourceRequestsValidationError {
     #[snafu(display(
-        "The {object_name} requires {} CPU core(s), but there are only {} CPU core(s) available in the cluster",
-        required.as_cpu_count(), available.as_cpu_count()
+        "The {object_name} requires {required_cpu} CPU core(s), but there are only {available_cpu} CPU core(s) available in the cluster",
+        required_cpu = required.as_cpu_count(), available_cpu = available.as_cpu_count()
     ))]
     InsufficientCpu {
         available: CpuQuantity,

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

@@ -25,7 +25,12 @@ pub struct Credentials {
 
 impl Display for Credentials {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}:{}", self.username, self.password)
+        write!(
+            f,
+            "{username}:{password}",
+            username = self.username,
+            password = self.password
+        )
     }
 }
 

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

@@ -35,7 +35,7 @@ pub enum Error {
     #[snafu(display("demo resource requests error"), context(false))]
     DemoResourceRequests { source: ResourceRequestsError },
 
-    #[snafu(display("cannot install demo in namespace {requested:?}, only '{}' supported", supported.join(", ")))]
+    #[snafu(display("cannot install demo in namespace {requested:?}, only {supported:?} supported", supported = supported.join(", ")))]
     UnsupportedNamespace {
         requested: String,
         supported: Vec<String>,

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

@@ -49,7 +49,7 @@ pub enum Error {
 
     /// This error indicates that the stack doesn't support being installed in
     /// the provided namespace.
-    #[snafu(display("unable install stack in namespace {requested:?}, only '{}' supported", supported.join(", ")))]
+    #[snafu(display("unable install stack in namespace {requested:?}, only {supported:?} supported", supported = supported.join(", ")))]
     UnsupportedNamespace {
         requested: String,
         supported: Vec<String>,

rust/stackable-cockpit/src/platform/stacklet/mod.rs

@@ -197,6 +197,9 @@ fn gvk_from_product_name(product_name: &str) -> GroupVersionKind {
     GroupVersionKind {
         group: format!("{product_name}.stackable.tech"),
         version: "v1alpha1".into(),
-        kind: format!("{}Cluster", product_name.capitalize()),
+        kind: format!(
+            "{product_name}Cluster",
+            product_name = product_name.capitalize()
+        ),
     }
 }

rust/stackable-cockpit/src/utils/k8s/conditions.rs

@@ -43,7 +43,11 @@ impl ConditionsExt for Vec<Condition> {
         self.iter()
             .map(|c| {
                 DisplayCondition::new(
-                    format!("{}: {}", c.type_, c.status),
+                    format!(
+                        "{condition_type}: {status}",
+                        condition_type = c.type_,
+                        status = c.status
+                    ),
                     Some(c.message.clone()),
                     c.is_good(),
                 )
@@ -57,7 +61,11 @@ impl ConditionsExt for Vec<DeploymentCondition> {
         self.iter()
             .map(|c| {
                 DisplayCondition::new(
-                    format!("{}: {}", c.type_, c.status),
+                    format!(
+                        "{condition_type}: {status}",
+                        condition_type = c.type_,
+                        status = c.status
+                    ),
                     c.message.clone(),
                     c.is_good(),
                 )
@@ -79,7 +87,11 @@ impl ConditionsExt for Vec<StatefulSetCondition> {
         self.iter()
             .map(|c| {
                 DisplayCondition::new(
-                    format!("{}: {}", c.type_, c.status),
+                    format!(
+                        "{condition_type}: {status}",
+                        condition_type = c.type_,
+                        status = c.status
+                    ),
                     c.message.clone(),
                     c.is_good(),
                 )

rust/stackable-cockpit/src/utils/k8s/labels.rs

@@ -37,7 +37,7 @@ pub trait ListParamsExt {
 impl ListParamsExt for ListParams {
     fn add_label(&mut self, label: impl Into<String>) {
         match self.label_selector.as_mut() {
-            Some(labels) => labels.push_str(format!(",{}", label.into()).as_str()),
+            Some(labels) => labels.push_str(format!(",{label}", label = label.into()).as_str()),
             None => self.label_selector = Some(label.into()),
         }
     }

rust/stackable-cockpit/src/utils/mod.rs

@@ -8,5 +8,5 @@ pub mod templating;
 
 /// Returns the name of the operator used in the Helm repository.
 pub fn operator_chart_name(name: &str) -> String {
-    format!("{}-operator", name)
+    format!("{name}-operator")
 }

rust/stackable-cockpit/src/utils/params.rs

@@ -106,7 +106,7 @@ pub enum RawParameterParseError {
 
 impl Display for RawParameter {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}={}", self.name, self.value)
+        write!(f, "{name}={value}", name = self.name, value = self.value)
     }
 }