From 664fb57459a23488e02d3eff53bbabc663f5d485 Mon Sep 17 00:00:00 2001 From: "Patrick J.P. Culp" Date: Fri, 13 Oct 2023 19:31:48 +0000 Subject: [PATCH 1/2] sources: fix clippy warnings for 1.73.0 --- sources/api/datastore/src/memory.rs | 2 +- sources/updater/updog/src/bin/updata.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/api/datastore/src/memory.rs b/sources/api/datastore/src/memory.rs index c89974ebe03..4ffc397912f 100644 --- a/sources/api/datastore/src/memory.rs +++ b/sources/api/datastore/src/memory.rs @@ -132,7 +132,7 @@ impl DataStore for MemoryDataStore { // Clone data key because we want the HashMap key type to be Key, not &Key, and we // can't pass ownership because we only have a reference from our parameters. .entry(data_key.clone()) - .or_insert_with(HashMap::new); + .or_default(); metadata_for_data.insert(metadata_key.clone(), value.as_ref().to_owned()); Ok(()) diff --git a/sources/updater/updog/src/bin/updata.rs b/sources/updater/updog/src/bin/updata.rs index f8347272a69..6cb4be0e510 100644 --- a/sources/updater/updog/src/bin/updata.rs +++ b/sources/updater/updog/src/bin/updata.rs @@ -284,7 +284,7 @@ fn main_inner() -> Result<()> { match cmd.cmd { Command::Init(args) => { match update_metadata::write_file(&args.file, &Manifest::default()) { - Ok(_) => Ok(()), + Ok(()) => Ok(()), Err(e) => Err(error::Error::UpdateMetadata { source: e }), } } From 20f5b03be09b04445cdc2ed3f5d3206fd51b2cca Mon Sep 17 00:00:00 2001 From: "Patrick J.P. Culp" Date: Fri, 13 Oct 2023 19:32:25 +0000 Subject: [PATCH 2/2] build: update SDK to 0.35.0 --- Twoliter.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Twoliter.toml b/Twoliter.toml index c52f30fe7a6..10381780532 100644 --- a/Twoliter.toml +++ b/Twoliter.toml @@ -3,9 +3,9 @@ schema-version = 1 [sdk] registry = "public.ecr.aws/bottlerocket" name = "bottlerocket-sdk" -version = "v0.34.1" +version = "v0.35.0" [toolchain] registry = "public.ecr.aws/bottlerocket" name = "bottlerocket-toolchain" -version = "v0.34.1" +version = "v0.35.0"