remove crate defined timezone constants

This to enable build-time timezone filtering (chrono-tz feature filter-by-regex).
fmeringdal · Jul 13, 2024 · 2c99203 · 2c99203
1 parent f0416ed
commit 2c99203
Show file tree

Hide file tree

Showing 21 changed files with 72 additions and 1,865 deletions.
diff --git a/rrule-afl-fuzz/Cargo.toml b/rrule-afl-fuzz/Cargo.toml
@@ -12,6 +12,7 @@ rust-version.workspace = true
 [dependencies]
 afl = "*"
 chrono = "0.4.19"
+chrono-tz = "0.9.0"
 num-traits = "0.2.15"
 
 [dependencies.rrule]

diff --git a/rrule-afl-fuzz/src/take_data.rs b/rrule-afl-fuzz/src/take_data.rs
@@ -67,10 +67,11 @@ pub fn take_datetime(input: &mut &[u8]) -> DateTime<Tz> {
         LocalResult::None => {
             // Will always succeed
             let nanos: i64 = take_data_i64(input);
-            Utc.timestamp_nanos(nanos).with_timezone(&Tz::UTC)
+            Utc.timestamp_nanos(nanos)
+                .with_timezone(&Tz::Tz(chrono_tz::Tz::UTC))
         }
         LocalResult::Single(datetime) | LocalResult::Ambiguous(datetime, _) => {
-            datetime.with_timezone(&Tz::UTC)
+            datetime.with_timezone(&Tz::Tz(chrono_tz::Tz::UTC))
         }
     }
 }

diff --git a/rrule-debugger/Cargo.toml b/rrule-debugger/Cargo.toml
@@ -12,6 +12,7 @@ rust-version.workspace = true
 [dependencies]
 rrule = { path = "../rrule" }
 chrono = "0.4.19"
+chrono-tz = "0.9.0"
 clap = { version = "4.1.9", features = ["derive"] }
 rrule-afl-fuzz = { version = "0.1.0", path = "../rrule-afl-fuzz" }
 log = "0.4.16"

diff --git a/rrule-debugger/src/debug.rs b/rrule-debugger/src/debug.rs
@@ -36,7 +36,7 @@ fn test_parsed_rrule() {
 }
 
 fn ymd_hms(year: i32, month: u32, day: u32, hour: u32, minute: u32, second: u32) -> DateTime<Tz> {
-    Tz::UTC
+    Tz::Tz(chrono_tz::Tz::UTC)
         .with_ymd_and_hms(year, month, day, hour, minute, second)
         .unwrap()
 }
diff --git a/rrule/examples/manual_rrule.rs b/rrule/examples/manual_rrule.rs
@@ -7,7 +7,9 @@ use rrule::{Frequency, RRule, Tz};
 
 fn main() {
     // Build an RRuleSet that starts the first day in 2020 at 9:00AM and occurs daily 5 times
-    let start_date = Tz::UTC.with_ymd_and_hms(2020, 1, 1, 9, 0, 0).unwrap();
+    let start_date = Tz::Tz(chrono_tz::Tz::UTC)
+        .with_ymd_and_hms(2020, 1, 1, 9, 0, 0)
+        .unwrap();
     let rrule_set = RRule::default()
         .count(5)
         .freq(Frequency::Daily)

diff --git a/rrule/examples/manual_rrule_set.rs b/rrule/examples/manual_rrule_set.rs
@@ -19,15 +19,23 @@ fn main() {
                 NWeekday::Every(Weekday::Tue),
                 NWeekday::Every(Weekday::Wed),
             ])
-            .build(Tz::UTC.with_ymd_and_hms(2020, 1, 1, 9, 0, 0).unwrap())
+            .build(
+                Tz::Tz(chrono_tz::UTC)
+                    .with_ymd_and_hms(2020, 1, 1, 9, 0, 0)
+                    .unwrap(),
+            )
             .expect("RRule invalid");
 
         // Build exrule that occurs weekly on Wednesday
         let exrule = RRule::default()
             .count(4)
             .freq(Frequency::Weekly)
             .by_weekday(vec![NWeekday::Every(Weekday::Wed)])
