Merge pull request #20 from ComputerDruid/push-uulrvxkuvlql

cleanup: clippy fixes

Author: ComputerDruid

.gitignore

@@ -1 +1,2 @@
 /target
+.zed

src/blueprint/upgrade_quality.rs

@@ -89,16 +89,14 @@ pub(crate) fn upgrade(mut json: serde_json::Value) -> serde_json::Value {
             WalkAction::Enter
         } else if NO_UPGRADE_PATHS.contains(&path) {
             WalkAction::Break
+        } else if let Some(last) = path.last()
+            && last.contains("quality")
+        {
+            panic!(
+                "Unhandled quality in blueprint; not sure whether we should upgrade:\n &{path:?},"
+            );
         } else {
-            if let Some(last) = path.last()
-                && last.contains("quality")
-            {
-                panic!(
-                    "Unhandled quality in blueprint; not sure whether we should upgrade:\n &{path:?},"
-                );
-            } else {
-                WalkAction::Enter
-            }
+            WalkAction::Enter
         }
     });
     // upgrade_old(json)

src/main.rs

@@ -50,7 +50,7 @@ enum Commands {
 mod terminal;
 
 impl Commands {
-    fn run(self) -> () {
+    fn run(self) {
         match self {
             Commands::CountEntities {
                 to_blueprint,
@@ -105,13 +105,13 @@ impl Commands {
             Commands::Unwrap { blueprint_string } => {
                 let blueprint_string = blueprint_string.unwrap_or_else(terminal::prompt_blueprint);
                 let json = blueprint_to_json(&blueprint_string);
-                println!("{}", json);
+                println!("{json}");
             }
             Commands::Wrap {} => {
                 let mut buf = String::new();
                 stdin().read_to_string(&mut buf).unwrap();
                 let blueprint_string = json_to_blueprint(serde_json::from_str(&buf).unwrap());
-                println!("{}", blueprint_string);
+                println!("{blueprint_string}");
             }
             Commands::UpgradeQuality {
                 to_clipboard,

src/save.rs

@@ -99,7 +99,7 @@ fn compute_name(json: &serde_json::Value) -> String {
                 name.push_str(&name_part);
             }
             if iter.next().is_some() {
-                name.push_str("…");
+                name.push('…');
             }
         } else if let Some(blueprint) = json.get("upgrade_planner")
             && let Some(settings) = blueprint.get("settings")
@@ -135,7 +135,7 @@ fn compute_name(json: &serde_json::Value) -> String {
                 name.push_str(&name_part);
             }
             if iter.next().is_some() {
-                name.push_str("…");
+                name.push('…');
             }
             if !name.is_empty() {
                 name = format!("Upgrade {name}");
@@ -172,7 +172,7 @@ pub fn save(mut json: serde_json::Value, dir: Option<&Path>) {
         && let Some(blueprints) = blueprint_book.get_mut("blueprints")
         && let Some(blueprints) = blueprints.as_array_mut()
     {
-        let blueprints = mem::replace(blueprints, vec![]);
+        let blueprints = mem::take(blueprints);
         let path = if let Some(dir) = dir {
             dir.join(&name)
         } else {

src/terminal.rs

@@ -14,7 +14,7 @@ pub fn prompt_blueprint() -> String {
     crossterm::terminal::enable_raw_mode().unwrap();
     eprint!("Paste blueprint:\r\n");
     const PROMPT: &str = "🟦❯ ";
-    eprint!("{}", PROMPT);
+    eprint!("{PROMPT}");
     let mut warned = false;
     let blueprint_string = loop {
         let event = crossterm::event::read().unwrap();
@@ -29,7 +29,7 @@ pub fn prompt_blueprint() -> String {
                 if !warned {
                     warned = true;
                     eprint!("\rWARN: Only pasting works.\r\n");
-                    eprint!("{}", PROMPT);
+                    eprint!("{PROMPT}");
                 }
             }
             crossterm::event::Event::Paste(s) => {