refactor: replace DateRange iterator with while loop

src/events/ics.rs

@@ -3,9 +3,10 @@
 // SPDX-License-Identifier: MIT
 
 use crate::events::{Event, EventDateTime, Events};
-use crate::utils::DateRange;
+use chrono::Duration;
 use icalendar::{Calendar, CalendarDateTime, Component, DatePerhapsTime, Event as IcalendarEvent};
 use rrule::RRuleSet;
+use std::cmp::max;
 use std::path::{Path, PathBuf};
 
 impl From<icalendar::DatePerhapsTime> for EventDateTime {
@@ -47,14 +48,16 @@ impl TryFrom<&IcalendarEvent> for Event {
             };
             let mut rrulesets: Vec<RRuleSet> = vec![];
             if !rrulestring.is_empty() {
-                for date in DateRange(start.date(), end.date()) {
+                let mut date = start.date();
+                while date < max(start.date() + Duration::days(1), end.date()) {
                     let rrule = format!(
                         "DTSTART;VALUE=DATE:{}\n{rrulestring}",
                         date.format("%Y%m%d")
                     );
                     if let Ok(x) = rrule.parse() {
                         rrulesets.push(x);
                     }
+                    date += Duration::days(1);
                 }
             }
             Ok(Event {

src/utils/date_extensions.rs

@@ -122,21 +122,6 @@ impl Iterator for MonthFullWeeksIter {
     }
 }
 
-pub struct DateRange(pub NaiveDate, pub NaiveDate);
-
-impl Iterator for DateRange {
-    type Item = NaiveDate;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.0 < self.1 {
-            self.0 += Duration::days(1);
-            Some(self.0)
-        } else {
-            None
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

src/utils/mod.rs

@@ -5,5 +5,5 @@
 mod date_extensions;
 mod helpers;
 
-pub use date_extensions::{DateExtensions, DateRange, MonthFullWeeksIter};
+pub use date_extensions::{DateExtensions, MonthFullWeeksIter};
 pub use helpers::convertstyle;