Cleanups

googlefonts · Sep 6, 2023 · 272efce · 272efce
1 parent 0eab689
commit 272efce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,6 +37,8 @@ temp-env = "0.3.3"
 
 [workspace]
 
+resolver = "2"
+
 members = [
     "fontdrasil",
     "fontbe",

diff --git a/glyphs2fontir/src/source.rs b/glyphs2fontir/src/source.rs
@@ -1,4 +1,4 @@
-use chrono::{TimeZone, Utc};
+use chrono::DateTime;
 use font_types::{NameId, Tag};
 use fontdrasil::orchestration::{Access, Work};
 use fontdrasil::types::{GlyphName, GroupName};
@@ -366,7 +366,8 @@ impl Work<Context, WorkId, WorkError> for StaticMetadataWork {
             .date
             .as_ref()
             .and_then(|raw_date| {
-                let parsed = Utc.datetime_from_str(raw_date, "%Y-%m-%d %H:%M:%S %Z");
+                let parsed =
+                    DateTime::parse_from_str(raw_date, "%Y-%m-%d %H:%M:%S %z").map(|nd| nd.into());
                 if let Err(e) = parsed {
                     warn!("Invalid creation date: {}: {e:?}", raw_date);
                 }

diff --git a/ufo2fontir/src/source.rs b/ufo2fontir/src/source.rs
@@ -5,7 +5,7 @@ use std::{
     sync::Arc,
 };
 
-use chrono::{DateTime, TimeZone, Utc};
+use chrono::{DateTime, NaiveDateTime, Utc};
 use font_types::{InvalidTag, NameId, Tag};
 use fontdrasil::{
     orchestration::{Access, Work},
@@ -666,7 +666,8 @@ fn try_parse_date(raw_date: Option<&String>) -> Option<DateTime<Utc>> {
         return None;
     };
 
-    let parse_result = Utc.datetime_from_str(raw_date, "%Y/%m/%d %H:%M:%S");
+    let parse_result =
+        NaiveDateTime::parse_from_str(raw_date, "%Y/%m/%d %H:%M:%S").map(|nd| nd.and_utc());
     if let Err(e) = parse_result {
         warn!("Invalid date string {}: {e}", raw_date);
     }