Merge pull request #55 from hoodie/feature/maintenance

refactor: stop using deprecated chrono methods
hoodie · Nov 13, 2022 · 1b3165b · 1b3165b
2 parents cd97732 + 21e7b70
commit 1b3165b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 15 deletions.
diff --git a/examples/readme.rs b/examples/readme.rs
@@ -31,7 +31,7 @@ fn main() {
         .push(
             // add an all-day event
             Event::new()
-                .all_day(NaiveDate::from_ymd(2016, 3, 15))
+                .all_day(NaiveDate::from_ymd_opt(2016, 3, 15).unwrap())
                 .summary("My Birthday")
                 .description("Hey, I'm gonna have a party\nBYOB: Bring your own beer.\nHendrik")
                 .done(),

diff --git a/src/components.rs b/src/components.rs
@@ -357,7 +357,10 @@ mod tests {
 
     #[test]
     fn get_date_times_naive() {
-        let naive_date_time = NaiveDate::from_ymd(2001, 3, 13).and_hms(14, 15, 16);
+        let naive_date_time = NaiveDate::from_ymd_opt(2001, 3, 13)
+            .unwrap()
+            .and_hms_opt(14, 15, 16)
+            .unwrap();
         let event = Event::new()
             .starts(naive_date_time)
             .ends(naive_date_time)
@@ -368,7 +371,7 @@ mod tests {
 
     #[test]
     fn get_date_times_utc() {
-        let utc_date_time = Utc.ymd(2001, 3, 13).and_hms(14, 15, 16);
+        let utc_date_time = Utc.with_ymd_and_hms(2001, 3, 13, 14, 15, 16).unwrap();
         let event = Event::new()
             .timestamp(utc_date_time)
             .starts(utc_date_time)
@@ -381,7 +384,10 @@ mod tests {
 
     #[test]
     fn get_date_times_tzid() {
-        let date_time = NaiveDate::from_ymd(2001, 3, 13).and_hms(14, 15, 16);
+        let date_time = NaiveDate::from_ymd_opt(2001, 3, 13)
+            .unwrap()
+            .and_hms_opt(14, 15, 16)
+            .unwrap();
         let date_time_tzid = CalendarDateTime::WithTimezone {
             date_time,
             tzid: "Pacific/Auckland".to_string(),
@@ -396,7 +402,7 @@ mod tests {
 
     #[test]
     fn get_dates_naive() {
-        let naive_date = NaiveDate::from_ymd(2001, 3, 13);
+        let naive_date = NaiveDate::from_ymd_opt(2001, 3, 13).unwrap();
         let event = Event::new().starts(naive_date).ends(naive_date).done();
         assert_eq!(event.get_start(), Some(naive_date.into()));
         assert_eq!(event.get_end(), Some(naive_date.into()));

diff --git a/src/components/todo.rs b/src/components/todo.rs
@@ -97,7 +97,7 @@ mod tests {
 
     #[test]
     fn get_properties_set() {
-        let completed = Utc.ymd(2001, 3, 13).and_hms(14, 15, 16);
+        let completed = Utc.with_ymd_and_hms(2001, 3, 13, 14, 15, 16).unwrap();
         let todo = Todo::new()
             .percent_complete(42)
             .status(TodoStatus::NeedsAction)
@@ -110,14 +110,17 @@ mod tests {
 
     #[test]
     fn get_date_times_naive() {
-        let naive_date_time = NaiveDate::from_ymd(2001, 3, 13).and_hms(14, 15, 16);
+        let naive_date_time = NaiveDate::from_ymd_opt(2001, 3, 13)
+            .unwrap()
+            .and_hms_opt(14, 15, 16)
+            .unwrap();
         let todo = Todo::new().due(naive_date_time).done();
         assert_eq!(todo.get_due(), Some(naive_date_time.into()));
     }
 
     #[test]
     fn get_date_times_utc() {
-        let utc_date_time = Utc.ymd(2001, 3, 13).and_hms(14, 15, 16);
+        let utc_date_time = Utc.with_ymd_and_hms(2001, 3, 13, 14, 15, 16).unwrap();
         let todo = Todo::new()
             .due(utc_date_time)
             .completed(utc_date_time)
@@ -128,7 +131,7 @@ mod tests {
 
     #[test]
     fn get_dates_naive() {
-        let naive_date = NaiveDate::from_ymd(2001, 3, 13);
+        let naive_date = NaiveDate::from_ymd_opt(2001, 3, 13).unwrap();
         let todo = Todo::new().due(naive_date).done();
         assert_eq!(todo.get_due(), Some(naive_date.into()));
     }

diff --git a/tests/calendar.rs b/tests/calendar.rs
@@ -33,10 +33,11 @@ END:VCALENDAR\r
 #[test]
 fn test_calendar_to_string() {
     let mut calendar = Calendar::new();
-    let cest_date = FixedOffset::east(2 * 3600)
-        .ymd(2014, 7, 8)
-        .and_hms(9, 10, 11);
-    let utc_date = Utc.ymd(2014, 7, 9).and_hms(9, 10, 11);
+    let cest_date = FixedOffset::east_opt(2 * 3600)
+        .unwrap()
+        .with_ymd_and_hms(2014, 7, 8, 9, 10, 11)
+        .unwrap();
+    let utc_date = Utc.with_ymd_and_hms(2014, 7, 9, 9, 10, 11).unwrap();
     let event = Event::new()
         .status(EventStatus::Tentative)
         .starts(cest_date.with_timezone(&Utc))

diff --git a/tests/try_into_string.rs b/tests/try_into_string.rs
@@ -5,8 +5,8 @@ use std::convert::TryInto;
 #[test]
 fn try_into_string() -> Result<(), Box<dyn std::error::Error>> {
     let bday = Event::new()
-        .starts(NaiveDate::from_ymd(2016, 3, 15))
-        .ends(NaiveDate::from_ymd(2016, 3, 15))
+        .starts(NaiveDate::from_ymd_opt(2016, 3, 15).unwrap())
+        .ends(NaiveDate::from_ymd_opt(2016, 3, 15).unwrap())
         .summary("My Birthday")
         .description(
             r#"Hey, I'm gonna have a party