updates

Signed-off-by: Jessie Frazelle <github@jessfraz.com>

Author: jessfraz

cli-macro-impl/src/lib.rs

@@ -201,7 +201,7 @@ impl Operation {
                 Err(_) => return false,
             };
 
-            if parameter_data.name == parameter || parameter_data.name.starts_with(&format!("{}_", parameter)) {
+            if parameter_data.name == parameter || parameter_data.name.starts_with(&format!("{parameter}_")) {
                 return true;
             }
         }
@@ -281,7 +281,7 @@ impl Operation {
             if self.method == "PUT" {
                 // We add the `new_` part onto the parameter since it will be
                 // overwriting an existing field.
-                key = format!("new_{}", key);
+                key = format!("new_{key}");
             }
 
             properties.insert(
@@ -516,11 +516,11 @@ impl Operation {
             )
             .replace(" dns ", " DNS ")
         } else if name == "description" {
-            format!("The description for the {}.", prop)
+            format!("The description for the {prop}.")
         } else if self.is_root_list_operation(tag) {
             format!("The {} that holds the {}.", n, plural(&prop))
         } else {
-            format!("The {} that holds the {}.", n, prop)
+            format!("The {n} that holds the {prop}.")
         };
 
         let mut type_name = self.render_type(schema, required)?;
@@ -615,7 +615,7 @@ impl Operation {
             &singular(tag)
         );
 
-        let struct_inner_name_doc = format!("The name of the {} to create.", singular_tag_str);
+        let struct_inner_name_doc = format!("The name of the {singular_tag_str} to create.");
 
         let mut mutable_variables: Vec<TokenStream> = Vec::new();
         for (p, _) in self.get_all_required_param_names_and_types()? {
@@ -642,13 +642,13 @@ impl Operation {
 
             let formatted = if n == singular(tag) {
                 // Format like an argument not a flag.
-                format!("[{}]", n)
+                format!("[{n}]")
             } else {
                 let flags = get_flags(&n)?;
                 flags.format_help()
             };
 
-            let error_msg = format!("{} required in non-interactive mode", formatted);
+            let error_msg = format!("{formatted} required in non-interactive mode");
 
             let is_check = self.get_is_check_fn(t, true)?;
 
@@ -685,7 +685,7 @@ impl Operation {
 
             let p = format_ident!("{}", n);
 
-            let title = format!("{} {}", singular_tag_str, n);
+            let title = format!("{singular_tag_str} {n}");
 
             let is_check = self.get_is_check_fn(v.clone(), true)?;
 
@@ -843,9 +843,9 @@ impl Operation {
         let singular_tag_lc = format_ident!("{}", singular(tag));
         let struct_name = format_ident!("Cmd{}Edit", to_title_case(&singular(tag)));
 
-        let struct_doc = format!("Edit {} settings.", singular_tag_str,);
+        let struct_doc = format!("Edit {singular_tag_str} settings.",);
 
-        let struct_inner_name_doc = format!("The {} to edit. Can be an ID or name.", singular_tag_str);
+        let struct_inner_name_doc = format!("The {singular_tag_str} to edit. Can be an ID or name.");
 
         let api_call_params = self.get_api_call_params(tag)?;
 
@@ -955,12 +955,11 @@ impl Operation {
         let struct_name = format_ident!("Cmd{}View", to_title_case(&singular(tag)));
 
         let struct_doc = format!(
-            "View {}.\n\nDisplay information about a Zoo {}.\n\nWith `--web`, open the {} in a web browser instead.",
-            singular_tag_str, singular_tag_str, singular_tag_str
+            "View {singular_tag_str}.\n\nDisplay information about a Zoo {singular_tag_str}.\n\nWith `--web`, open the {singular_tag_str} in a web browser instead."
         );
 
-        let struct_inner_web_doc = format!("Open the {} in the browser.", singular_tag_str);
-        let struct_inner_name_doc = format!("The {} to view. Can be an ID or name.", singular_tag_str);
+        let struct_inner_web_doc = format!("Open the {singular_tag_str} in the browser.");
+        let struct_inner_name_doc = format!("The {singular_tag_str} to view. Can be an ID or name.");
 
         let api_call_params = self.get_api_call_params(tag)?;
 
@@ -1137,8 +1136,8 @@ impl Operation {
         let singular_tag_lc = format_ident!("{}", singular(tag));
         let struct_name = format_ident!("Cmd{}Delete", to_title_case(&singular(tag)));
 
-        let struct_doc = format!("Delete {}.", singular_tag_str);
-        let struct_inner_name_doc = format!("The {} to delete. Can be an ID or name.", singular_tag_str);
+        let struct_doc = format!("Delete {singular_tag_str}.");
+        let struct_inner_name_doc = format!("The {singular_tag_str} to delete. Can be an ID or name.");
 
         let api_call_params = self.get_api_call_params(tag)?;
 
@@ -1345,12 +1344,12 @@ fn plural(s: &str) -> String {
     let s = singular(s);
 
     if s.ends_with('s') {
-        return format!("{}es", s);
+        return format!("{s}es");
     } else if s.ends_with('y') {
         return format!("{}ies", s.trim_end_matches('y'));
     }
 
-    format!("{}s", s)
+    format!("{s}s")
 }
 
 /// Return the singular version of a string (if it plural).

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "stable"
-components = [ "rustfmt", "clippy" ]
+channel = "1.88"
+components = ["rustfmt", "clippy"]

src/cmd_config.rs

@@ -151,7 +151,7 @@ impl crate::cmd::Command for CmdConfigList {
         for option in CONFIG_OPTIONS {
             if let &ConfigOption::TopLevel { key, description, .. } = option {
                 match ctx.config.get(&host, key) {
-                    Ok(value) => writeln!(ctx.io.out, "{}\n{}={}\n", description, key, value)?,
+                    Ok(value) => writeln!(ctx.io.out, "{description}\n{key}={value}\n")?,
                     Err(err) => {
                         if host.is_empty() {
                             // Only bail if the host is empty, since some hosts may not have

src/cmd_generate.rs

@@ -61,7 +61,7 @@ impl CmdGenerateMarkdown {
 
         let mut p = parent.to_string();
         if !p.is_empty() {
-            p = format!("{}_{}", p, name);
+            p = format!("{p}_{name}");
         } else {
             p = name.to_string();
         }

src/cmd_kcl.rs

@@ -229,7 +229,7 @@ impl crate::cmd::Command for CmdKclFormat {
             }
         } else {
             // Print the formatted file to stdout.
-            writeln!(ctx.io.out, "{}", formatted)?;
+            writeln!(ctx.io.out, "{formatted}")?;
         }
 
         Ok(())
@@ -1029,7 +1029,7 @@ fn print_trace_link(io: &mut IoStreams, session_data: &Option<kittycad::types::M
         return;
     };
     let api_call_id = &data.api_call_id;
-    let link = format!("https://ui.honeycomb.io/kittycad/environments/prod/datasets/api-deux?query=%7B%22time_range%22%3A7200%2C%22granularity%22%3A0%2C%22calculations%22%3A%5B%7B%22op%22%3A%22COUNT%22%7D%5D%2C%22filters%22%3A%5B%7B%22column%22%3A%22api_call.id%22%2C%22op%22%3A%22%3D%22%2C%22value%22%3A%22{}%22%7D%5D%2C%22filter_combination%22%3A%22AND%22%2C%22limit%22%3A1000%7D", api_call_id);
+    let link = format!("https://ui.honeycomb.io/kittycad/environments/prod/datasets/api-deux?query=%7B%22time_range%22%3A7200%2C%22granularity%22%3A0%2C%22calculations%22%3A%5B%7B%22op%22%3A%22COUNT%22%7D%5D%2C%22filters%22%3A%5B%7B%22column%22%3A%22api_call.id%22%2C%22op%22%3A%22%3D%22%2C%22value%22%3A%22{api_call_id}%22%7D%5D%2C%22filter_combination%22%3A%22AND%22%2C%22limit%22%3A1000%7D");
     let _ = writeln!(
         io.out,
         "Was this request slow? Send a Zoo employee this link:\n----\n{link}"

src/cmd_ml/cmd_kcl.rs

@@ -88,7 +88,7 @@ impl crate::cmd::Command for CmdKclEdit {
         for (file, output) in outputs {
             // We could do these in parallel...
             tokio::fs::write(&file, output).await?;
-            writeln!(ctx.io.out, "Wrote to {}", file)?;
+            writeln!(ctx.io.out, "Wrote to {file}")?;
         }
 
         Ok(())

src/config.rs

@@ -182,12 +182,12 @@ pub fn new_blank_root() -> Result<toml_edit::DocumentMut> {
         } = option
         {
             if !comment.is_empty() {
-                writeln!(s, "# {}", comment)?;
+                writeln!(s, "# {comment}")?;
                 if !allowed_values.is_empty() {
                     writeln!(s, "# Supported values: {}", allowed_values.join(", "))?;
                 }
             }
-            writeln!(s, "{} = \"{}\"\n", key, default_value)?;
+            writeln!(s, "{key} = \"{default_value}\"\n")?;
         }
     }
 

src/docs_markdown.rs

@@ -73,7 +73,7 @@ fn do_markdown(doc: &mut MarkdownDocument, app: &Command, title: &str) -> Result
 
         let mut html = "<dl class=\"flags\">\n".to_string();
 
-        println!("{:#?}", args);
+        println!("{args:#?}");
 
         for (i, arg) in args.iter().enumerate() {
             if i > 0 {

src/main.rs

@@ -299,7 +299,7 @@ async fn run_cmd(cmd: &impl crate::cmd::Command, ctx: &mut context::Context<'_>)
                     writeln!(ctx.io.err_out, "Try authenticating with: `zoo auth login`")?;
                 } else if let kittycad::types::error::Error::UnexpectedResponse(resp) = err {
                     let body = resp.text().await?;
-                    writeln!(ctx.io.err_out, "zoo.dev api error: {}", body)?;
+                    writeln!(ctx.io.err_out, "zoo.dev api error: {body}")?;
                 } else {
                     writeln!(ctx.io.err_out, "{err}")?;
                 }