Merge pull request #21 from chris-ha458/unreachable_fix

Fix #12

src/entity.rs

@@ -118,22 +118,18 @@ impl PartialEq<Self> for CharsetMatch {
 
 impl PartialOrd<Self> for CharsetMatch {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        let mess_difference = (self.mean_mess_ratio - other.mean_mess_ratio).abs();
-        let coherence_a = self.coherence();
-        let coherence_b = other.coherence();
+        let (coherence_a, coherence_b) = (self.coherence(), other.coherence());
+        let (multi_byte_a, multi_byte_b) = (self.multi_byte_usage(), other.multi_byte_usage());
         let coherence_difference = (coherence_a - coherence_b).abs();
+        let mess_difference = (self.mean_mess_ratio - other.mean_mess_ratio).abs();
 
-        // Below 1% difference --> Use Coherence
-        if mess_difference < 0.01 && coherence_difference > 0.02 {
+        match (mess_difference < 0.01, coherence_difference > 0.02) {
+            (false, _) => self.mean_mess_ratio.partial_cmp(&other.mean_mess_ratio),
+            // Below 1% difference --> Use Coherence
+            (true, true) => coherence_b.partial_cmp(&coherence_a),
             // When having a tough decision, use the result that decoded as many multi-byte as possible.
-            if mess_difference == 0.0 && coherence_difference == 0.0 {
-                return other
-                    .multi_byte_usage()
-                    .partial_cmp(&self.multi_byte_usage());
-            }
-            return coherence_b.partial_cmp(&coherence_a);
+            (true, false) => multi_byte_b.partial_cmp(&multi_byte_a),
         }
-        self.mean_mess_ratio.partial_cmp(&other.mean_mess_ratio)
     }
 }