chore: merge main (clippy 1.96 debt fixes) into feat/result-arbiter

Author: hyperpolymath

.github/workflows/security-scan.yml

@@ -20,6 +20,6 @@ permissions:
 
 jobs:
   scan:
-    uses: hyperpolymath/panic-attack/.github/workflows/scan-and-report.yml@6a1feb26290ae16f7952fa0ff765a7b061bd50c8 # main 2026-05-20
+    uses: hyperpolymath/panic-attack/.github/workflows/scan-and-report.yml@6693e01727aefdc01cbb5ddd728e9a510128f2a2 # main 2026-07-07 (skip dispatch without VERISIMDB_PAT)
     secrets:
       VERISIMDB_PAT: ${{ secrets.VERISIMDB_PAT }}

benches/proof_benchmarks.rs

@@ -6,7 +6,8 @@
 //! Run with: cargo bench
 //! Generates HTML reports in target/criterion/
 
-use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
+use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
+use std::hint::black_box;
 
 use echidna::core::{Context, Goal, Hypothesis, ProofState, Term};
 use echidna::provers::{ProverConfig, ProverFactory, ProverKind};

benches/routing_benchmarks.rs

@@ -14,7 +14,8 @@
 //! Run with: `cargo bench --bench routing_benchmarks`
 //! Generates HTML reports in `target/criterion/`
 
-use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
+use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
+use std::hint::black_box;
 
 use echidna::agent::AgentConfig;
 use echidna::dispatch::DispatchConfig;

src/rust/corpus/acl2_books.rs

@@ -361,8 +361,10 @@ fn classify_form(form: &str, line: usize, pf: &mut ParsedFile) {
             if name.is_empty() {
                 return;
             }
-            let mut hz = AxiomUsage::default();
-            hz.postulate = true;
+            let mut hz = AxiomUsage {
+                postulate: true,
+                ..Default::default()
+            };
             hz.other.push("defaxiom".to_string());
             flag_hazards(rest_body, &mut hz);
             pf.decls.push(DraftDecl {
@@ -379,8 +381,10 @@ fn classify_form(form: &str, line: usize, pf: &mut ParsedFile) {
             if name.is_empty() {
                 return;
             }
-            let mut hz = AxiomUsage::default();
-            hz.postulate = true;
+            let mut hz = AxiomUsage {
+                postulate: true,
+                ..Default::default()
+            };
             hz.other.push("defstub".to_string());
             pf.decls.push(DraftDecl {
                 name,

src/rust/corpus/isabelle.rs

@@ -546,10 +546,8 @@ fn parse_theorem_like(
             }
             // `using … by …` and `unfolding … by …` patterns also
             // terminate on the trailing `by`.
-            if t.contains(" by ") || t.ends_with(" by") {
-                if !t.starts_with("proof") {
-                    terminated = true;
-                }
+            if (t.contains(" by ") || t.ends_with(" by")) && !t.starts_with("proof") {
+                terminated = true;
             }
         }
         j += 1;

src/rust/corpus/metamath.rs

@@ -314,8 +314,10 @@ fn extract_module_name(src: &str) -> Option<String> {
 }
 
 fn parse_mm_file(raw: &str) -> ParsedFile {
-    let mut pf = ParsedFile::default();
-    pf.module_name = extract_module_name(raw);
+    let mut pf = ParsedFile {
+        module_name: extract_module_name(raw),
+        ..Default::default()
+    };
 
     let toks = lex(raw);
     let mut scope_stack: Vec<String> = Vec::new();

src/rust/corpus/minif2f.rs

@@ -160,7 +160,7 @@ fn terminators(ext: &str) -> &'static [&'static str] {
 
 /// Identify the start-of-statement on a line and return
 /// `(opening_token_index, name)` if found.
-fn match_opening<'a>(line: &'a str, ext: &str) -> Option<(usize, String)> {
+fn match_opening(line: &str, ext: &str) -> Option<(usize, String)> {
     let trim = line.trim_start();
     for kw in opening_tokens(ext) {
         if let Some(rest) = trim.strip_prefix(*kw) {

src/rust/corpus/tptp.rs

@@ -372,9 +372,9 @@ fn parse_annotated_formula(stmt: &str, line: usize) -> Option<DraftDecl> {
     for k in &kinds {
         if let Some(r) = stmt.strip_prefix(k) {
             let r2 = r.trim_start();
-            if r2.starts_with('(') {
+            if let Some(stripped) = r2.strip_prefix('(') {
                 head = Some(k);
-                rest = Some(&r2[1..]);
+                rest = Some(stripped);
                 break;
             }
         }

src/rust/corpus/why3.rs

@@ -329,8 +329,8 @@ fn parse_envelope(
     }
 
     // Imports / clones inside the envelope.
-    for k in (start + 1)..body_end {
-        let t = lines[k].trim_start();
+    for line in lines.iter().take(body_end).skip(start + 1) {
+        let t = line.trim_start();
         let import_rest = t
             .strip_prefix("use import ")
             .or_else(|| t.strip_prefix("use export "))

src/rust/exchange/smtlib.rs

@@ -144,10 +144,10 @@ impl SmtLibExchange {
             }
         }
 
-        infos.sort_by(|a, b| key_of(a).cmp(&key_of(b)));
-        options.sort_by(|a, b| key_of(a).cmp(&key_of(b)));
-        sorts.sort_by(|a, b| key_of(a).cmp(&key_of(b)));
-        funs.sort_by(|a, b| key_of(a).cmp(&key_of(b)));
+        infos.sort_by_key(key_of);
+        options.sort_by_key(key_of);
+        sorts.sort_by_key(key_of);
+        funs.sort_by_key(key_of);
         // defs preserve original order: dependencies between defines are
         // significant and we don't track them here.