diff --git a/crates/dtmt/src/cmd/bundle/extract.rs b/crates/dtmt/src/cmd/bundle/extract.rs index 981eae3..39aa09f 100644 --- a/crates/dtmt/src/cmd/bundle/extract.rs +++ b/crates/dtmt/src/cmd/bundle/extract.rs @@ -14,7 +14,7 @@ use crate::cmd::util::collect_bundle_paths; fn parse_glob_pattern(s: &str) -> Result { match Pattern::new(s) { Ok(p) => Ok(p), - Err(e) => Err(format!("Invalid glob pattern '{}': {}", s, e)), + Err(e) => Err(format!("Invalid glob pattern '{s}': {e}")), } } @@ -297,7 +297,7 @@ pub(crate) async fn run(ctx: Arc>, matches: &ArgMatches) -> name.clone() } }) - .unwrap_or(format!("{}", i)); + .unwrap_or(format!("{i}")); path.push(name); diff --git a/crates/dtmt/src/cmd/dictionary.rs b/crates/dtmt/src/cmd/dictionary.rs index ea9986d..d9709f8 100644 --- a/crates/dtmt/src/cmd/dictionary.rs +++ b/crates/dtmt/src/cmd/dictionary.rs @@ -89,7 +89,7 @@ pub(crate) async fn run(ctx: Arc>, matches: &ArgMatches) -> let ctx = ctx.read().await; for group in groups { let value = ctx.lookup_hash(*hash, (*group).into()); - println!("{}", value); + println!("{value}"); } Ok(()) diff --git a/crates/dtmt/src/cmd/util.rs b/crates/dtmt/src/cmd/util.rs index 99c2cbd..e35ee60 100644 --- a/crates/dtmt/src/cmd/util.rs +++ b/crates/dtmt/src/cmd/util.rs @@ -125,7 +125,7 @@ mod tests { for p in paths.iter() { let name = p.file_name().and_then(std::ffi::OsStr::to_str).unwrap(); - assert!(bundle_names.iter().find(|&n| n == &name).is_some()); + assert!(bundle_names.iter().any(|n| n == &name)); } } } diff --git a/lib/sdk/src/binary.rs b/lib/sdk/src/binary.rs index 2a50211..925f61f 100644 --- a/lib/sdk/src/binary.rs +++ b/lib/sdk/src/binary.rs @@ -132,7 +132,7 @@ where } }; - Err(err).with_section(|| format!("{pos:#X} ({pos})", pos = pos).header("Position: ")) + Err(err).with_section(|| format!("{pos:#X} ({pos})").header("Position: ")) } pub(crate) async fn write_padding(w: &mut W) -> Result diff --git a/lib/sdk/src/bundle/file.rs b/lib/sdk/src/bundle/file.rs index 066fc25..ff09c1b 100644 --- a/lib/sdk/src/bundle/file.rs +++ b/lib/sdk/src/bundle/file.rs @@ -146,7 +146,7 @@ impl BundleFileType { BundleFileType::WwiseStream => String::from("wwise_stream"), BundleFileType::Xml => String::from("xml"), - BundleFileType::Unknown(s) => format!("{:016X}", s), + BundleFileType::Unknown(s) => format!("{s:016X}"), } } diff --git a/lib/sdk/src/context.rs b/lib/sdk/src/context.rs index 00ce1e3..77fc31d 100644 --- a/lib/sdk/src/context.rs +++ b/lib/sdk/src/context.rs @@ -34,7 +34,7 @@ impl Context { s.to_owned() } else { tracing::debug!(%hash, "Murmur64 lookup failed"); - format!("{:016X}", hash) + format!("{hash:016X}") } } @@ -48,7 +48,7 @@ impl Context { s.to_owned() } else { tracing::debug!(%hash, "Murmur32 lookup failed"); - format!("{:08X}", hash) + format!("{hash:08X}") } } } @@ -69,6 +69,6 @@ where s.to_owned() } else { tracing::debug!(%hash, "Murmur64 lookup failed"); - format!("{:016X}", hash) + format!("{hash:016X}") } } diff --git a/lib/sdk/src/murmur/mod.rs b/lib/sdk/src/murmur/mod.rs index cc52f01..f3323d0 100644 --- a/lib/sdk/src/murmur/mod.rs +++ b/lib/sdk/src/murmur/mod.rs @@ -99,8 +99,7 @@ impl<'de> Visitor<'de> for Murmur64 { match Murmur64::try_from(value) { Ok(hash) => Ok(hash), Err(err) => Err(E::custom(format!( - "failed to convert '{}' to Murmur64: {}", - value, err + "failed to convert '{value}' to Murmur64: {err}" ))), } } @@ -120,7 +119,7 @@ impl Serialize for Murmur64 { where S: Serializer, { - serializer.serialize_str(&format!("{:016X}", self)) + serializer.serialize_str(&format!("{self:016X}")) } } @@ -155,7 +154,7 @@ impl Serialize for Murmur32 { where S: Serializer, { - serializer.serialize_str(&format!("{:08X}", self)) + serializer.serialize_str(&format!("{self:08X}")) } } @@ -198,8 +197,7 @@ impl<'de> Visitor<'de> for Murmur32 { match Murmur32::try_from(value) { Ok(hash) => Ok(hash), Err(err) => Err(E::custom(format!( - "failed to convert '{}' to Murmur32: {}", - value, err + "failed to convert '{value}' to Murmur32: {err}" ))), } }