smplx: add extended clippy linting

* fix lints, which aren't related to docs

Author: ikripaka

Cargo.lock

@@ -28,7 +28,6 @@ minreq = { workspace = true }
 anyhow = "1"
 dotenvy = "0.15"
 clap = { version = "4", features = ["derive", "env"] }
-tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
 toml_edit = { version = "0.23.9" }
 ctrlc = { version = "3.5.2", features = ["termination"] }
 serde_json = { version = "1.0.149" }

crates/cli/Cargo.toml

@@ -1,10 +1,9 @@
 use clap::Parser;
 
-#[tokio::main]
-async fn main() -> anyhow::Result<()> {
+fn main() -> anyhow::Result<()> {
     let _ = dotenvy::dotenv();
 
-    Box::pin(smplx_cli::Cli::parse().run()).await?;
+    smplx_cli::Cli::parse().run()?;
 
     Ok(())
 }

crates/cli/src/bin/main.rs

@@ -22,7 +22,7 @@ pub struct Cli {
 }
 
 impl Cli {
-    pub async fn run(&self) -> Result<(), CliError> {
+    pub fn run(&self) -> Result<(), CliError> {
         match &self.command {
             Command::Init { additional_flags } => {
                 let simplex_conf_path = Config::get_default_path()?;
@@ -49,13 +49,13 @@ impl Cli {
                 let config_path = Config::get_default_path()?;
                 let loaded_config = Config::load(config_path)?;
 
-                Ok(Regtest::run(loaded_config.regtest)?)
+                Ok(Regtest::run(&loaded_config.regtest)?)
             }
             Command::Build => {
                 let config_path = Config::get_default_path()?;
                 let loaded_config = Config::load(config_path)?;
 
-                Ok(Build::run(loaded_config.build)?)
+                Ok(Build::run(&loaded_config.build)?)
             }
             Command::Clean => {
                 let config_path = Config::get_default_path()?;

crates/cli/src/cli.rs

@@ -5,7 +5,7 @@ use super::error::CommandError;
 pub struct Build {}
 
 impl Build {
-    pub fn run(config: BuildConfig) -> Result<(), CommandError> {
+    pub fn run(config: &BuildConfig) -> Result<(), CommandError> {
         let output_dir = ArtifactsResolver::resolve_local_dir(&config.out_dir)?;
         let src_dir = ArtifactsResolver::resolve_local_dir(&config.src_dir)?;
         let files_to_build = ArtifactsResolver::resolve_files_to_build(&config.src_dir, &config.simf_files)?;

crates/cli/src/commands/build.rs

@@ -11,14 +11,14 @@ pub struct DeletedItems(Vec<PathBuf>);
 
 impl Clean {
     pub fn run(config: BuildConfig) -> Result<(), CommandError> {
-        let deleted_files = Self::delete_files(config)?;
+        let deleted_files = Self::delete_files(&config)?;
 
         println!("Deleted files: {deleted_files}");
 
         Ok(())
     }
 
-    fn delete_files(config: BuildConfig) -> Result<DeletedItems, CleanError> {
+    fn delete_files(config: &BuildConfig) -> Result<DeletedItems, CleanError> {
         let mut deleted_items = Vec::with_capacity(1);
         let generated_artifacts = Self::remove_artifacts(config)?;
 
@@ -29,12 +29,12 @@ impl Clean {
         Ok(DeletedItems(deleted_items))
     }
 
-    fn remove_artifacts(config: BuildConfig) -> Result<Option<PathBuf>, CleanError> {
+    fn remove_artifacts(config: &BuildConfig) -> Result<Option<PathBuf>, CleanError> {
         let output_dir = ArtifactsResolver::resolve_local_dir(&config.out_dir)
             .map_err(|e| CleanError::ResolveOutDir(e.to_string()))?;
 
         let res = if output_dir.exists() {
-            fs::remove_dir_all(&output_dir).map_err(|e| CleanError::RemoveOutDir(e, output_dir.to_path_buf()))?;
+            fs::remove_dir_all(&output_dir).map_err(|e| CleanError::RemoveOutDir(e, output_dir.clone()))?;
             Some(output_dir)
         } else {
             None
@@ -46,11 +46,13 @@ impl Clean {
 
 impl Display for DeletedItems {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        use std::fmt::Write;
+
         let paths_len = self.0.len();
         let mut result = String::from("[");
 
         for (index, path) in self.0.iter().enumerate() {
-            result.push_str(&format!("\n    {}", path.display()));
+            let _ = write!(result, "\n    {}", path.display());
 
             if index < paths_len - 1 {
                 result.push(',');
@@ -61,6 +63,6 @@ impl Display for DeletedItems {
 
         result.push(']');
 
-        write!(f, "{}", result)
+        write!(f, "{result}")
     }
 }

crates/cli/src/commands/clean.rs

@@ -33,6 +33,7 @@ pub struct InitFlags {
     pub lib: bool,
 }
 
+#[allow(clippy::struct_excessive_bools)]
 #[derive(Debug, Args, Clone)]
 pub struct TestFlags {
     /// Show output from successful tests

crates/cli/src/commands/core.rs

@@ -11,7 +11,7 @@ pub struct Init;
 impl Init {
     pub fn run(smplx_conf_path: impl AsRef<Path>, flags: &InitFlags) -> Result<(), CommandError> {
         if flags.lib {
-            Self::generate_lib_inplace(&smplx_conf_path)?
+            Self::generate_lib_inplace(&smplx_conf_path)?;
         }
 
         Self::fill_simplex_toml(smplx_conf_path)?;
@@ -93,25 +93,25 @@ fn main() {
 
         let file_name = file_name
             .to_str()
-            .ok_or_else(|| InitError::NonUnicodeName(format!("{file_name:?}")))?;
+            .ok_or_else(|| InitError::NonUnicodeName(format!("{}", file_name.display())))?;
 
-        Ok(format!("simplex_{}", file_name))
+        Ok(format!("simplex_{file_name}"))
     }
 
     fn get_smplx_max_version() -> Result<String, InitError> {
-        let url = format!("https://crates.io/api/v1/crates/{}", SIMPLEX_CRATE_NAME);
+        let url = format!("https://crates.io/api/v1/crates/{SIMPLEX_CRATE_NAME}");
 
         let response = minreq::get(&url)
             .with_header("User-Agent", "simplex_generator")
             .send()
-            .map_err(|e| InitError::CratesIoFetch(format!("Failed to fetch crate info: {}", e)))?;
+            .map_err(|e| InitError::CratesIoFetch(format!("Failed to fetch crate info: {e}")))?;
 
         let body = response
             .as_str()
-            .map_err(|e| InitError::CratesIoFetch(format!("Invalid response body: {}", e)))?;
+            .map_err(|e| InitError::CratesIoFetch(format!("Invalid response body: {e}")))?;
 
         let json: serde_json::Value =
-            serde_json::from_str(body).map_err(|e| InitError::CratesIoFetch(format!("Failed to parse JSON: {}", e)))?;
+            serde_json::from_str(body).map_err(|e| InitError::CratesIoFetch(format!("Failed to parse JSON: {e}")))?;
 
         let latest_version = json["crate"]["max_stable_version"]
             .as_str()
@@ -143,6 +143,7 @@ fn main() {
         Ok(())
     }
 
+    #[allow(clippy::unnecessary_wraps)]
     fn execute_cargo_fmt(file: impl AsRef<Path>) -> Result<(), InitError> {
         let mut cargo_test_command = std::process::Command::new("sh");
 

crates/cli/src/commands/init.rs

@@ -9,7 +9,7 @@ use crate::commands::error::CommandError;
 pub struct Regtest {}
 
 impl Regtest {
-    pub fn run(config: RegtestConfig) -> Result<(), CommandError> {
+    pub fn run(config: &RegtestConfig) -> Result<(), CommandError> {
         let (mut client, signer) = RegtestRunner::from_config(config)?;
 
         let running = Arc::new(AtomicBool::new(true));

crates/cli/src/commands/regtest.rs

@@ -14,7 +14,7 @@ impl Test {
         let cache_path = Self::get_test_config_cache_name()?;
 
         if flags.verbose {
-            config.verbosity = Some(Verbosity(4))
+            config.verbosity = Some(Verbosity(4));
         }
 
         config.to_file(&cache_path)?;
@@ -25,7 +25,7 @@ impl Test {
 
         match output.status.code() {
             Some(code) => {
-                println!("Exit Status: {}", code);
+                println!("Exit Status: {code}");
 
                 if code == 0 {
                     println!("{}", String::from_utf8(output.stdout).unwrap());
@@ -54,9 +54,10 @@ impl Test {
     }
 
     fn build_test_command(filter: String, flags: &TestFlags) -> String {
+        use std::fmt::Write;
         let mut command_as_arg = String::new();
 
-        command_as_arg.push_str(&format!("cargo test {filter}_{SMPLX_TEST_MARKER}"));
+        let _ = write!(command_as_arg, "cargo test {filter}_{SMPLX_TEST_MARKER}");
 
         let flag_args = Self::build_test_flags(flags);