clippy

Signed-off-by: Jessie Frazelle <[email protected]>

Author: jessfraz

src/cmd_alias.rs

@@ -48,7 +48,8 @@ impl crate::cmd::Command for CmdAliasDelete {
 
         let (expansion, ok) = alias_config.get(&self.alias);
         if !ok {
-            bail!("no such alias {}", self.alias);
+            let alias = &self.alias;
+            bail!("no such alias {alias}");
         }
 
         match alias_config.delete(&self.alias) {
@@ -63,7 +64,8 @@ impl crate::cmd::Command for CmdAliasDelete {
                 )?;
             }
             Err(e) => {
-                bail!("failed to delete alias {}: {}", self.alias, e);
+                let alias = &self.alias;
+                bail!("failed to delete alias {alias}: {e}");
             }
         }
 

src/cmd_auth.rs

@@ -166,7 +166,7 @@ impl crate::cmd::Command for CmdAuthLogin {
                         return Ok(());
                     }
                     Err(err) => {
-                        return Err(anyhow!("prompt failed: {}", err));
+                        return Err(anyhow!("prompt failed: {err}"));
                     }
                 }
             }
@@ -189,7 +189,7 @@ impl crate::cmd::Command for CmdAuthLogin {
                         }
                     }
                     Err(err) => {
-                        return Err(anyhow!("prompt failed: {}", err));
+                        return Err(anyhow!("prompt failed: {err}"));
                     }
                 }
             }
@@ -251,7 +251,7 @@ impl crate::cmd::Command for CmdAuthLogin {
                 {
                     Ok(input) => input,
                     Err(err) => {
-                        return Err(anyhow!("prompt failed: {}", err));
+                        return Err(anyhow!("prompt failed: {err}"));
                     }
                 }
             };
@@ -274,7 +274,9 @@ impl crate::cmd::Command for CmdAuthLogin {
         // Save the config.
         ctx.config.write()?;
 
-        writeln!(ctx.io.out, "{} Logged in as {}", cs.success_icon(), cs.bold(&email))?;
+        let success_icon = cs.success_icon();
+        let bold_email = cs.bold(&email);
+        writeln!(ctx.io.out, "{success_icon} Logged in as {bold_email}")?;
 
         Ok(())
     }
@@ -319,7 +321,7 @@ impl crate::cmd::Command for CmdAuthLogout {
                 match index {
                     Ok(i) => candidates[i].to_string(),
                     Err(err) => {
-                        return Err(anyhow!("prompt failed: {}", err));
+                        return Err(anyhow!("prompt failed: {err}"));
                     }
                 }
             }
@@ -334,7 +336,7 @@ impl crate::cmd::Command for CmdAuthLogout {
             }
 
             if !found {
-                return Err(anyhow!("not logged into {}", hostname));
+                return Err(anyhow!("not logged into {hostname}"));
             }
 
             hostname
