Cleanup

Author: camelid

ci/date-check/src/main.rs

@@ -61,11 +61,10 @@ fn collect_dates_from_file(date_regex: &Regex, text: &str) -> Vec<(usize, Date)>
             },
         )
     }) {
-        for chr in text[end_of_last_cap..byte_range.end].chars() {
-            if chr == '\n' {
-                line += 1;
-            }
-        }
+        line += text[end_of_last_cap..byte_range.end]
+            .chars()
+            .filter(|c| *c == '\n')
+            .count();
         dates.push((line, date));
         end_of_last_cap = byte_range.end;
     }
@@ -87,6 +86,7 @@ fn collect_dates(paths: impl Iterator<Item = PathBuf>) -> BTreeMap<PathBuf, Vec<
 
 fn filter_dates(
     current_month: Date,
+    min_months_since: u32,
     dates_by_file: impl Iterator<Item = (PathBuf, Vec<(usize, Date)>)>,
 ) -> impl Iterator<Item = (PathBuf, Vec<(usize, Date)>)> {
     dates_by_file
@@ -99,7 +99,7 @@ fn filter_dates(
                         current_month
                             .months_since(*date)
                             .expect("found date that is after current month")
-                            >= 6
+                            >= min_months_since
                     })
                     .collect::<Vec<_>>(),
             )
@@ -121,7 +121,7 @@ fn main() {
 
     let dates_by_file = collect_dates(glob(&glob_pat).unwrap().map(Result::unwrap));
     let dates_by_file: BTreeMap<_, _> =
-        filter_dates(current_month, dates_by_file.into_iter()).collect();
+        filter_dates(current_month, 6, dates_by_file.into_iter()).collect();
 
     if dates_by_file.is_empty() {
         println!("empty");
@@ -167,8 +167,14 @@ mod tests {
 
     #[test]
     fn test_months_since() {
-        let date1 = Date { year: 2020, month: 3 };
-        let date2 = Date { year: 2021, month: 1 };
+        let date1 = Date {
+            year: 2020,
+            month: 3,
+        };
+        let date2 = Date {
+            year: 2021,
+            month: 1,
+        };
         assert_eq!(date2.months_since(date1), Some(10));
     }