Cargo: Enable most pedantic Clippy lints

Cargo.toml

@@ -32,5 +32,24 @@ exclude = [
 
 [workspace.lints.clippy]
 all = { level = "warn", priority = -1 }
-explicit_iter_loop = "warn"
-manual_let_else = "warn"
+pedantic = { level = "warn", priority = -1 }
+
+# Allowlist of pedantic rules that we've observed to be of questionable value
+missing_errors_doc = "allow"
+missing_panics_doc = "allow"
+must_use_candidate = "allow"
+implicit_hasher = "allow"
+if_not_else = "allow"
+# This lint has a lot of results in generated code.
+unnecessary_wraps = "allow"
+# Spelling out the full method name can often be tedious.
+# E.g., `|v| v.as_slice()` vs `vec::Vec::as_slice`
+redundant_closure_for_method_calls = "allow"
+# The next three are only false positives and questionable results
+cast_possible_truncation = "allow"
+cast_possible_wrap = "allow"
+cast_sign_loss = "allow"
+# False positives
+struct_excessive_bools = "allow"
+# False positives for things like "matches" and "matched"
+similar_names = "allow"

MODULE.bazel

@@ -142,7 +142,6 @@ use_repo(
     "vendor_rs__globset-0.4.18",
     "vendor_rs__itertools-0.14.0",
     "vendor_rs__itertools-0.15.0",
-    "vendor_rs__lazy_static-1.5.1",
     "vendor_rs__mustache-0.9.0",
     "vendor_rs__num-traits-0.2.19",
     "vendor_rs__num_cpus-1.17.0",

clippy.toml

@@ -0,0 +1,2 @@
+# Names that do not need to be backtick quoted within documentation comments.
+doc-valid-idents = ["CodeQL", ".."]

cpp/extractor/bmn/src/compiler.rs

@@ -519,7 +519,9 @@ fn get_compiler_override(
             &clang_cpp_compiler,
         )
         .ok_or(anyhow!(
-            "Could not find clang compilers: {clang_c_compiler:?}, {clang_cpp_compiler:?}"
+            "Could not find clang compilers: {}, {}",
+            clang_c_compiler.display(),
+            clang_cpp_compiler.display()
         ))
     } else if override_instruction == "gnu" {
         // These can be just a command name, e.g. "gcc-18", or a full path, e.g.
@@ -529,17 +531,23 @@ fn get_compiler_override(
         let gnu_cpp_compiler =
             environment::get_required_os(environment::CODEQL_EXTRACTOR_CPP_BMN_COMPILER_GNU_CPP)?;
         find_posix(telemetry, Compiler::Gnu, &gnu_c_compiler, &gnu_cpp_compiler).ok_or(anyhow!(
-            "Could not find gnu compilers: {gnu_c_compiler:?}, {gnu_cpp_compiler:?}"
+            "Could not find gnu compilers: {}, {}",
+            gnu_c_compiler.display(),
+            gnu_cpp_compiler.display()
         ))
     } else if override_instruction == "msvc" {
         // These can be just a command name, e.g. "cl", or a full path, e.g.
         // "c:\msvc\cl.exe"
         let msvc_compiler =
             environment::get_required_os(environment::CODEQL_EXTRACTOR_CPP_BMN_COMPILER_MSVC)?;
-        use_cl(&msvc_compiler).ok_or(anyhow!("Could not find msvc compiler: {msvc_compiler:?}"))
+        use_cl(&msvc_compiler).ok_or(anyhow!(
+            "Could not find msvc compiler: {}",
+            msvc_compiler.display()
+        ))
     } else {
         Err(anyhow!(
-            "Unsupported compiler override instruction: {override_instruction:?}"
+            "Unsupported compiler override instruction: {}",
+            override_instruction.display()
         ))
     }
 }

cpp/extractor/bmn/src/dependency_installation.rs

@@ -45,7 +45,7 @@ fn run_command(command: &mut Command) -> anyhow::Result<()> {
             } else {
                 OsString::from("Failed to read output")
             };
-            Err(anyhow!("\"{command_name}\" failed: {error:?}"))
+            Err(anyhow!("\"{command_name}\" failed: {}", error.display()))
         }
         Err(e) => Err(anyhow!("Error waiting for process \"{command_name}\": {e}")),
     }

