Merge pull request #3403 from webern/tools-clippy

tools: fix clippy warnings
bottlerocket-os · Sep 6, 2023 · 2db27b7 · 2db27b7
2 parents d6e592a + 82abd33
commit 2db27b7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/tools/buildsys/src/builder.rs b/tools/buildsys/src/builder.rs
@@ -207,9 +207,7 @@ impl VariantBuilder {
         );
         args.build_arg(
             "KERNEL_PARAMETERS",
-            kernel_parameters
-                .map(|v| v.join(" "))
-                .unwrap_or_else(|| "".to_string()),
+            kernel_parameters.map(|v| v.join(" ")).unwrap_or_default(),
         );
 
         if let Some(image_features) = image_features {

diff --git a/tools/pubsys/src/aws/ssm/template.rs b/tools/pubsys/src/aws/ssm/template.rs
@@ -196,7 +196,7 @@ impl From<&Vec<RenderedParameter>> for RenderedParametersMap {
         for parameter in parameters.iter() {
             parameter_map
                 .entry(parameter.ssm_key.region.to_string())
-                .or_insert(HashMap::new())
+                .or_default()
                 .insert(
                     parameter.ssm_key.name.to_owned(),
                     parameter.value.to_owned(),

diff --git a/tools/testsys/src/crds.rs b/tools/testsys/src/crds.rs
@@ -486,7 +486,7 @@ pub(crate) trait CrdCreator: Sync {
                             .additional_fields(&test_type.to_string())
                             .into_iter()
                             // Add the image id in case it is needed for cluster creation
-                            .chain(Some(("image-id".to_string(), image_id.clone())).into_iter())
+                            .chain(Some(("image-id".to_string(), image_id.clone())))
                             .collect::<BTreeMap<String, String>>(),
                     )?,
                     hardware_csv: &crd_input