restructuring

1 files changed, 0 insertions, 78 deletions

diff --git a/src/rrulestr.rs b/src/rrulestr.rs
index 98db39a..c1bfc67 100644
--- a/src/rrulestr.rs
+++ b/src/rrulestr.rs
@@ -15,85 +15,7 @@ static DTSTART_RE: Lazy<Regex> =
 
 static RRUle_RE: Lazy<Regex> = Lazy::new(|| Regex::new(r"(?m)^(?:RRULE|EXRULE):").unwrap());
 
-#[derive(Debug, Clone)]
-pub struct PartialOptions {
-    pub freq: Option<Frequenzy>,
-    pub interval: Option<usize>,
-    pub count: Option<u32>,
-    pub until: Option<DateTime<Utc>>,
-    pub tzid: Option<String>,
-    pub dtstart: Option<DateTime<Utc>>,
-    pub wkst: Option<usize>,
-    pub bysetpos: Option<Vec<isize>>,
-    pub bymonth: Option<Vec<usize>>,
-    pub bymonthday: Option<Vec<isize>>,
-    pub bynmonthday: Option<Vec<isize>>,
-    pub byyearday: Option<Vec<isize>>,
-    pub byweekno: Option<Vec<isize>>,
-    pub byweekday: Option<Vec<usize>>,
-    pub byhour: Option<Vec<usize>>,
-    pub byminute: Option<Vec<usize>>,
-    pub bysecond: Option<Vec<usize>>,
-    pub bynweekday: Option<Vec<Vec<isize>>>,
-    pub byeaster: Option<isize>,
-}
 
-impl PartialOptions {
-    pub fn new() -> Self {
-        Self {
-            freq: None,
-            interval: None,
-            count: None,
-            until: None,
-            tzid: None,
-            dtstart: None,
-            wkst: None,
-            bysetpos: None,
-            bymonth: None,
-            bymonthday: None,
-            bynmonthday: None,
-            byyearday: None,
-            byweekno: None,
-            byweekday: None,
-            byhour: None,
-            byminute: None,
-            bysecond: None,
-            bynweekday: None,
-            byeaster: None,
-        }
-    }
-
-    fn is_some_or_none<'a, T>(prop1: &'a Option<T>, prop2: &'a Option<T>) -> &'a Option<T> {
-        if prop2.is_some() {
-            return prop2;
-        } 
-        prop1
-    }
-
-    pub fn concat(opt1: &Self, opt2: &Self) -> Self {
-        Self {
-            freq: Self::is_some_or_none(&opt1.freq, &opt2.freq).clone(),
-            interval: Self::is_some_or_none(&opt1.interval, &opt2.interval).clone(),
-            count: Self::is_some_or_none(&opt1.count, &opt2.count).clone(),
-            until: Self::is_some_or_none(&opt1.until, &opt2.until).clone(),
-            tzid: Self::is_some_or_none(&opt1.tzid, &opt2.tzid).clone(),
-            dtstart: Self::is_some_or_none(&opt1.dtstart, &opt2.dtstart).clone(),
-            wkst: Self::is_some_or_none(&opt1.wkst, &opt2.wkst).clone(),
-            bysetpos: Self::is_some_or_none(&opt1.bysetpos, &opt2.bysetpos).clone(),
-            bymonth: Self::is_some_or_none(&opt1.bymonth, &opt2.bymonth).clone(),
-            bymonthday: Self::is_some_or_none(&opt1.bymonthday, &opt2.bymonthday).clone(),
-            bynmonthday: Self::is_some_or_none(&opt1.bynmonthday, &opt2.bynmonthday).clone(),
-            byyearday: Self::is_some_or_none(&opt1.byyearday, &opt2.byyearday).clone(),
-            byweekno: Self::is_some_or_none(&opt1.byweekno, &opt2.byweekno).clone(),
-            byweekday: Self::is_some_or_none(&opt1.byweekday, &opt2.byweekday).clone(),
-            byhour: Self::is_some_or_none(&opt1.byhour, &opt2.byhour).clone(),
-            byminute: Self::is_some_or_none(&opt1.byminute, &opt2.byminute).clone(),
-            bysecond: Self::is_some_or_none(&opt1.bysecond, &opt2.bysecond).clone(),
-            bynweekday: Self::is_some_or_none(&opt1.bynweekday, &opt2.bynweekday).clone(),
-            byeaster: Self::is_some_or_none(&opt1.byeaster, &opt2.byeaster).clone(),
-        }
-    }
-}
 
 fn datestring_to_date(dt: &str) -> DateTime<Utc> {
     let bits = DATESTR_RE.captures(dt).unwrap();