cpp/extractor/bmn/src/file_filter.rs

@@ -97,7 +97,8 @@ fn relativize_path(path: PathBuf) -> Result<PathBuf> {
                 Ok(PathBuf::from_iter(sliced))
             }
             _ => Err(anyhow!(
-                "Path cannot start with .. or the drive prefix: {path:?}"
+                "Path cannot start with .. or the drive prefix: {}",
+                path.display()
             )),
         }
     }

cpp/extractor/bmn/src/gnu_compiler_default_include_finder.rs

@@ -95,7 +95,8 @@ fn execute_command_with_args_get_stderr(cmd: &OsStr, args: &[&str]) -> Result<Ve
     match Command::new(cmd).args(args).stdin(Stdio::piped()).output() {
         Ok(output) if output.status.success() => Ok(output.stderr),
         _ => Err(anyhow!(
-            "Error invoking the compiler {cmd:?} to get the default include folders."
+            "Error invoking the compiler {} to get the default include folders.",
+            cmd.display()
         )),
     }
 }
@@ -597,7 +598,7 @@ End of search list."#;
         assert_true!(output.is_err());
         assert_eq!(
             output.unwrap_err().to_string(),
-            format!("Error invoking the compiler {cmd:?} to get the default include folders.")
+            "Error invoking the compiler command-not-existing to get the default include folders."
         );
     }
 
@@ -608,7 +609,7 @@ End of search list."#;
         assert_true!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
-            format!("Error invoking the compiler {cmd:?} to get the default include folders.")
+            "Error invoking the compiler command-not-existing to get the default include folders."
         );
     }
 }

cpp/extractor/bmn/src/main.rs

