Skip to content

Commit 48b3224

Browse files
committed
chore: fix clippy lints
Signed-off-by: Gavin Inglis <giinglis@amazon.com>
1 parent 02caa25 commit 48b3224

File tree

6 files changed

+10
-12
lines changed

6 files changed

+10
-12
lines changed

sources/api/datastore/src/deserialization/pairs.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,7 @@ where
353353
} else {
354354
// No dot, so we have a scalar; hand the data to a scalar deserializer.
355355
trace!(
356-
"Key '{}' is scalar, getting '{}' from input to deserialize",
357-
struct_name,
358-
path
356+
"Key '{struct_name}' is scalar, getting '{path}' from input to deserialize"
359357
);
360358
let val = self.map.get(&path)?;
361359
Some((

sources/api/datastore/src/key.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ impl Key {
314314
// Push final segment (keys don't end with a dot, which is when we normally push)
315315
segments.push(segment);
316316

317-
trace!("Parsed key name '{}' to segments {:?}", name, segments);
317+
trace!("Parsed key name '{name}' to segments {segments:?}");
318318
Ok(segments)
319319
}
320320

@@ -348,7 +348,7 @@ impl Key {
348348

349349
// Join the (possibly quoted) segments with our separator.
350350
let name = outputs.join(KEY_SEPARATOR_STR);
351-
trace!("Encoded key '{}' from segments {:?}", name, segments);
351+
trace!("Encoded key '{name}' from segments {segments:?}");
352352
Ok(name)
353353
}
354354

sources/api/datastore/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,15 +205,15 @@ pub trait DataStore {
205205
committed: &Committed,
206206
) -> Result<HashMap<Key, String>> {
207207
let keys = self.list_populated_keys(&find_prefix, committed)?;
208-
trace!("Found populated keys: {:?}", keys);
208+
trace!("Found populated keys: {keys:?}");
209209
if keys.is_empty() {
210210
return Ok(HashMap::new());
211211
}
212212

213213
let mut result = HashMap::new();
214214
for key in keys {
215215
// Already confirmed key via listing keys, so an error is more serious.
216-
trace!("Pulling value from datastore for key: {}", key);
216+
trace!("Pulling value from datastore for key: {key}");
217217
let value = self
218218
.get_key(&key, committed)?
219219
.context(error::ListedKeyNotPresentSnafu { key: key.name() })?;
@@ -238,7 +238,7 @@ pub trait DataStore {
238238
S2: AsRef<str>,
239239
{
240240
let meta_map = self.list_populated_metadata(&find_prefix, committed, metadata_key_name)?;
241-
trace!("Found populated metadata: {:?}", meta_map);
241+
trace!("Found populated metadata: {meta_map:?}");
242242
if meta_map.is_empty() {
243243
return Ok(HashMap::new());
244244
}

sources/api/datastore/src/serialization/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ impl ser::Serializer for &MapKeySerializer {
5151
fn serialize_str(self, value: &str) -> Result<String> {
5252
// Make sure string is valid as a key.
5353
let key = Key::from_segments(KeyType::Data, &[value]).map_err(|e| {
54-
debug!("MapKeySerializer got invalid key name: {}", value);
54+
debug!("MapKeySerializer got invalid key name: {value}");
5555
error::InvalidKeySnafu {
5656
msg: format!("{e}"),
5757
}
5858
.into_error(NoSource)
5959
})?;
60-
trace!("MapKeySerializer got OK key: {}", key);
60+
trace!("MapKeySerializer got OK key: {key}");
6161
Ok(key.to_string())
6262
}
6363

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ impl<'a> ser::Serializer for Serializer<'a> {
204204
let prefix = match self.prefix {
205205
p @ Some(_) => p,
206206
None => {
207-
trace!("Had no prefix, starting with struct name: {}", name);
207+
trace!("Had no prefix, starting with struct name: {name}");
208208
let key = Key::from_segments(KeyType::Data, &[&name]).map_err(|e| {
209209
error::InvalidKeySnafu {
210210
msg: format!("struct '{name}' not valid as Key: {e}"),

sources/bottlerocket-release/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ impl BottlerocketRelease {
8888
value = &value[..value.len() - 1];
8989
}
9090

91-
debug!("Found os-release value {}={}", key, value);
91+
debug!("Found os-release value {key}={value}");
9292
Some((key.to_owned(), value.to_owned()))
9393
})
9494
.collect();

0 commit comments

Comments
 (0)