Skip to content

Commit b19c190

Browse files
committed
fix: apply rustfmt formatting
1 parent 4b84601 commit b19c190

4 files changed

Lines changed: 22 additions & 14 deletions

File tree

crates/stackable-operator/src/config_overrides.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,5 +281,4 @@ mod tests {
281281
assert_eq!(result.get("key1"), Some(&Some("value1".to_owned())));
282282
assert_eq!(result.get("key2"), Some(&Some("value2".to_owned())));
283283
}
284-
285284
}

crates/stackable-operator/src/product_config_utils.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -798,8 +798,7 @@ mod tests {
798798
config_overrides: Option<TestConfigOverrides>,
799799
env_overrides: Option<HashMap<String, String>>,
800800
cli_overrides: Option<BTreeMap<String, String>>,
801-
) -> CommonConfiguration<Box<TestConfig>, GenericCommonConfig, TestConfigOverrides>
802-
{
801+
) -> CommonConfiguration<Box<TestConfig>, GenericCommonConfig, TestConfigOverrides> {
803802
CommonConfiguration {
804803
config: test_config.unwrap_or_default(),
805804
config_overrides: config_overrides.unwrap_or_default(),
@@ -1445,7 +1444,10 @@ mod tests {
14451444
#[allow(clippy::type_complexity)]
14461445
let roles: HashMap<
14471446
String,
1448-
(Vec<PropertyNameKind>, Role<Box<TestConfig>, TestConfigOverrides, TestRoleConfig>),
1447+
(
1448+
Vec<PropertyNameKind>,
1449+
Role<Box<TestConfig>, TestConfigOverrides, TestRoleConfig>,
1450+
),
14491451
> = collection! {
14501452
role_1.to_string() => (vec![PropertyNameKind::File(file_name.to_string()), PropertyNameKind::Env], Role {
14511453
config: build_common_config(
@@ -1542,7 +1544,10 @@ mod tests {
15421544
#[allow(clippy::type_complexity)]
15431545
let roles: HashMap<
15441546
String,
1545-
(Vec<PropertyNameKind>, Role<Box<TestConfig>, TestConfigOverrides, TestRoleConfig>),
1547+
(
1548+
Vec<PropertyNameKind>,
1549+
Role<Box<TestConfig>, TestConfigOverrides, TestRoleConfig>,
1550+
),
15461551
> = collection! {
15471552
role_1.to_string() => (vec![PropertyNameKind::File(file_name.to_string()), PropertyNameKind::Env], Role {
15481553
config: CommonConfiguration::default(),

crates/stackable-operator/src/role_utils.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,8 @@ where
389389
}
390390
}
391391

392-
impl<Config, ConfigOverrides, RoleConfig> Role<Config, ConfigOverrides, RoleConfig, JavaCommonConfig>
392+
impl<Config, ConfigOverrides, RoleConfig>
393+
Role<Config, ConfigOverrides, RoleConfig, JavaCommonConfig>
393394
where
394395
RoleConfig: Default + JsonSchema + Serialize,
395396
ConfigOverrides: Default + JsonSchema + Serialize,
@@ -457,9 +458,7 @@ pub struct RoleGroup<Config, CommonConfig, ConfigOverrides> {
457458
pub replicas: Option<u16>,
458459
}
459460

460-
impl<Config, CommonConfig, ConfigOverrides>
461-
RoleGroup<Config, CommonConfig, ConfigOverrides>
462-
{
461+
impl<Config, CommonConfig, ConfigOverrides> RoleGroup<Config, CommonConfig, ConfigOverrides> {
463462
pub fn validate_config<C, RoleConfig>(
464463
&self,
465464
role: &Role<Config, ConfigOverrides, RoleConfig, CommonConfig>,
@@ -613,8 +612,9 @@ mod tests {
613612
let operator_generated =
614613
JvmArgumentOverrides::new_with_only_additions(["-Xms1m".to_owned()].into());
615614

616-
let entire_role: Role<(), EmptyConfigOverrides, GenericRoleConfig, JavaCommonConfig> = serde_yaml::from_str(
617-
"
615+
let entire_role: Role<(), EmptyConfigOverrides, GenericRoleConfig, JavaCommonConfig> =
616+
serde_yaml::from_str(
617+
"
618618
jvmArgumentOverrides:
619619
add:
620620
- -Xms2m
@@ -624,8 +624,8 @@ mod tests {
624624
add:
625625
- -Xms3m
626626
",
627-
)
628-
.expect("Failed to parse role");
627+
)
628+
.expect("Failed to parse role");
629629

630630
let merged_jvm_argument_overrides = entire_role
631631
.get_merged_jvm_argument_overrides("default", &operator_generated)

crates/xtask/src/crd/dummy.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ use strum::EnumIter;
2424
#[serde(rename_all = "camelCase")]
2525
pub struct DummyConfigOverrides {
2626
/// Overrides for the `config.json` file.
27-
#[serde(default, rename = "config.json", skip_serializing_if = "Option::is_none")]
27+
#[serde(
28+
default,
29+
rename = "config.json",
30+
skip_serializing_if = "Option::is_none"
31+
)]
2832
pub config_json: Option<JsonConfigOverrides>,
2933

3034
/// Overrides for the `dummy.properties` file.

0 commit comments

Comments
 (0)