Bump chrono from 0.4.28 to 0.4.30 (#4065)

oxidecomputer · Sep 12, 2023 · 77fb3be · 77fb3be
1 parent 8c0de1a
commit 77fb3be
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 35 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/oximeter/db/src/model.rs b/oximeter/db/src/model.rs
@@ -224,7 +224,7 @@ impl From<DbDatumType> for DatumType {
 // nanoseconds in our case. We opt for strings here, since we're using that anyway in the
 // input/output format for ClickHouse.
 mod serde_timestamp {
-    use chrono::{DateTime, TimeZone, Utc};
+    use chrono::{naive::NaiveDateTime, DateTime, Utc};
     use serde::{self, Deserialize, Deserializer, Serializer};
 
     pub fn serialize<S>(
@@ -245,7 +245,8 @@ mod serde_timestamp {
         D: Deserializer<'de>,
     {
         let s = String::deserialize(deserializer)?;
-        Utc.datetime_from_str(&s, crate::DATABASE_TIMESTAMP_FORMAT)
+        NaiveDateTime::parse_from_str(&s, crate::DATABASE_TIMESTAMP_FORMAT)
+            .map(|naive_date| naive_date.and_utc())
             .map_err(serde::de::Error::custom)
     }
 }

diff --git a/oximeter/db/src/query.rs b/oximeter/db/src/query.rs
@@ -685,7 +685,7 @@ mod tests {
     use crate::FieldSchema;
     use crate::FieldSource;
     use crate::TimeseriesName;
-    use chrono::TimeZone;
+    use chrono::NaiveDateTime;
     use std::convert::TryFrom;
 
     #[test]
@@ -844,10 +844,14 @@ mod tests {
     fn test_time_range() {
         let s = "2021-01-01 01:01:01.123456789";
         let start_time =
-            Utc.datetime_from_str(s, crate::DATABASE_TIMESTAMP_FORMAT).unwrap();
+            NaiveDateTime::parse_from_str(s, crate::DATABASE_TIMESTAMP_FORMAT)
+                .unwrap()
+                .and_utc();
         let e = "2021-01-01 01:01:02.123456789";
         let end_time =
-            Utc.datetime_from_str(e, crate::DATABASE_TIMESTAMP_FORMAT).unwrap();
+            NaiveDateTime::parse_from_str(e, crate::DATABASE_TIMESTAMP_FORMAT)
+                .unwrap()
+                .and_utc();
         let range = TimeRange {
             start: Some(Timestamp::Inclusive(start_time)),
             end: Some(Timestamp::Exclusive(end_time)),