style(clippy): address some clippy warnings

cargo-progenitor/src/main.rs

@@ -12,7 +12,7 @@ use openapiv3::OpenAPI;
 use progenitor::{GenerationSettings, Generator, InterfaceStyle, TagStyle};
 use progenitor_impl::space_out_items;
 
-fn is_non_release() -> bool {
+const fn is_non_release() -> bool {
     cfg!(debug_assertions)
 }
 
@@ -23,10 +23,10 @@ enum CargoCli {
     Progenitor(Args),
 }
 
-/// Generate a stand-alone crate from an OpenAPI document
+/// Generate a stand-alone crate from an `OpenAPI` document
 #[derive(Parser)]
 struct Args {
-    /// OpenAPI definition document (JSON or YAML)
+    /// `OpenAPI` definition document (JSON or YAML)
     #[clap(short = 'i', long)]
     input: String,
     /// Output directory for Rust crate
@@ -65,8 +65,8 @@ enum InterfaceArg {
 impl From<InterfaceArg> for InterfaceStyle {
     fn from(arg: InterfaceArg) -> Self {
         match arg {
-            InterfaceArg::Positional => InterfaceStyle::Positional,
-            InterfaceArg::Builder => InterfaceStyle::Builder,
+            InterfaceArg::Positional => Self::Positional,
+            InterfaceArg::Builder => Self::Builder,
         }
     }
 }
@@ -80,8 +80,8 @@ enum TagArg {
 impl From<TagArg> for TagStyle {
     fn from(arg: TagArg) -> Self {
         match arg {
-            TagArg::Merged => TagStyle::Merged,
-            TagArg::Separate => TagStyle::Separate,
+            TagArg::Merged => Self::Merged,
+            TagArg::Separate => Self::Separate,
         }
     }
 }
@@ -92,7 +92,7 @@ fn reformat_code(input: String) -> String {
         wrap_comments: Some(true),
         ..Default::default()
     };
-    space_out_items(rustfmt_wrapper::rustfmt_config(config, input).unwrap()).unwrap()
+    space_out_items(&rustfmt_wrapper::rustfmt_config(config, input).unwrap()).unwrap()
 }
 
 fn save<P>(p: P, data: &str) -> Result<()>
@@ -131,7 +131,7 @@ fn main() -> Result<()> {
             println!("-----------------------------------------------------");
             for (idx, type_entry) in type_space.iter_types().enumerate() {
                 let n = type_entry.describe();
-                println!("{:>4}  {}", idx, n);
+                println!("{idx:>4}  {n}");
             }
             println!("-----------------------------------------------------");
             println!();
@@ -153,18 +153,18 @@ fn main() -> Result<()> {
                 version = \"{}\"\n\
                 edition = \"2024\"\n\
                 license = \"{}\"\n",
-                name, version, &args.license_name,
+                name, version, args.license_name,
             );
             if let Some(registry_name) = args.registry_name {
-                tomlout.extend(format!("publish = [\"{}\"]\n", registry_name).chars());
+                tomlout.extend(format!("publish = [\"{registry_name}\"]\n").chars());
             }
             tomlout.extend(
                 format!(
                     "\n\
                 [dependencies]\n\
                 {}\n\
                 \n",
-                    dependencies(builder, args.include_client).join("\n"),
+                    dependencies(&builder, args.include_client).join("\n"),
                 )
                 .chars(),
             );
@@ -178,7 +178,7 @@ fn main() -> Result<()> {
 
             // Create the Rust source file containing the generated client:
             let lib_code = if args.include_client {
-                format!("mod progenitor_client;\n\n{}", api_code)
+                format!("mod progenitor_client;\n\n{api_code}")
             } else {
                 api_code.to_string()
             };
@@ -198,7 +198,7 @@ fn main() -> Result<()> {
         }
 
         Err(e) => {
-            println!("gen fail: {:?}", e);
+            println!("gen fail: {e:?}");
             bail!("generation experienced errors");
         }
     }
@@ -239,7 +239,8 @@ static DEPENDENCIES: Dependencies = Dependencies {
     uuid: "1.0",
 };
 
-pub fn dependencies(builder: Generator, include_client: bool) -> Vec<String> {
+#[must_use]
+pub fn dependencies(builder: &Generator, include_client: bool) -> Vec<String> {
     let mut deps = vec![
         format!("bytes = \"{}\"", DEPENDENCIES.bytes),
         format!("futures-core = \"{}\"", DEPENDENCIES.futures),
@@ -255,25 +256,24 @@ pub fn dependencies(builder: Generator, include_client: bool) -> Vec<String> {
     ];
 
     let type_space = builder.get_type_space();
-    let mut needs_serde_json = false;
-
-    if include_client {
+    let needs_serde_json = if include_client {
         // code included from progenitor-client needs extra dependencies
         deps.push(format!(
             "percent-encoding = \"{}\"",
             DEPENDENCIES.percent_encoding
         ));
-        needs_serde_json = true;
+        true
     } else {
         let crate_version =
             if let (false, Some(value)) = (is_non_release(), option_env!("CARGO_PKG_VERSION")) {
                 value
             } else {
                 "*"
             };
-        let client_version_dep = format!("progenitor-client = \"{}\"", crate_version);
+        let client_version_dep = format!("progenitor-client = \"{crate_version}\"");
         deps.push(client_version_dep);
-    }
+        false
+    };
 
     if type_space.uses_regress() {
         deps.push(format!("regress = \"{}\"", DEPENDENCIES.regress));
@@ -309,12 +309,11 @@ where
     P: AsRef<Path> + std::clone::Clone + std::fmt::Debug,
 {
     let mut f = File::open(p.clone())?;
-    let api = match serde_json::from_reader(f) {
-        Ok(json_value) => json_value,
-        _ => {
-            f = File::open(p)?;
-            serde_yaml::from_reader(f)?
-        }
+    let api = if let Ok(json_value) = serde_json::from_reader(f) {
+        json_value
+    } else {
+        f = File::open(p)?;
+        serde_yaml::from_reader(f)?
     };
     Ok(api)
 }

cargo-progenitor/tests/data/test_help.stdout

@@ -1,10 +1,10 @@
-Generate a stand-alone crate from an OpenAPI document
+Generate a stand-alone crate from an `OpenAPI` document
 
 Usage: cargo progenitor [OPTIONS] --input <INPUT> --output <OUTPUT> --name <NAME> --version <VERSION>
 
 Options:
   -i, --input <INPUT>
-          OpenAPI definition document (JSON or YAML)
+          `OpenAPI` definition document (JSON or YAML)
   -o, --output <OUTPUT>
           Output directory for Rust crate
   -n, --name <NAME>

example-build/build.rs

@@ -8,7 +8,7 @@ use std::{
 
 fn main() {
     let src = "../sample_openapi/keeper.json";
-    println!("cargo:rerun-if-changed={}", src);
+    println!("cargo:rerun-if-changed={src}");
     let file = File::open(src).unwrap();
     let spec = serde_json::from_reader(file).unwrap();
     let mut generator = progenitor::Generator::default();

example-build/src/main.rs

@@ -5,11 +5,9 @@ include!(concat!(env!("OUT_DIR"), "/codegen.rs"));
 
 fn main() {
     let client = Client::new("https://foo/bar");
-    let _ = client.enrol(
-        "auth-token",
-        &types::EnrolBody {
-            host: "".to_string(),
-            key: "".to_string(),
-        },
-    );
+    let body = types::EnrolBody {
+        host: String::new(),
+        key: String::new(),
+    };
+    let _future = client.enrol("auth-token", &body);
 }

example-macro/src/main.rs

@@ -5,7 +5,7 @@ use progenitor::generate_api;
 generate_api!(
     spec = "../sample_openapi/keeper.json",
     pre_hook = (|request| {
-        println!("doing this {:?}", request);
+        println!("doing this {request:?}");
     }),
     pre_hook_async = crate::add_auth_headers,
     post_hook = crate::all_done,
@@ -27,12 +27,12 @@ async fn add_auth_headers(
     Ok(())
 }
 
-fn all_done(_result: &reqwest::Result<reqwest::Response>) {}
+const fn all_done(_result: &reqwest::Result<reqwest::Response>) {}
 
 mod buildomat {
     use progenitor::generate_api;
 
     generate_api!("../sample_openapi/buildomat.json");
 }
 
-fn main() {}
+const fn main() {}

example-out-dir/build.rs

@@ -9,7 +9,7 @@ fn main() {
     // complex build script might, for example, extract the OpenAPI document
     // from a non-file source, writing it out to OUT_DIR.
     let src = "../sample_openapi/keeper.json";
-    println!("cargo:rerun-if-changed={}", src);
+    println!("cargo:rerun-if-changed={src}");
 
     let out_dir = env::var("OUT_DIR").unwrap();
     let dest = Path::new(&out_dir).join("keeper.json");

example-out-dir/src/main.rs

@@ -11,11 +11,9 @@ generate_api!(
 
 fn main() {
     let client = Client::new("https://example.com");
-    std::mem::drop(client.enrol(
-        "auth-token",
-        &types::EnrolBody {
-            host: "".to_string(),
-            key: "".to_string(),
-        },
-    ));
+    let body = types::EnrolBody {
+        host: String::new(),
+        key: String::new(),
+    };
+    let _future = client.enrol("auth-token", &body);
 }

example-wasm/build.rs

@@ -8,7 +8,7 @@ use std::{
 
 fn main() {
     let src = "../sample_openapi/keeper.json";
-    println!("cargo:rerun-if-changed={}", src);
+    println!("cargo:rerun-if-changed={src}");
     let file = File::open(src).unwrap();
     let spec = serde_json::from_reader(file).unwrap();
     let mut generator = progenitor::Generator::default();

example-wasm/src/main.rs

@@ -5,11 +5,9 @@ include!(concat!(env!("OUT_DIR"), "/codegen.rs"));
 
 fn main() {
     let client = Client::new("https://foo/bar");
-    let _ = client.enrol(
-        "auth-token",
-        &types::EnrolBody {
-            host: "".to_string(),
-            key: "".to_string(),
-        },
-    );
+    let body = types::EnrolBody {
+        host: String::new(),
+        key: String::new(),
+    };
+    let _future = client.enrol("auth-token", &body);
 }

example-wasm/tests/client.rs

@@ -8,5 +8,5 @@ include!(concat!(env!("OUT_DIR"), "/codegen.rs"));
 #[wasm_bindgen_test::wasm_bindgen_test]
 fn test_client_new() {
     let client = Client::new("http://foo/bar");
-    assert!(client.baseurl == "http://foo/bar");
+    assert_eq!(client.baseurl, "http://foo/bar");
 }

progenitor-client/src/lib.rs

@@ -13,6 +13,7 @@ pub use crate::progenitor_client::*;
 // need to determine the provenance of progenitor (crates.io, github, etc.)
 // when generating the stand-alone crate.
 #[doc(hidden)]
-pub fn code() -> &'static str {
+#[must_use]
+pub const fn code() -> &'static str {
     include_str!("progenitor_client.rs")
 }