more clippy fixes

adpaco-aws · Oct 4, 2024 · 8ea744d · 8ea744d
1 parent a6abae5
commit 8ea744d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/tools/kani-cov/src/report.rs b/tools/kani-cov/src/report.rs
@@ -141,9 +141,9 @@ pub fn output_coverage_results(
                     let results: Vec<&CovResult> = results
                         .iter()
                         .filter(|m| {
-                            if m.region.start.0 as usize == idx && m.region.end.0 as usize == idx {
+                            if m.region.start.0 == idx && m.region.end.0 == idx {
                                 (m.region.end.1 - m.region.start.1 != 1)
-                                    && (m.region.end.1 as usize) < line.len()
+                                    && (m.region.end.1) < line.len()
                             } else {
                                 true
                             }
@@ -154,13 +154,13 @@ pub fn output_coverage_results(
                         .iter()
                         .filter(|m| {
                             m.times_covered == 0
-                                && m.region.start.0 as usize == idx
-                                && m.region.end.0 as usize == idx
+                                && m.region.start.0 == idx
+                                && m.region.end.0 == idx
                         })
                         .flat_map(|m| {
                             vec![
-                                ((m.region.start.1 - 1) as usize, true),
-                                ((m.region.end.1 - 1) as usize, false),
+                                ((m.region.start.1 - 1), true),
+                                ((m.region.end.1 - 1), false),
                             ]
                         })
                         .collect();
@@ -169,20 +169,20 @@ pub fn output_coverage_results(
                         .iter()
                         .filter(|m| {
                             m.times_covered == 0
-                                && m.region.start.0 as usize == idx
-                                && m.region.end.0 as usize != idx
+                                && m.region.start.0 == idx
+                                && m.region.end.0 != idx
                         })
-                        .flat_map(|m| vec![((m.region.start.1 - 1) as usize, true)])
+                        .flat_map(|m| vec![((m.region.start.1 - 1), true)])
                         .collect();
                     // Escapes for the regions which only finish in this line
                     let mut closing_escapes: Vec<(usize, bool)> = results
                         .iter()
                         .filter(|m| {
                             m.times_covered == 0
-                                && m.region.start.0 as usize != idx
-                                && m.region.end.0 as usize == idx
+                                && m.region.start.0 != idx
+                                && m.region.end.0 == idx
                         })
-                        .flat_map(|m| vec![((m.region.end.1 - 1) as usize, false)])
+                        .flat_map(|m| vec![((m.region.end.1 - 1), false)])
                         .collect();
 
                     // Emit an opening escape if there was a closing one and we

diff --git a/tools/kani-cov/src/summary.rs b/tools/kani-cov/src/summary.rs
@@ -182,9 +182,7 @@ pub fn line_coverage_info(
     let covered_lines = line_status
         .iter()
         .filter(|s| s.is_some() && s.as_ref().unwrap().0 > 0)
-        .count()
-        .try_into()
-        .unwrap();
+        .count();
     (covered_lines, total_lines)
 }