Skip to content

Commit 7e6051e

Browse files
kooooshkoooosh
committed
chore: fix formatting errors
Signed-off-by: Kush Upadhyay <[email protected]>
1 parent 6b3f4bf commit 7e6051e

File tree

17 files changed

+54
-66
lines changed

17 files changed

+54
-66
lines changed

‎sources/api/apiclient/src/main.rs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,8 @@ fn parse_args(args: env::Args) -> (Args, Subcommand) {
314314
let log_level_str = iter
315315
.next()
316316
.unwrap_or_else(|| usage_msg("Did not give argument to --log-level"));
317-
global_args.log_level =
318-
LevelFilter::from_str(&log_level_str).unwrap_or_else(|_| {
319-
usage_msg(format!("Invalid log level '{log_level_str}'"))
320-
});
317+
global_args.log_level = LevelFilter::from_str(&log_level_str)
318+
.unwrap_or_else(|_| usage_msg(format!("Invalid log level '{log_level_str}'")));
321319
}
322320

323321
"-v" | "--verbose" => global_args.log_level = LevelFilter::Debug,
@@ -531,10 +529,8 @@ fn parse_set_args(args: Vec<String>) -> Subcommand {
531529
.next()
532530
.unwrap_or_else(|| usage_msg("Did not give argument to -j | --json"));
533531

534-
let input_val: serde_json::Value =
535-
serde_json::from_str(&raw_json).unwrap_or_else(|e| {
536-
usage_msg(format!("Couldn't parse given JSON input: {e}"))
537-
});
532+
let input_val: serde_json::Value = serde_json::from_str(&raw_json)
533+
.unwrap_or_else(|e| usage_msg(format!("Couldn't parse given JSON input: {e}")));
538534

539535
let mut input_map = match input_val {
540536
serde_json::Value::Object(map) => map,

‎sources/api/apiserver/src/bin/apiserver.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,10 @@ fn parse_args(args: env::Args) -> Args {
9494
let log_level_str = iter
9595
.next()
9696
.unwrap_or_else(|| usage_msg("Did not give argument to --log-level"));
97-
log_level = Some(LevelFilter::from_str(&log_level_str).unwrap_or_else(|_| {
98-
usage_msg(format!("Invalid log level '{log_level_str}'"))
99-
}));
97+
log_level =
98+
Some(LevelFilter::from_str(&log_level_str).unwrap_or_else(|_| {
99+
usage_msg(format!("Invalid log level '{log_level_str}'"))
100+
}));
100101
}
101102

102103
"--socket-path" => {

‎sources/api/corndog/src/main.rs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,10 @@ fn parse_args(args: env::Args) -> Args {
320320
let log_level_str = iter
321321
.next()
322322
.unwrap_or_else(|| usage_msg("Did not give argument to --log-level"));
323-
log_level = Some(LevelFilter::from_str(&log_level_str).unwrap_or_else(|_| {
324-
usage_msg(format!("Invalid log level '{log_level_str}'"))
325-
}));
323+
log_level =
324+
Some(LevelFilter::from_str(&log_level_str).unwrap_or_else(|_| {
325+
usage_msg(format!("Invalid log level '{log_level_str}'"))
326+
}));
326327
}
327328

328329
"--config-path" => {
@@ -584,11 +585,7 @@ mod test {
584585
for line in config.lines() {
585586
// Split the line into key and value
586587
let parts: Vec<&str> = line.splitn(2, " = ").collect();
587-
assert_eq!(
588-
parts.len(),
589-
2,
590-
"Line should contain key-value pair: {line}"
591-
);
588+
assert_eq!(parts.len(), 2, "Line should contain key-value pair: {line}");
592589

593590
// Verify key portion starts with dash and contains no additional dashes
594591
let key = parts[0];

‎sources/api/datastore/src/serialization/pairs.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,7 @@ fn key_append_or_create(old_prefix: &Option<Key>, key: &Key) -> Result<Key> {
312312
if let Some(old_prefix) = old_prefix {
313313
old_prefix.append_key(key).map_err(|e| {
314314
error::InvalidKeySnafu {
315-
msg: format!(
316-
"appending '{key}' to '{old_prefix}' is invalid as Key: {e}"
317-
),
315+
msg: format!("appending '{key}' to '{old_prefix}' is invalid as Key: {e}"),
318316
}
319317
.into_error(NoSource)
320318
})

‎sources/api/host-containers/src/main.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,7 @@ where
253253
"\n# Just for reference; service is enabled or disabled by host-containers service"
254254
)
255255
.context(error::EnvFileBuildFailedSnafu { name })?;
256-
writeln!(output, "# CTR_ENABLED={enabled}")
257-
.context(error::EnvFileBuildFailedSnafu { name })?;
256+
writeln!(output, "# CTR_ENABLED={enabled}").context(error::EnvFileBuildFailedSnafu { name })?;
258257

259258
fs::write(&path, output).context(error::EnvFileWriteFailedSnafu { path })?;
260259

@@ -298,9 +297,10 @@ fn parse_args(args: env::Args) -> Args {
298297
let log_level_str = iter
299298
.next()
300299
.unwrap_or_else(|| usage_msg("Did not give argument to --log-level"));
301-
log_level = Some(LevelFilter::from_str(&log_level_str).unwrap_or_else(|_| {
302-
usage_msg(format!("Invalid log level '{log_level_str}'"))
303-
}));
300+
log_level =
301+
Some(LevelFilter::from_str(&log_level_str).unwrap_or_else(|_| {
302+
usage_msg(format!("Invalid log level '{log_level_str}'"))
303+
}));
304304
}
305305

306306
"--config-path" => {

‎sources/api/migration/migrator/src/args.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,12 @@ impl Args {
6363

6464
// On first boot, the data store won't exist yet, because storewolf runs after.
6565
if !Path::new(&path_str).exists() {
66-
eprintln!(
67-
"Data store does not exist at given path, exiting ({path_str})"
68-
);
66+
eprintln!("Data store does not exist at given path, exiting ({path_str})");
6967
process::exit(0);
7068
}
7169

7270
let canonical = fs::canonicalize(path_str).unwrap_or_else(|e| {
73-
usage_msg(format!(
74-
"Could not canonicalize given data store path: {e}"
75-
))
71+
usage_msg(format!("Could not canonicalize given data store path: {e}"))
7672
});
7773
trace!("Canonicalized data store path: {}", canonical.display());
7874
datastore_path = Some(canonical);

‎sources/api/schnauzer/src/helpers/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,9 +1177,9 @@ pub fn ecs_metadata_service_limits(
11771177
(Value::Null, Value::Number(burst)) => {
11781178
format!("{DEFAULT_ECS_METADATA_SERVICE_RPS},{burst}")
11791179
}
1180-
(Value::Null, Value::Null) => format!(
1181-
"{DEFAULT_ECS_METADATA_SERVICE_RPS},{DEFAULT_ECS_METADATA_SERVICE_BURST}"
1182-
),
1180+
(Value::Null, Value::Null) => {
1181+
format!("{DEFAULT_ECS_METADATA_SERVICE_RPS},{DEFAULT_ECS_METADATA_SERVICE_BURST}")
1182+
}
11831183
(rps, burst) => {
11841184
return Err(RenderError::from(
11851185
error::TemplateHelperError::InvalidMetadataServiceLimits {

‎sources/api/settings-committer/src/main.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,10 @@ fn parse_args(args: env::Args) -> Args {
173173
let log_level_str = iter
174174
.next()
175175
.unwrap_or_else(|| usage_msg("Did not give argument to --log-level"));
176-
log_level = Some(LevelFilter::from_str(&log_level_str).unwrap_or_else(|_| {
177-
usage_msg(format!("Invalid log level '{log_level_str}'"))
178-
}));
176+
log_level =
177+
Some(LevelFilter::from_str(&log_level_str).unwrap_or_else(|_| {
178+
usage_msg(format!("Invalid log level '{log_level_str}'"))
179+
}));
179180
}
180181

181182
"--socket-path" => {

‎sources/api/storewolf/src/main.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -566,9 +566,10 @@ fn parse_args(args: env::Args) -> Args {
566566
let log_level_str = iter
567567
.next()
568568
.unwrap_or_else(|| usage_msg("Did not give argument to --log-level"));
569-
log_level = Some(LevelFilter::from_str(&log_level_str).unwrap_or_else(|_| {
570-
usage_msg(format!("Invalid log level '{log_level_str}'"))
571-
}));
569+
log_level =
570+
Some(LevelFilter::from_str(&log_level_str).unwrap_or_else(|_| {
571+
usage_msg(format!("Invalid log level '{log_level_str}'"))
572+
}));
572573
}
573574

574575
"--version" => {

‎sources/api/sundog/src/main.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -547,9 +547,10 @@ fn parse_args(args: env::Args) -> Args {
547547
let log_level_str = iter
548548
.next()
549549
.unwrap_or_else(|| usage_msg("Did not give argument to --log-level"));
550-
log_level = Some(LevelFilter::from_str(&log_level_str).unwrap_or_else(|_| {
551-
usage_msg(format!("Invalid log level '{log_level_str}'"))
552-
}));
550+
log_level =
551+
Some(LevelFilter::from_str(&log_level_str).unwrap_or_else(|_| {
552+
usage_msg(format!("Invalid log level '{log_level_str}'"))
553+
}));
553554
}
554555

555556
"--socket-path" => {

0 commit comments

Comments
 (0)