clippy 1.74.1

src/lambda/enumerator.rs

@@ -554,13 +554,15 @@ mod bfs {
     }
     impl Eq for BestFirstState {}
     impl PartialOrd for BestFirstState {
-        fn partial_cmp(&self, other: &BestFirstState) -> Option<::std::cmp::Ordering> {
-            self.cost.partial_cmp(&other.cost)
+        fn partial_cmp(&self, other: &BestFirstState) -> Option<std::cmp::Ordering> {
+            Some(self.cmp(other))
         }
     }
     impl Ord for BestFirstState {
-        fn cmp(&self, other: &BestFirstState) -> ::std::cmp::Ordering {
-            self.partial_cmp(other).unwrap()
+        fn cmp(&self, other: &BestFirstState) -> std::cmp::Ordering {
+            self.cost
+                .partial_cmp(&other.cost)
+                .expect("cost for BestFirstState is not finite")
         }
     }
 

src/lambda/mod.rs

@@ -559,7 +559,7 @@ impl Language {
         }
         // update probabilities for indices
         let log_n_indexed = ((cands.len() - indexed_start) as f64).ln();
-        for mut c in &mut cands[indexed_start..] {
+        for c in &mut cands[indexed_start..] {
             c.0 -= log_n_indexed
         }
         // normalize
@@ -574,7 +574,7 @@ impl Language {
                 .map(|&(p, _, _, _)| (p - p_largest).exp())
                 .sum::<f64>()
                 .ln();
-        for mut c in &mut cands {
+        for c in &mut cands {
             c.0 -= z;
         }
         cands

src/pcfg/mod.rs

@@ -497,13 +497,14 @@ impl Rule {
 }
 impl Ord for Rule {
     fn cmp(&self, other: &Rule) -> cmp::Ordering {
-        self.partial_cmp(other)
+        self.logprob
+            .partial_cmp(&other.logprob)
             .expect("logprob for rule is not finite")
     }
 }
 impl PartialOrd for Rule {
     fn partial_cmp(&self, other: &Rule) -> Option<cmp::Ordering> {
-        self.logprob.partial_cmp(&other.logprob)
+        Some(self.cmp(other))
     }
 }
 impl PartialEq for Rule {