Clippy

crates/argus/src/aadebug/mod.rs

@@ -110,9 +110,7 @@ impl<'tcx> Storage<'tcx> {
     let tree_start = Instant::now();
 
     let mut sets = vec![];
-    tree.for_correction_set(|conjunct| {
-      sets.push(tree.weight(&conjunct));
-    });
+    tree.for_correction_set(|conjunct| sets.push(tree.weight(conjunct)));
 
     timer::elapsed("aadeg::into_results", tree_start);
 

crates/argus/src/aadebug/tree.rs

@@ -169,6 +169,8 @@ impl<'a, 'tcx> Goal<'a, 'tcx> {
   }
 
   fn analyze(&self) -> Heuristic {
+    use std::cmp::Ordering;
+
     // We should only be analyzing failed predicates
     assert!(!self.result.is_yes());
 
@@ -188,16 +190,14 @@ impl<'a, 'tcx> Goal<'a, 'tcx> {
         log::debug!("Fn Args {:?}", t.trait_ref.args.into_type_list(tcx));
         log::debug!("{} v {}", fn_arity, trait_arity);
 
-        if fn_arity > trait_arity {
-          GoalKind::DeleteFnParams {
-            delta: fn_arity - trait_arity,
-          }
-        } else if fn_arity < trait_arity {
-          GoalKind::AddFnParams {
+        match fn_arity.cmp(&trait_arity) {
+          Ordering::Less => GoalKind::AddFnParams {
             delta: trait_arity - fn_arity,
-          }
-        } else {
-          GoalKind::IncorrectParams { arity: fn_arity }
+          },
+          Ordering::Greater => GoalKind::DeleteFnParams {
+            delta: fn_arity - trait_arity,
+          },
+          Ordering::Equal => GoalKind::IncorrectParams { arity: fn_arity },
         }
       }
 
@@ -398,10 +398,6 @@ impl<'a, 'tcx: 'a> T<'a, 'tcx> {
   }
 
   pub fn dnf(&self) -> impl Deref<Target = Dnf<I>> + '_ {
-    if self.dnf.borrow().is_some() {
-      return self.expect_dnf();
-    }
-
     fn _goal(this: &T, goal: &Goal) -> Option<Dnf<I>> {
       if !((this.maybe_ambiguous && goal.result.is_maybe())
         || goal.result.is_no())
@@ -430,6 +426,10 @@ impl<'a, 'tcx: 'a> T<'a, 'tcx> {
       Dnf::and(goals.filter_map(|g| _goal(this, &g)))
     }
 
+    if self.dnf.borrow().is_some() {
+      return self.expect_dnf();
+    }
+
     let dnf_report_msg =
       format!("Normalizing to DNF from {} nodes", self.ns.len());
     let dnf_start = Instant::now();

crates/argus/src/analysis/entry.rs

@@ -122,7 +122,7 @@ pub fn process_obligation_for_tree<'tcx>(
           log::error!("matching target tree not generated {e:?}");
         }
       }
-    })
+    });
   });
 }
 

crates/argus/src/analysis/hir.rs

@@ -161,7 +161,7 @@ pub fn find_most_enclosing_node(
 
 /// Visitor for finding a `HirId` given a span.
 ///
-/// Code taken from rustc_trait_selection::traits::error_reporting and modified
+/// Code taken from `rustc_trait_selection::traits::error_reporting` and modified
 /// to find items that enclose the span, not just match it exactly.
 struct FindNodeBySpan {
   pub span: Span,

crates/argus/src/analysis/transform.rs

@@ -335,7 +335,7 @@ impl<'a, 'tcx: 'a> ObligationsBuilder<'a, 'tcx> {
 
         self.trait_errors.push(TraitError {
           idx: expr_id,
-          range: self.exprs[expr_id].range.clone(),
+          range: self.exprs[expr_id].range,
           hashes,
         });
         continue;
@@ -380,7 +380,7 @@ impl<'a, 'tcx: 'a> ObligationsBuilder<'a, 'tcx> {
       // Mark the found Expr as containing an error.
       self.trait_errors.push(TraitError {
         idx: *expr_id,
-        range: self.exprs[*expr_id].range.clone(),
+        range: self.exprs[*expr_id].range,
         hashes: vec![],
       });
     }