@@ -52,8 +52,8 @@ fn get_extractor_executable() -> Result<PathBuf> {
     let extractor = PathBuf::from_iter([&root_dir, "tools", &platform, &binary_name]);
     if !extractor.exists() {
         Err(anyhow::anyhow!(
-            "Extractor executable not found at: {:?}",
-            extractor
+            "Extractor executable not found at: {}",
+            extractor.display()
         ))
     } else {
         Ok(extractor)

cpp/extractor/bmn/src/package_database.rs

@@ -150,19 +150,27 @@ pub fn get_package_database() -> anyhow::Result<PackageDatabase> {
     {
         if !path.exists() {
             return Err(anyhow!(
-                "Local deptrace database path specified but file does not exist: {path:?}.",
+                "Local deptrace database path specified but file does not exist: {}.",
+                path.display()
             ));
         }
         debug!(
             "Using local deptrace database from {}: {path:?}",
             environment::CODEQL_EXTRACTOR_CPP_LOCAL_DEPTRACE_DB,
         );
-        fs::read_to_string(&path)
-            .map_err(|e| anyhow!("Failed to read local deptrace database from {path:?}: {e}"))?
+        fs::read_to_string(&path).map_err(|e| {
+            anyhow!(
+                "Failed to read local deptrace database from {}: {e}",
+                path.display()
+            )
+        })?
     } else {
         let archive_file_path = get_deptrace_db_zip_path()?;
         extract_content_from_zip(&archive_file_path).map_err(|e| {
-            anyhow!("Failed to extract package database from {archive_file_path:?}: {e}")
+            anyhow!(
+                "Failed to extract package database from {}: {e}",
+                archive_file_path.display()
+            )
         })?
     };
     PackageDatabase::from_deptrace_content(&content)
@@ -213,17 +221,31 @@ fn infer_os_version_name() -> Option<OsReleaseInfo> {
 /// as a string.
 fn extract_content_from_zip(archive_zip_name: &Path) -> anyhow::Result<String> {
     let inner_file_name = "deptrace-db.txt";
-    let file = File::open(archive_zip_name)
-        .map_err(|e| anyhow!("Could not open archive zip name {archive_zip_name:?}: {e}"))?;
-    let mut archive = ZipArchive::new(file)
-        .map_err(|e| anyhow!("Could not read zip archive {archive_zip_name:?}: {e}"))?;
+    let file = File::open(archive_zip_name).map_err(|e| {
+        anyhow!(
+            "Could not open archive zip name {}: {e}",
+            archive_zip_name.display()
+        )
+    })?;
+    let mut archive = ZipArchive::new(file).map_err(|e| {
+        anyhow!(
+            "Could not read zip archive {}: {e}",
+            archive_zip_name.display()
+        )
+    })?;
     let mut zipped_file = archive.by_name(inner_file_name).map_err(|e| {
-        anyhow!("Could not find {inner_file_name} in archive {archive_zip_name:?}: {e}")
+        anyhow!(
+            "Could not find {inner_file_name} in archive {}: {e}",
+            archive_zip_name.display()
+        )
     })?;
 
     let mut buffer = String::new();
     zipped_file.read_to_string(&mut buffer).map_err(|e| {
-        anyhow!("Could not read {inner_file_name} from archive {archive_zip_name:?}: {e}")
+        anyhow!(
+            "Could not read {inner_file_name} from archive {}: {e}",
+            archive_zip_name.display()
+        )
     })?;
 
     Ok(buffer)

ql/buramu/Cargo.toml

@@ -9,7 +9,6 @@ edition = "2021"
 workspace = true
 
 [dependencies]
-lazy_static = "1.4.0"
 chrono = "0.4.37"
 rayon = "1.9.0"
 regex = "1.10.4"

ql/buramu/src/main.rs

@@ -1,7 +1,7 @@
-use lazy_static::lazy_static;
 use rayon::prelude::*;
 use regex::Regex;
 use std::collections::HashMap;
+use std::sync::LazyLock;
 use std::{io::BufRead, process::Command};
 
 // A map from filenames to lists of line numbers (for just the lines with deprecations)
@@ -53,7 +53,7 @@ fn get_blame_dates_for_filedeprecation(file: &str, linenos: &[String]) -> LastMo
     let mut command = Command::new("git");
     command.arg("blame");
     for lineno in linenos {
-        command.arg("-L").arg(format!("{},{}", lineno, lineno));
+        command.arg("-L").arg(format!("{lineno},{lineno}"));
     }
     command.arg(file);
     let output = command.output().expect("failed to execute process");
@@ -69,10 +69,8 @@ fn get_blame_dates_for_filedeprecation(file: &str, linenos: &[String]) -> LastMo
     blame_dates
 }
 
-lazy_static! {
-    static ref BLAME_RE: Regex =
-        Regex::new("(\\d{4}-\\d{2}-\\d{2}).*[+-]\\d{4}\\s+(\\d+)\\)").unwrap();
-}
+static BLAME_RE: LazyLock<Regex> =
+    LazyLock::new(|| Regex::new("(\\d{4}-\\d{2}-\\d{2}).*[+-]\\d{4}\\s+(\\d+)\\)").unwrap());
 
 fn get_last_modified(line: &str) -> LastModifiedLine {
     let caps = BLAME_RE.captures(line).unwrap();
@@ -97,7 +95,7 @@ fn main() {
         .par_iter()
         .map(|(file, linenos)| (file, get_blame_dates_for_filedeprecation(file, linenos)));
     deprecations.for_each(|(file, linenos_and_dates)| {
-        println!("file: {}", file);
+        println!("file: {file}");
         for (date, linenos) in &linenos_and_dates {
             println!("  last_modified: {} {}", date, linenos.join(" "));
         }

ruby/extractor/Cargo.toml

@@ -19,7 +19,6 @@ tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
 rayon = "1.12.0"
 regex = "1.13.1"
 encoding = "0.2"
-lazy_static = "1.5.1"
 serde_json = "1.0.154"
 
 codeql-extractor = { path = "../../shared/tree-sitter-extractor" }