checkpoint! Refactored more and tests pass

1 files changed, 4 insertions, 2 deletions

diff --git a/src/rrule.rs b/src/rrule.rs
index 53ccf39..0b7ad6b 100644
--- a/src/rrule.rs
+++ b/src/rrule.rs
@@ -1,3 +1,4 @@
+use crate::iter_set::iter_v2;
 use crate::iter::*;
 use crate::options::*;
 use chrono::prelude::*;
@@ -9,6 +10,7 @@ pub struct RRule {
     pub options: ParsedOptions,
 }
 
+
 impl RRule {
     pub fn new(options: ParsedOptions) -> Self {
         Self {
@@ -30,7 +32,7 @@ impl RRule {
         };
         let mut iter_res = IterResult::new(QueryMethodTypes::ALL, iter_args);
 
-        let res = iter(&mut iter_res, &mut self.options);
+        let res = iter_v2(&mut iter_res, &mut self.options);
         res
     }
 
@@ -48,7 +50,7 @@ impl RRule {
         };
         let mut iter_res = IterResult::new(QueryMethodTypes::ALL, iter_args);
 
-        let res = iter(&mut iter_res, &mut self.options);
+        let res = iter_v2(&mut iter_res, &mut self.options);
         res
     }
 }