@@ -368,11 +370,10 @@ impl crate::cmd::Command for CmdAuthLogout {
         let cs = ctx.io.color_scheme();
 
         if ctx.io.can_prompt() {
+            let bold_email = cs.bold(&email);
             match dialoguer::Confirm::new()
                 .with_prompt(format!(
-                    "Are you sure you want to log out of {} as {}?",
-                    hostname,
-                    cs.bold(&email)
+                    "Are you sure you want to log out of {hostname} as {bold_email}?"
                 ))
                 .interact()
             {
@@ -381,7 +382,7 @@ impl crate::cmd::Command for CmdAuthLogout {
                     return Ok(());
                 }
                 Err(err) => {
-                    return Err(anyhow!("prompt failed: {}", err));
+                    return Err(anyhow!("prompt failed: {err}"));
                 }
             }
         }
@@ -393,13 +394,9 @@ impl crate::cmd::Command for CmdAuthLogout {
         ctx.config.write()?;
 
         let cs = ctx.io.color_scheme();
-        writeln!(
-            ctx.io.out,
-            "{} Logged out of {} as {}",
-            cs.success_icon(),
-            hostname,
-            cs.bold(&email)
-        )?;
+        let success_icon = cs.success_icon();
+        let bold_email = cs.bold(&email);
+        writeln!(ctx.io.out, "{success_icon} Logged out of {hostname} as {bold_email}")?;
 
         Ok(())
     }
@@ -427,10 +424,10 @@ impl crate::cmd::Command for CmdAuthStatus {
         let hostnames = ctx.config.hosts()?;
 
         if hostnames.is_empty() {
+            let bold_login = cs.bold("zoo auth login");
             writeln!(
                 ctx.io.out,
-                "You are not logged into any Zoo hosts. Run `{}` to authenticate.",
-                cs.bold("zoo auth login")
+                "You are not logged into any Zoo hosts. Run `{bold_login}` to authenticate."
             )?;
             return Ok(());
         }
@@ -460,21 +457,21 @@ impl crate::cmd::Command for CmdAuthStatus {
                         .email
                         .ok_or_else(|| anyhow::anyhow!("user does not have an email"))?;
 
+                    let success_icon = cs.success_icon();
+                    let bold_email = cs.bold(&email);
                     host_status.push(format!(
-                        "{} Logged in to {} as {} ({})",
-                        cs.success_icon(),
-                        hostname,
-                        cs.bold(&email),
-                        token_source
+                        "{success_icon} Logged in to {hostname} as {bold_email} ({token_source})"
                     ));
                     let mut token_display = "*******************".to_string();
                     if self.show_token {
                         token_display = token.to_string();
                     }
-                    host_status.push(format!("{} Token: {}", cs.success_icon(), token_display));
+                    let success_icon = cs.success_icon();
+                    host_status.push(format!("{success_icon} Token: {token_display}"));
                 }
                 Err(err) => {
-                    host_status.push(format!("{} {}: api call failed: {}", cs.failure_icon(), hostname, err));
+                    let failure_icon = cs.failure_icon();
+                    host_status.push(format!("{failure_icon} {hostname}: api call failed: {err}"));
                     failed = true;
                     continue;
                 }
@@ -484,18 +481,22 @@ impl crate::cmd::Command for CmdAuthStatus {
         }
 
         if !hostname_found {
-            writeln!(
-                ctx.io.err_out,
-                "Hostname {} not found among authenticated Zoo hosts",
-                only_host.as_deref().unwrap_or("")
-            )?;
+            if let Some(only_host) = only_host {
+                writeln!(
+                    ctx.io.err_out,
+                    "Hostname {only_host} not found among authenticated Zoo hosts"
+                )?;
+            } else {
+                writeln!(ctx.io.err_out, "Requested host not found among authenticated Zoo hosts")?;
+            }
             return Err(anyhow!(""));
         }
 
         for hostname in hostnames {
             match status_info.get(&hostname) {
                 Some(status) => {
-                    writeln!(ctx.io.out, "{}", cs.bold(&hostname))?;
+                    let bold_hostname = cs.bold(&hostname);
+                    writeln!(ctx.io.out, "{bold_hostname}")?;
                     for line in status {
                         writeln!(ctx.io.out, "{line}")?;
                     }
@@ -598,6 +599,7 @@ mod test {
         let mut c = crate::config_from_env::EnvConfig::inherit_env(&mut config);
 
         for t in tests {
+            let test_name = &t.name;
             let (mut io, stdout_path, stderr_path) = crate::iostreams::IoStreams::test();
             if !t.stdin.is_empty() {
                 io.stdin = Box::new(std::io::Cursor::new(t.stdin));
@@ -622,19 +624,19 @@ mod test {
                 Ok(()) => {
                     let stdout = std::fs::read_to_string(stdout_path).unwrap();
                     let stderr = std::fs::read_to_string(stderr_path).unwrap();
-                    assert!(stderr.is_empty(), "test {}: {}", t.name, stderr);
+                    assert!(stderr.is_empty(), "test {test_name}: {stderr}");
                     if !stdout.contains(&t.want_out) {
-                        assert_eq!(stdout, t.want_out, "test {}: stdout mismatch", t.name);
+                        assert_eq!(stdout, t.want_out, "test {test_name}: stdout mismatch");
                     }
                 }
                 Err(err) => {
                     let stdout = std::fs::read_to_string(stdout_path).unwrap();
                     let stderr = std::fs::read_to_string(stderr_path).unwrap();
-                    assert_eq!(stdout, t.want_out, "test {}", t.name);
+                    assert_eq!(stdout, t.want_out, "test {test_name}");
                     if !err.to_string().contains(&t.want_err) {
-                        assert_eq!(err.to_string(), t.want_err, "test {}: err mismatch", t.name);
+                        assert_eq!(err.to_string(), t.want_err, "test {test_name}: err mismatch");
                     }
-                    assert!(stderr.is_empty(), "test {}: {}", t.name, stderr);
+                    assert!(stderr.is_empty(), "test {test_name}: {stderr}");
                 }
             }
         }

src/cmd_config.rs

@@ -56,7 +56,7 @@ impl crate::cmd::Command for CmdConfigGet {
         match ctx.config.get(&self.host, &self.key) {
             Ok(value) => writeln!(ctx.io.out, "{value}")?,
             Err(err) => {
-                bail!("{}", err);
+                bail!("{err}");
             }
         }
 
@@ -89,7 +89,7 @@ impl crate::cmd::Command for CmdConfigSet {
 
         // Set the value. If self.host is empty it will be top-level set.
         if let Err(err) = ctx.config.set(&self.host, &self.key, Some(&self.value)) {
-            bail!("{}", err);
+            bail!("{err}");
         }
 
         // Unset the option in all other hosts if it's a mutually exclusive option.
@@ -111,7 +111,7 @@ impl crate::cmd::Command for CmdConfigSet {
                             continue;
                         }
                         if let Err(err) = ctx.config.set(&host, &self.key, None) {
-                            bail!("{}", err);
+                            bail!("{err}");
                         }
                     }
                 }
@@ -120,7 +120,7 @@ impl crate::cmd::Command for CmdConfigSet {
 
         // Write the config file.
         if let Err(err) = ctx.config.write() {
-            bail!("{}", err);
+            bail!("{err}");
         }
 
         Ok(())

src/cmd_file.rs

@@ -295,7 +295,7 @@ impl crate::cmd::Command for CmdFileSnapshot {
             modeling_response: kittycad_modeling_cmds::ok_response::OkModelingCmdResponse::ImportFiles(data),
         } = &resp
         else {
-            anyhow::bail!("Unexpected response from engine import: {:?}", resp);
+            anyhow::bail!("Unexpected response from engine import: {resp:?}");
         };
 
         let object_id = data.object_id;
@@ -330,7 +330,7 @@ impl crate::cmd::Command for CmdFileSnapshot {
             // Save the snapshot locally.
             std::fs::write(&self.output_file, &data.contents.0)?;
         } else {
-            anyhow::bail!("Unexpected response from engine: {:?}", resp);
+            anyhow::bail!("Unexpected response from engine: {resp:?}");
         }
 
         writeln!(
@@ -705,8 +705,7 @@ fn get_import_format_from_extension(ext: &str) -> Result<kittycad::types::FileIm
                 Ok(kittycad::types::FileImportFormat::Gltf)
             } else {
                 anyhow::bail!(
-                    "unknown source format for file extension: {}. Try setting the `--src-format` flag explicitly or use a valid format.",
-                    ext
+                    "unknown source format for file extension: {ext}. Try setting the `--src-format` flag explicitly or use a valid format."
                 )
             }
         }

src/cmd_kcl.rs

@@ -352,7 +352,7 @@ impl crate::cmd::Command for CmdKclSnapshot {
                 {
                     (data.contents.0.clone(), session_data)
                 } else {
-                    anyhow::bail!("Unexpected response from engine: {:?}", resp);
+                    anyhow::bail!("Unexpected response from engine: {resp:?}");
                 }
             }
         };
@@ -428,7 +428,7 @@ impl crate::cmd::Command for CmdKclView {
             // Save the snapshot locally.
             std::fs::write(&tmp_file, &data.contents.0)?;
         } else {
-            anyhow::bail!("Unexpected response from engine: {:?}", resp);
+            anyhow::bail!("Unexpected response from engine: {resp:?}");
         }
 
         let (width, height) = (ctx.io.tty_size)()?;
@@ -462,8 +462,7 @@ pub fn get_image_format_from_extension(ext: &str) -> Result<kittycad_modeling_cm
         Ok(format) => Ok(format),
         Err(_) => {
             anyhow::bail!(
-                    "unknown source format for file extension: {}. Try setting the `--src-format` flag explicitly or use a valid format.",
-                    ext
+                    "unknown source format for file extension: {ext}. Try setting the `--src-format` flag explicitly or use a valid format."
                 )
         }
     }
@@ -597,7 +596,7 @@ impl crate::cmd::Command for CmdKclVolume {
             let format = ctx.format(&self.format)?;
             ctx.io.write_output(&format, &data)?;
         } else {
-            anyhow::bail!("Unexpected response from engine: {:?}", resp);
+            anyhow::bail!("Unexpected response from engine: {resp:?}");
         }
 
         if self.show_trace {
@@ -684,7 +683,7 @@ impl crate::cmd::Command for CmdKclMass {
             let format = ctx.format(&self.format)?;
             ctx.io.write_output(&format, &data)?;
         } else {
-            anyhow::bail!("Unexpected response from engine: {:?}", resp);
+            anyhow::bail!("Unexpected response from engine: {resp:?}");
         }
 
         if self.show_trace {
@@ -757,7 +756,7 @@ impl crate::cmd::Command for CmdKclCenterOfMass {
             let format = ctx.format(&self.format)?;
             ctx.io.write_output(&format, &data)?;
         } else {
-            anyhow::bail!("Unexpected response from engine: {:?}", resp);
+            anyhow::bail!("Unexpected response from engine: {resp:?}");
         }
 
         if self.show_trace {
@@ -844,7 +843,7 @@ impl crate::cmd::Command for CmdKclDensity {
             let format = ctx.format(&self.format)?;
             ctx.io.write_output(&format, &data)?;
         } else {
-            anyhow::bail!("Unexpected response from engine: {:?}", resp);
+            anyhow::bail!("Unexpected response from engine: {resp:?}");
         }
 
         if self.show_trace {
@@ -917,7 +916,7 @@ impl crate::cmd::Command for CmdKclSurfaceArea {
             let format = ctx.format(&self.format)?;
             ctx.io.write_output(&format, &data)?;
         } else {
-            anyhow::bail!("Unexpected response from engine: {:?}", resp);
+            anyhow::bail!("Unexpected response from engine: {resp:?}");
         }
 
         if self.show_trace {
@@ -1053,15 +1052,19 @@ fn get_modeling_settings_from_project_toml(input: &std::path::Path) -> Result<kc
     let input = std::path::Path::new(input);
     // Ensure the path exists.
     if !input.exists() {
-        anyhow::bail!("file `{}` does not exist", input.display());
+        let input_display = input.display().to_string();
+        anyhow::bail!("file `{input_display}` does not exist");
     }
     // Get the directory if we don't already have one.
     let dir = if input.is_dir() {
         input.to_path_buf()
     } else {
         input
             .parent()
-            .ok_or_else(|| anyhow::anyhow!("could not get parent directory of `{}`", input.display()))?
+            .ok_or_else(|| {
+                let input_display = input.display().to_string();
+                anyhow::anyhow!("could not get parent directory of `{input_display}`")
+            })?
             .to_path_buf()
     };
 

src/cmd_ml/cmd_text_to_cad.rs

@@ -374,7 +374,7 @@ async fn get_image_bytes(
         modeling_response: OkModelingCmdResponse::ImportFiles(data),
     } = &resp
     else {
-        anyhow::bail!("Unexpected response from engine import: {:?}", resp);
+        anyhow::bail!("Unexpected response from engine import: {resp:?}");
     };
 
     let object_id = data.object_id;
@@ -405,6 +405,6 @@ async fn get_image_bytes(
         // Save the snapshot locally.
         Ok(data.contents.0.clone())
     } else {
-        anyhow::bail!("Unexpected response from engine: {:?}", resp);
+        anyhow::bail!("Unexpected response from engine: {resp:?}");
     }
 }