Fix clippy issues and udep workflow

.github/workflows/general-rust.yml

@@ -82,4 +82,4 @@ jobs:
         run: cargo install cargo-udeps
 
       - name: Check Unused Dependencies
-        run: cargo udeps --all-targets
+        run: cd apps/cargo-scout-audit && cargo udeps --all-targets

apps/cargo-scout-audit/src/output/html/tera.rs

@@ -22,7 +22,7 @@ impl Default for HtmlEngine {
             tera: Tera::default(),
         };
         let _ = engine.load_templates();
-        return engine;
+        engine
     }
 }
 impl HtmlEngine {

apps/cargo-scout-audit/src/output/report.rs

@@ -3,7 +3,8 @@ use chrono::offset::Local;
 use core::panic;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use std::{collections::HashMap, os::unix::process::CommandExt, path::PathBuf};
+use std::path::Path;
+use std::{collections::HashMap, os::unix::process::CommandExt};
 
 use super::{html, markdown, pdf, vulnerabilities::*};
 
@@ -82,7 +83,7 @@ impl Report {
         markdown::generate_markdown(self)
     }
 
-    pub fn generate_pdf(&self, path: &PathBuf) -> Result<()> {
+    pub fn generate_pdf(&self, path: &Path) -> Result<()> {
         let temp_html = pdf::generate_pdf(self)?;
 
         std::process::Command::new("wkhtmltopdf")
@@ -136,7 +137,6 @@ pub fn generate_report(scout_output: String, info: ProjectInfo, blockchain: Bloc
         })
         .collect::<Vec<Value>>();
 
-    let mut id: u32 = 0;
     let mut det_map: HashMap<_, _> = blockchain
         .get_array_of_vulnerability_names()
         .iter()
@@ -145,7 +145,7 @@ pub fn generate_report(scout_output: String, info: ProjectInfo, blockchain: Bloc
 
     let mut findings: Vec<Finding> = Vec::new();
 
-    for finding in &scout_findings {
+    for (id, finding) in scout_findings.iter().enumerate() {
         let category: String = finding
             .get("message")
             .and_then(|message| message.get("code"))
@@ -177,8 +177,7 @@ pub fn generate_report(scout_output: String, info: ProjectInfo, blockchain: Bloc
                     .get("file_name")
                     .unwrap_or(&Value::default())
                     .to_string()
-                    .trim_matches('"')
-                    .to_string(),
+                    .trim_matches('"'),
                 sp[0].get("line_start").unwrap_or(&Value::default()),
                 sp[0].get("column_start").unwrap_or(&Value::default()),
                 sp[0].get("line_end").unwrap_or(&Value::default()),
@@ -190,7 +189,7 @@ pub fn generate_report(scout_output: String, info: ProjectInfo, blockchain: Bloc
         let byte_start = sp[0].get("byte_start").unwrap().as_u64().unwrap() as usize;
         let byte_end = sp[0].get("byte_end").unwrap().as_u64().unwrap() as usize;
 
-        let code_snippet: String = std::fs::read_to_string(&(file.trim_matches('"'))).unwrap()
+        let code_snippet: String = std::fs::read_to_string(file.trim_matches('"')).unwrap()
             [byte_start..byte_end]
             .to_string();
 
@@ -206,7 +205,7 @@ pub fn generate_report(scout_output: String, info: ProjectInfo, blockchain: Bloc
         *v += 1;
 
         let fndg = Finding {
-            id,
+            id: id as u32,
             occurrence_index: *v,
             category_id: blockchain
                 .get_raw_vuln_from_name(&category)
@@ -221,7 +220,6 @@ pub fn generate_report(scout_output: String, info: ProjectInfo, blockchain: Bloc
                 .trim_start_matches('/')
                 .to_string(),
         };
-        id += 1;
         findings.push(fndg);
     }
 
@@ -232,7 +230,7 @@ pub fn generate_report(scout_output: String, info: ProjectInfo, blockchain: Bloc
 
     let mut categories: Vec<Category> = Vec::new();
 
-    for (vuln, _) in &summary_map {
+    for vuln in summary_map.keys() {
         let raw_vuln = blockchain.get_raw_vuln_from_name(vuln);
         let id = raw_vuln.vulnerability_class.to_string();
         let vuln = Vulnerability::from(raw_vuln);

apps/cargo-scout-audit/src/startup.rs

@@ -261,7 +261,7 @@ fn run_dylint(
     }
 
     let options = Dylint {
-        paths: detectors_pathss,
+        paths: detectors_paths,
         args: opts.args,
         manifest_path: opts.manifest_path.map(|p| p.to_string_lossy().to_string()),
         pipe_stdout,
@@ -313,7 +313,7 @@ fn run_dylint(
 
             std::io::Read::read_to_string(&mut stdout_file, &mut cts)?;
 
-            std::io::Write::write(&mut json_file, &cts.as_bytes())?;
+            std::io::Write::write(&mut json_file, cts.as_bytes())?;
         }
         OutputFormat::Markdown => {
             let mut content = String::new();
@@ -338,7 +338,7 @@ fn run_dylint(
                 PathBuf::from("report.sarif")
             };
 
-            let mut sarif_file = fs::File::create(&path)?;
+            let mut sarif_file = fs::File::create(path)?;
 
             let mut content = String::new();
             std::io::Read::read_to_string(&mut stdout_file, &mut content)?;

apps/cargo-scout-audit/src/utils/config.rs

@@ -81,5 +81,5 @@ pub fn profile_enabled_detectors(config: toml::Table, profile: String) -> Result
             }
         }
     }
-    return Ok(ret_vec);
+    Ok(ret_vec)
 }

apps/cargo-scout-audit/src/utils/output.rs

@@ -105,7 +105,7 @@ fn get_errors_from_output(
         })
         .collect::<Vec<&str>>();
 
-    assert!(&true_finds.len() == &scout_internals_spans.len());
+    assert!(true_finds.len() == scout_internals_spans.len());
 
     for (i, elem) in true_finds.iter().enumerate() {
         let parts = elem.split('\n').collect::<Vec<&str>>();
@@ -128,71 +128,3 @@ fn get_errors_from_output(
     }
     Ok(errors)
 }
-
-fn serify(
-    scout_output: File,
-    scout_internals: File,
-    bc: BlockChain,
-) -> anyhow::Result<serde_json::Value> {
-    let errors: HashMap<String, (Vec<Value>, String)> =
-        get_errors_from_output(scout_output, scout_internals, bc)?;
-
-    let sarif_output = json!({
-        "$schema": "https://json.schemastore.org/sarif-2.1.0",
-        "version": "2.1.0",
-        "runs": [
-            {
-                "tool": {
-                    "driver": {
-                        "name": env!("CARGO_PKG_NAME"),
-                        "version": env!("CARGO_PKG_VERSION"),
-                        "rules": get_chain_enum(bc).filter(|e| {
-                            errors.contains_key(&e.to_string()) && !errors.get(&e.to_string()).unwrap().0.is_empty()
-                        }).map(|e| {
-                            json!({
-                                "id": e.to_string(),
-                                "shortDescription": {
-                                    "text": e.get_lint_message()
-                                }})
-
-                        }).collect::<Vec<serde_json::Value>>(),
-                        "informationUri": "https://coinfabrik.github.io/scout/",
-                    }
-                },
-                "results": build_sarif_results(&errors)?,
-            }
-        ]
-    });
-    let json_errors = serde_json::to_value(sarif_output)?;
-    Ok(json_errors)
-}
-
-pub fn format_into_sarif(
-    scout_output: File,
-    scout_internals: File,
-    bc: BlockChain,
-) -> anyhow::Result<String> {
-    Ok(serify(scout_output, scout_internals, bc)?.to_string())
-}
-
-fn build_sarif_results(
-    errors: &HashMap<String, (Vec<Value>, String)>,
-) -> anyhow::Result<Vec<serde_json::Value>> {
-    let runs: Vec<Value> = errors
-        .iter()
-        .flat_map(|(name, (spans, msg))| {
-            spans.iter().filter_map(move |span| {
-                Some(json!({
-                    "ruleId": name,
-                    "level": "error",
-                    "message": {
-                        "text": msg
-                    },
-                    "locations": [span],
-                }))
-            })
-        })
-        .collect();
-
-    Ok(runs)
-}