fix new clippy lint to put all variables directly in format strings

Author: Zaechus

src/action.rs

@@ -36,6 +36,6 @@ impl Default for Action {
 
 impl Action {
     pub(crate) fn what_do(s: &str) -> Self {
-        Self::Clarify(format!("What do you want to {}?", s))
+        Self::Clarify(format!("What do you want to {s}?"))
     }
 }

src/game.rs

@@ -290,7 +290,7 @@ impl Game {
                     Outcome::Active(output) => {
                         res = format!("{}\n\n{}{}", res, output, self.combat())
                     }
-                    Outcome::Idle(output) => res = format!("{}\n\n{}", res, output,),
+                    Outcome::Idle(output) => res = format!("{res}\n\n{output}"),
                 }
             }
         }
@@ -332,7 +332,7 @@ impl Game {
 
         if player.hp() <= 0 {
             self.dead = true;
-            format!("{}\n\nYou die.", res)
+            format!("{res}\n\nYou die.")
         } else {
             res
         }
@@ -534,7 +534,7 @@ impl Game {
         if inv.is_empty() {
             "Your inventory is empty.".to_owned()
         } else {
-            format!("You are carrying:{}", inv)
+            format!("You are carrying:{inv}")
         }
     }
 
@@ -702,7 +702,7 @@ impl Game {
             Action::Open(noun) => Outcome::Active(self.parse_open(noun)),
             Action::Sleep => Outcome::Active("Time passes...".to_owned()),
             Action::Take(noun) => Outcome::Active(self.parse_take(noun)),
-            Action::Unknown(verb) => Outcome::Idle(format!("I do not know the verb \"{}\".", verb)),
+            Action::Unknown(verb) => Outcome::Idle(format!("I do not know the verb \"{verb}\".")),
             Action::Version => Outcome::Idle(format!("Kingslayer {}", env!("CARGO_PKG_VERSION"))),
             Action::Walk(direction) => Outcome::Active(self.parse_walk(direction)),
             Action::Wear(_) => Outcome::Active("You can't do that yet.".to_owned()),
@@ -940,7 +940,7 @@ impl Game {
 }
 
 fn cant_see_any(noun: &str) -> String {
-    format!("You can't see any {} here.", noun)
+    format!("You can't see any {noun} here.")
 }
 
 fn list_names(names: &[&str], sep: &str) -> String {
@@ -955,7 +955,7 @@ fn list_names(names: &[&str], sep: &str) -> String {
                 "{a} {}, {sep} {a} {}",
                 names[1..names.len() - 1]
                     .iter()
-                    .fold(names[0].to_owned(), |acc, i| format!("{}, {a} {}", acc, i)),
+                    .fold(names[0].to_owned(), |acc, i| format!("{acc}, {a} {i}")),
                 names[names.len() - 1]
             )
         }

src/main.rs

@@ -6,7 +6,7 @@ fn main() -> ExitCode {
     match run() {
         Ok(code) => code,
         Err(err) => {
-            eprintln!("{}", err);
+            eprintln!("{err}");
             ExitCode::FAILURE
         }
     }

src/tokens.rs

@@ -104,8 +104,8 @@ impl Tokens {
                 }
                 match (noun.is_empty(), prep.as_str(), obj.is_empty()) {
                     (false, _, false) => Action::Attack(noun.to_owned(), obj.to_owned()),
-                    (true, _, false) => Action::what_do(&format!("{} {} the {}", verb, prep, obj)),
-                    (false, _, true) => Action::what_do(&format!("{} the {} {}", verb, noun, prep)),
+                    (true, _, false) => Action::what_do(&format!("{verb} {prep} the {obj}")),
+                    (false, _, true) => Action::what_do(&format!("{verb} the {noun} {prep}")),
                     (true, _, true) => Action::what_do(verb),
                 }
             }
@@ -135,7 +135,7 @@ impl Tokens {
                     match prep.as_str() {
                         "in" => Action::Walk("enter".to_owned()),
                         "out" => Action::Walk("exit".to_owned()),
-                        _ => Action::Clarify(format!("Where do you want to {}?", verb)),
+                        _ => Action::Clarify(format!("Where do you want to {verb}?")),
                     }
                 } else {
                     Action::Walk(noun.to_owned())
@@ -177,8 +177,8 @@ impl Tokens {
                     (true, "on", false) => Action::Wear(obj.to_owned()),
                     (true, "on", true) => Action::what_do("put on"),
                     (false, _, false) => Action::Put(noun.to_owned(), obj.to_owned()),
-                    (true, _, false) => Action::what_do(&format!("{} {} the {}", verb, prep, obj)),
-                    (false, _, true) => Action::what_do(&format!("{} the {} {}", verb, noun, prep)),
+                    (true, _, false) => Action::what_do(&format!("{verb} {prep} the {obj}")),
+                    (false, _, true) => Action::what_do(&format!("{verb} the {noun} {prep}")),
                     (true, _, true) => Action::what_do(verb),
                 }
             }