-            .validate(Tz::UTC.with_ymd_and_hms(2020, 1, 1, 9, 0, 0).unwrap())
+            .validate(
+                Tz::Tz(chrono_tz::UTC)
+                    .with_ymd_and_hms(2020, 1, 1, 9, 0, 0)
+                    .unwrap(),
+            )
             .expect("RRule invalid");
 
         let recurrences = rrule_set.exrule(exrule).all(10).dates;

diff --git a/rrule/examples/timezone_support.rs b/rrule/examples/timezone_support.rs
@@ -8,9 +8,11 @@ use chrono::{DateTime, TimeZone};
 use rrule::{Frequency, RRule, Tz};
 
 fn main() {
-    let tz = Tz::Europe__Berlin;
+    let tz = Tz::Tz(chrono_tz::Tz::Europe__Berlin);
     let start_date = tz.with_ymd_and_hms(2020, 1, 1, 9, 0, 0).unwrap();
-    let exdate = Tz::UTC.with_ymd_and_hms(2020, 1, 2, 8, 0, 0).unwrap();
+    let exdate = Tz::Tz(chrono_tz::Tz::UTC)
+        .with_ymd_and_hms(2020, 1, 2, 8, 0, 0)
+        .unwrap();
 
     // Build an rrule set that occurs daily at 9:00 for 4 times
     let rrule_set = RRule::default()

diff --git a/rrule/src/core/rruleset.rs b/rrule/src/core/rruleset.rs
@@ -349,13 +349,15 @@ mod tests {
 
     use crate::{Frequency, RRule, RRuleSet, Tz};
 
+    const UTC: Tz = Tz::Tz(chrono_tz::UTC);
+
     #[test]
     fn rruleset_string_roundtrip() {
         let rruleset_str = "DTSTART:20120201T093000Z\nRRULE:FREQ=DAILY;COUNT=3;BYHOUR=9;BYMINUTE=30;BYSECOND=0\nRDATE;VALUE=DATE-TIME:19970101T000000Z,19970120T000000Z\nEXRULE:FREQ=YEARLY;COUNT=8;BYMONTH=6,7;BYMONTHDAY=1;BYHOUR=9;BYMINUTE=30;BYSECOND=0\nEXDATE;VALUE=DATE-TIME:19970121T000000Z";
         let rruleset = RRuleSet::from_str(rruleset_str).unwrap();
 
         // Check start date
-        let dt_start = Tz::UTC.with_ymd_and_hms(2012, 2, 1, 9, 30, 0).unwrap();
+        let dt_start = UTC.with_ymd_and_hms(2012, 2, 1, 9, 30, 0).unwrap();
         assert_eq!(rruleset.dt_start, dt_start);
 
         // Check rrule
@@ -371,8 +373,8 @@ mod tests {
         assert_eq!(
             rruleset.rdate,
             vec![
-                Tz::UTC.with_ymd_and_hms(1997, 1, 1, 0, 0, 0).unwrap(),
-                Tz::UTC.with_ymd_and_hms(1997, 1, 20, 0, 0, 0).unwrap()
+                UTC.with_ymd_and_hms(1997, 1, 1, 0, 0, 0).unwrap(),
+                UTC.with_ymd_and_hms(1997, 1, 20, 0, 0, 0).unwrap()
             ]
         );
 
@@ -389,7 +391,7 @@ mod tests {
         // Check exdate
         assert_eq!(
             rruleset.exdate,
-            vec![Tz::UTC.with_ymd_and_hms(1997, 1, 21, 0, 0, 0).unwrap()]
+            vec![UTC.with_ymd_and_hms(1997, 1, 21, 0, 0, 0).unwrap()]
         );
 
         // Serialize to string again