From 176e8ccd0b8dbd4e4b94059581d2f105e66b0415 Mon Sep 17 00:00:00 2001 From: Hamir Mahal Date: Sat, 17 Aug 2024 11:57:18 -0700 Subject: [PATCH] style: simplify string formatting for readability --- crates/taplo-cli/src/commands/format.rs | 2 +- crates/taplo/src/dom/to_toml.rs | 4 ++-- crates/taplo/src/formatter/mod.rs | 4 ++-- crates/taplo/src/tests/mod.rs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/taplo-cli/src/commands/format.rs b/crates/taplo-cli/src/commands/format.rs index 0407f1e84..792635569 100644 --- a/crates/taplo-cli/src/commands/format.rs +++ b/crates/taplo-cli/src/commands/format.rs @@ -260,7 +260,7 @@ impl Taplo { self.env .stderr() .write_all( - format!("Failed to write diff to stdout: {:?}", e) + format!("Failed to write diff to stdout: {e:?}") .as_str() .as_bytes(), ) diff --git a/crates/taplo/src/dom/to_toml.rs b/crates/taplo/src/dom/to_toml.rs index 7b3e60ba6..fa5b0d728 100644 --- a/crates/taplo/src/dom/to_toml.rs +++ b/crates/taplo/src/dom/to_toml.rs @@ -41,7 +41,7 @@ impl Node { // Use the original representation of primitives if available. if let Some(syntax) = self.syntax() { - return write!(f, "{}", syntax); + return write!(f, "{syntax}"); } } @@ -153,7 +153,7 @@ impl Node { Node::Bool(b) => write!(f, "{}", b.value())?, Node::Str(s) => { if let Some(syntax) = s.syntax() { - write!(f, "{}", syntax)?; + write!(f, "{syntax}")?; } else { let escaped = escape(s.value()); diff --git a/crates/taplo/src/formatter/mod.rs b/crates/taplo/src/formatter/mod.rs index 85b0cc9fd..0b9f0cc73 100644 --- a/crates/taplo/src/formatter/mod.rs +++ b/crates/taplo/src/formatter/mod.rs @@ -133,10 +133,10 @@ impl core::fmt::Display for OptionParseError { "invalid formatting option: {}", match self { OptionParseError::InvalidOption(k) => { - format!(r#"invalid option "{}""#, k) + format!(r#"invalid option "{k}""#) } OptionParseError::InvalidValue { key, error } => { - format!(r#"invalid value for option "{}": {}"#, key, error) + format!(r#"invalid value for option "{key}": {error}"#) } } ) diff --git a/crates/taplo/src/tests/mod.rs b/crates/taplo/src/tests/mod.rs index 4511e7944..3c4d12f2a 100644 --- a/crates/taplo/src/tests/mod.rs +++ b/crates/taplo/src/tests/mod.rs @@ -14,7 +14,7 @@ fn time_in_arrays() { let errors = parse(src).errors; - assert!(errors.is_empty(), "{:#?}", errors); + assert!(errors.is_empty(), "{errors:#?}"); } #[test] @@ -25,5 +25,5 @@ fn comments_after_tables() { "#; let errors = parse(src).errors; - assert!(errors.is_empty(), "{:#?}", errors); + assert!(errors.is_empty(), "{errors:#?}"); }