chore: Apply Rust 2024 formatting

Author: Techassi

crates/k8s-version/src/group.rs

@@ -1,7 +1,7 @@
 use std::{fmt, ops::Deref, str::FromStr, sync::LazyLock};
 
 use regex::Regex;
-use snafu::{ensure, Snafu};
+use snafu::{Snafu, ensure};
 
 const MAX_GROUP_LENGTH: usize = 253;
 

crates/k8s-version/src/version.rs

@@ -16,7 +16,9 @@ static VERSION_REGEX: LazyLock<Regex> = LazyLock::new(|| {
 /// unparsed input.
 #[derive(Debug, PartialEq, Snafu)]
 pub enum ParseVersionError {
-    #[snafu(display("invalid version format. Input is empty, contains non-ASCII characters or contains more than 63 characters"))]
+    #[snafu(display(
+        "invalid version format. Input is empty, contains non-ASCII characters or contains more than 63 characters"
+    ))]
     InvalidFormat,
 
     #[snafu(display("failed to parse major version"))]

crates/stackable-certs/src/ca/mod.rs

@@ -10,7 +10,7 @@ use stackable_operator::{client::Client, commons::secret::SecretReference, time:
 use tracing::{debug, instrument};
 use x509_cert::{
     builder::{Builder, CertificateBuilder, Profile},
-    der::{pem::LineEnding, referenced::OwnedToRef, DecodePem},
+    der::{DecodePem, pem::LineEnding, referenced::OwnedToRef},
     ext::pkix::{AuthorityKeyIdentifier, ExtendedKeyUsage},
     name::Name,
     serial_number::SerialNumber,
@@ -19,8 +19,8 @@ use x509_cert::{
 };
 
 use crate::{
-    keys::{ecdsa, rsa, CertificateKeypair},
     CertificatePair,
+    keys::{CertificateKeypair, ecdsa, rsa},
 };
 
 mod consts;

crates/stackable-certs/src/keys/ecdsa.rs

@@ -1,7 +1,7 @@
 //! Abstraction layer around the [`ecdsa`] crate. This module provides types
 //! which abstract away the generation of ECDSA keys used for signing of CAs
 //! and other certificates.
-use p256::{pkcs8::DecodePrivateKey, NistP256};
+use p256::{NistP256, pkcs8::DecodePrivateKey};
 use rand_core::{CryptoRngCore, OsRng};
 use snafu::{ResultExt, Snafu};
 use tracing::instrument;

crates/stackable-certs/src/keys/rsa.rs

@@ -2,7 +2,7 @@
 //! which abstract away the generation of RSA keys used for signing of CAs
 //! and other certificates.
 use rand_core::{CryptoRngCore, OsRng};
-use rsa::{pkcs8::DecodePrivateKey, RsaPrivateKey};
+use rsa::{RsaPrivateKey, pkcs8::DecodePrivateKey};
 use signature::Keypair;
 use snafu::{ResultExt, Snafu};
 use tracing::instrument;

crates/stackable-certs/src/lib.rs

@@ -22,7 +22,7 @@
 use std::ops::Deref;
 
 use snafu::Snafu;
-use x509_cert::{spki::EncodePublicKey, Certificate};
+use x509_cert::{Certificate, spki::EncodePublicKey};
 #[cfg(feature = "rustls")]
 use {
     p256::pkcs8::EncodePrivateKey,

crates/stackable-operator-derive/src/fragment.rs

@@ -1,9 +1,9 @@
-use darling::{ast::Data, FromDeriveInput, FromField, FromMeta, FromVariant};
+use darling::{FromDeriveInput, FromField, FromMeta, FromVariant, ast::Data};
 use proc_macro2::{Ident, TokenStream, TokenTree};
-use quote::{format_ident, quote, ToTokens};
+use quote::{ToTokens, format_ident, quote};
 use syn::{
-    parse_quote, Attribute, DeriveInput, Generics, Meta, MetaList, Path, Type, Visibility,
-    WherePredicate,
+    Attribute, DeriveInput, Generics, Meta, MetaList, Path, Type, Visibility, WherePredicate,
+    parse_quote,
 };
 
 #[derive(FromMeta)]
@@ -125,7 +125,7 @@ pub fn derive(input: DeriveInput) -> TokenStream {
         Data::Enum(_) => {
             return quote! {
                 compile_error!("`#[derive(Fragment)]` does not currently support enums");
-            }
+            };
         }
         Data::Struct(fields) => fields.fields,
     };

crates/stackable-operator-derive/src/merge.rs

@@ -1,10 +1,10 @@
 use darling::{
-    ast::{Data, Fields},
     FromDeriveInput, FromField, FromMeta, FromVariant,
+    ast::{Data, Fields},
 };
 use proc_macro2::{Ident, Span, TokenStream};
 use quote::{format_ident, quote};
-use syn::{parse_quote, DeriveInput, Generics, Index, Path, WherePredicate};
+use syn::{DeriveInput, Generics, Index, Path, WherePredicate, parse_quote};
 
 #[derive(FromMeta)]
 struct PathOverrides {
@@ -67,13 +67,10 @@ pub fn derive(input: DeriveInput) -> TokenStream {
 
     let (ty, variants) = match data {
         // Structs are almost single-variant enums, so we can reuse most of the same matching code for both cases
-        Data::Struct(fields) => (
-            InputType::Struct,
-            vec![MergeVariant {
-                ident: Ident::new("__placeholder", Span::call_site()),
-                fields,
-            }],
-        ),
+        Data::Struct(fields) => (InputType::Struct, vec![MergeVariant {
+            ident: Ident::new("__placeholder", Span::call_site()),
+            fields,
+        }]),
         Data::Enum(variants) => (InputType::Enum, variants),
     };
     let merge_variants = variants

crates/stackable-operator/src/builder/pdb.rs

@@ -205,7 +205,7 @@ mod tests {
         api::policy::v1::{PodDisruptionBudget, PodDisruptionBudgetSpec},
         apimachinery::pkg::{apis::meta::v1::LabelSelector, util::intstr::IntOrString},
     };
-    use kube::{core::ObjectMeta, CustomResource};
+    use kube::{CustomResource, core::ObjectMeta};
     use schemars::JsonSchema;
     use serde::{Deserialize, Serialize};
 
@@ -229,28 +229,22 @@ mod tests {
             .with_min_available(42)
             .build();
 
-        assert_eq!(
-            pdb,
-            PodDisruptionBudget {
-                metadata: ObjectMeta {
-                    name: Some("trino".to_string()),
-                    namespace: Some("default".to_string()),
-                    ..Default::default()
-                },
-                spec: Some(PodDisruptionBudgetSpec {
-                    min_available: Some(IntOrString::Int(42)),
-                    selector: Some(LabelSelector {
-                        match_expressions: None,
-                        match_labels: Some(BTreeMap::from([(
-                            "foo".to_string(),
-                            "bar".to_string()
-                        )])),
-                    }),
-                    ..Default::default()
+        assert_eq!(pdb, PodDisruptionBudget {
+            metadata: ObjectMeta {
+                name: Some("trino".to_string()),
+                namespace: Some("default".to_string()),
+                ..Default::default()
+            },
+            spec: Some(PodDisruptionBudgetSpec {
+                min_available: Some(IntOrString::Int(42)),
+                selector: Some(LabelSelector {
+                    match_expressions: None,
+                    match_labels: Some(BTreeMap::from([("foo".to_string(), "bar".to_string())])),
                 }),
                 ..Default::default()
-            }
-        )
+            }),
+            ..Default::default()
+        })
     }
 
     #[test]
@@ -289,55 +283,54 @@ mod tests {
         .with_max_unavailable(2)
         .build();
 
-        assert_eq!(
-            pdb,
-            PodDisruptionBudget {
-                metadata: ObjectMeta {
-                    name: Some("simple-trino-worker".to_string()),
-                    namespace: Some("default".to_string()),
-                    labels: Some(BTreeMap::from([
+        assert_eq!(pdb, PodDisruptionBudget {
+            metadata: ObjectMeta {
+                name: Some("simple-trino-worker".to_string()),
+                namespace: Some("default".to_string()),
+                labels: Some(BTreeMap::from([
+                    ("app.kubernetes.io/name".to_string(), "trino".to_string()),
+                    (
+                        "app.kubernetes.io/instance".to_string(),
+                        "simple-trino".to_string()
+                    ),
+                    (
+                        "app.kubernetes.io/managed-by".to_string(),
+                        "trino.stackable.tech_trino-operator-trino-controller".to_string()
+                    ),
+                    (
+                        "app.kubernetes.io/component".to_string(),
+                        "worker".to_string()
+                    )
+                ])),
+                owner_references: Some(vec![
+                    OwnerReferenceBuilder::new()
+                        .initialize_from_resource(&trino)
+                        .block_owner_deletion_opt(None)
+                        .controller_opt(Some(true))
+                        .build()
+                        .unwrap()
+                ]),
+                ..Default::default()
+            },
+            spec: Some(PodDisruptionBudgetSpec {
+                max_unavailable: Some(IntOrString::Int(2)),
+                selector: Some(LabelSelector {
+                    match_expressions: None,
+                    match_labels: Some(BTreeMap::from([
                         ("app.kubernetes.io/name".to_string(), "trino".to_string()),
                         (
                             "app.kubernetes.io/instance".to_string(),
                             "simple-trino".to_string()
                         ),
-                        (
-                            "app.kubernetes.io/managed-by".to_string(),
-                            "trino.stackable.tech_trino-operator-trino-controller".to_string()
-                        ),
                         (
                             "app.kubernetes.io/component".to_string(),
                             "worker".to_string()
                         )
                     ])),
-                    owner_references: Some(vec![OwnerReferenceBuilder::new()
-                        .initialize_from_resource(&trino)
-                        .block_owner_deletion_opt(None)
-                        .controller_opt(Some(true))
-                        .build()
-                        .unwrap()]),
-                    ..Default::default()
-                },
-                spec: Some(PodDisruptionBudgetSpec {
-                    max_unavailable: Some(IntOrString::Int(2)),
-                    selector: Some(LabelSelector {
-                        match_expressions: None,
-                        match_labels: Some(BTreeMap::from([
-                            ("app.kubernetes.io/name".to_string(), "trino".to_string()),
-                            (
-                                "app.kubernetes.io/instance".to_string(),
-                                "simple-trino".to_string()
-                            ),
-                            (
-                                "app.kubernetes.io/component".to_string(),
-                                "worker".to_string()
-                            )
-                        ])),
-                    }),
-                    ..Default::default()
                 }),
                 ..Default::default()
-            }
-        )
+            }),
+            ..Default::default()
+        })
     }
 }

crates/stackable-operator/src/builder/pod/container.rs

@@ -121,16 +121,13 @@ impl ContainerBuilder {
         name: impl Into<String>,
         field_path: FieldPathEnvVar,
     ) -> &mut Self {
-        self.add_env_var_from_source(
-            name,
-            EnvVarSource {
-                field_ref: Some(ObjectFieldSelector {
-                    field_path: field_path.to_string(),
-                    ..ObjectFieldSelector::default()
-                }),
-                ..EnvVarSource::default()
-            },
-        );
+        self.add_env_var_from_source(name, EnvVarSource {
+            field_ref: Some(ObjectFieldSelector {
+                field_path: field_path.to_string(),
+                ..ObjectFieldSelector::default()
+            }),
+            ..EnvVarSource::default()
+        });
         self
     }
 
@@ -141,17 +138,14 @@ impl ContainerBuilder {
         secret_name: impl Into<String>,
         secret_key: impl Into<String>,
     ) -> &mut Self {
-        self.add_env_var_from_source(
-            name,
-            EnvVarSource {
-                secret_key_ref: Some(SecretKeySelector {
-                    name: secret_name.into(),
-                    key: secret_key.into(),
-                    ..Default::default()
-                }),
+        self.add_env_var_from_source(name, EnvVarSource {
+            secret_key_ref: Some(SecretKeySelector {
+                name: secret_name.into(),
+                key: secret_key.into(),
                 ..Default::default()
-            },
-        );
+            }),
+            ..Default::default()
+        });
         self
     }
 
@@ -162,17 +156,14 @@ impl ContainerBuilder {
         config_map_name: impl Into<String>,
         config_map_key: impl Into<String>,
     ) -> &mut Self {
-        self.add_env_var_from_source(
-            name,
-            EnvVarSource {
-                config_map_key_ref: Some(ConfigMapKeySelector {
-                    name: config_map_name.into(),
-                    key: config_map_key.into(),
-                    ..Default::default()
-                }),
+        self.add_env_var_from_source(name, EnvVarSource {
+            config_map_key_ref: Some(ConfigMapKeySelector {
+                name: config_map_name.into(),
+                key: config_map_key.into(),
                 ..Default::default()
-            },
-        );
+            }),
+            ..Default::default()
+        });
         self
     }
 
@@ -469,9 +460,11 @@ mod tests {
             .expect("add volume mount")
             .add_container_port(container_port_name, container_port)
             .resources(resources.clone())
-            .add_container_ports(vec![ContainerPortBuilder::new(container_port_1)
-                .name(container_port_name_1)
-                .build()])
+            .add_container_ports(vec![
+                ContainerPortBuilder::new(container_port_1)
+                    .name(container_port_name_1)
+                    .build(),
+            ])
             .build();
 
         assert_eq!(container.name, "testcontainer");