replace deprecated method from_utc

dfir-dd · Sep 25, 2023 · 7eb7bb8 · 7eb7bb8
1 parent 5d6ec85
commit 7eb7bb8
Show file tree

Hide file tree

Showing 20 changed files with 14 additions and 13 deletions.
diff --git a/src/apps/mod.rs b/src/apps/mod.rs
diff --git a/src/apps/mactime2/application.rs → src/bin/mactime2/application.rs b/src/apps/mactime2/application.rs → src/bin/mactime2/application.rs
diff --git a/...pps/mactime2/bodyfile/bodyfile_decoder.rs → ...bin/mactime2/bodyfile/bodyfile_decoder.rs b/...pps/mactime2/bodyfile/bodyfile_decoder.rs → ...bin/mactime2/bodyfile/bodyfile_decoder.rs
diff --git a/...apps/mactime2/bodyfile/bodyfile_reader.rs → src/bin/mactime2/bodyfile/bodyfile_reader.rs b/...apps/mactime2/bodyfile/bodyfile_reader.rs → src/bin/mactime2/bodyfile/bodyfile_reader.rs
diff --git a/...apps/mactime2/bodyfile/bodyfile_sorter.rs → src/bin/mactime2/bodyfile/bodyfile_sorter.rs b/...apps/mactime2/bodyfile/bodyfile_sorter.rs → src/bin/mactime2/bodyfile/bodyfile_sorter.rs
diff --git a/src/apps/mactime2/bodyfile/macb_flags.rs → src/bin/mactime2/bodyfile/macb_flags.rs b/src/apps/mactime2/bodyfile/macb_flags.rs → src/bin/mactime2/bodyfile/macb_flags.rs
diff --git a/src/apps/mactime2/bodyfile/mod.rs → src/bin/mactime2/bodyfile/mod.rs b/src/apps/mactime2/bodyfile/mod.rs → src/bin/mactime2/bodyfile/mod.rs
diff --git a/src/apps/mactime2/cli.rs → src/bin/mactime2/cli.rs b/src/apps/mactime2/cli.rs → src/bin/mactime2/cli.rs
diff --git a/src/apps/mactime2/error.rs → src/bin/mactime2/error.rs b/src/apps/mactime2/error.rs → src/bin/mactime2/error.rs
diff --git a/src/apps/mactime2/filter.rs → src/bin/mactime2/filter.rs b/src/apps/mactime2/filter.rs → src/bin/mactime2/filter.rs
diff --git a/src/apps/mactime2/mod.rs → src/bin/mactime2/mod.rs b/src/apps/mactime2/mod.rs → src/bin/mactime2/mod.rs
diff --git a/src/apps/mactime2/output/csv_output.rs → src/bin/mactime2/output/csv_output.rs b/src/apps/mactime2/output/csv_output.rs → src/bin/mactime2/output/csv_output.rs
diff --git a/src/apps/mactime2/output/json_sorter.rs → src/bin/mactime2/output/json_sorter.rs b/src/apps/mactime2/output/json_sorter.rs → src/bin/mactime2/output/json_sorter.rs
diff --git a/src/apps/mactime2/output/mod.rs → src/bin/mactime2/output/mod.rs b/src/apps/mactime2/output/mod.rs → src/bin/mactime2/output/mod.rs
diff --git a/src/apps/mactime2/output/txt_output.rs → src/bin/mactime2/output/txt_output.rs b/src/apps/mactime2/output/txt_output.rs → src/bin/mactime2/output/txt_output.rs
diff --git a/src/apps/mactime2/stream/mod.rs → src/bin/mactime2/stream/mod.rs b/src/apps/mactime2/stream/mod.rs → src/bin/mactime2/stream/mod.rs
diff --git a/src/apps/mactime2/stream/stream_reader.rs → src/bin/mactime2/stream/stream_reader.rs b/src/apps/mactime2/stream/stream_reader.rs → src/bin/mactime2/stream/stream_reader.rs
diff --git a/src/apps/mactime2/stream/stream_source.rs → src/bin/mactime2/stream/stream_source.rs b/src/apps/mactime2/stream/stream_source.rs → src/bin/mactime2/stream/stream_source.rs
diff --git a/src/apps/mactime2/stream/stream_worker.rs → src/bin/mactime2/stream/stream_worker.rs b/src/apps/mactime2/stream/stream_worker.rs → src/bin/mactime2/stream/stream_worker.rs
diff --git a/src/registry/types/key_value_data.rs b/src/registry/types/key_value_data.rs
@@ -1,6 +1,4 @@
-use std::{
-    fmt::Display,
-};
+use std::fmt::Display;
 
 use binread::{BinRead, BinReaderExt};
 use chrono::{DateTime, Utc};
@@ -51,7 +49,9 @@ impl BinRead for KeyValueData {
 
         Ok(match data_type {
             KeyValueDataType::RegNone => Self::RegNone,
-            KeyValueDataType::RegSZ => Self::RegSZ(reader.read_le_args::<RegistryString>(data_size)?.into()),
+            KeyValueDataType::RegSZ => {
+                Self::RegSZ(reader.read_le_args::<RegistryString>(data_size)?.into())
+            }
             KeyValueDataType::RegExpandSZ => {
                 Self::RegExpandSZ(reader.read_le_args::<RegistryString>(data_size)?.into())
             }
@@ -78,7 +78,9 @@ impl BinRead for KeyValueData {
                 }
                 Self::RegDWordBigEndian(reader.read_be()?)
             }
-            KeyValueDataType::RegLink => Self::RegLink(reader.read_le_args::<RegistryString>(data_size)?.into()),
+            KeyValueDataType::RegLink => {
+                Self::RegLink(reader.read_le_args::<RegistryString>(data_size)?.into())
+            }
             KeyValueDataType::RegMultiSZ => {
                 let bytes = super::read_vec(reader, data_size)?;
                 let strings = super::parse_reg_multi_sz(&bytes[..])?;
@@ -87,12 +89,12 @@ impl BinRead for KeyValueData {
             KeyValueDataType::RegResourceList => {
                 Self::RegResourceList(reader.read_le_args::<RegistryString>(data_size)?.into())
             }
-            KeyValueDataType::RegFullResourceDescriptor => {
-                Self::RegFullResourceDescriptor(reader.read_le_args::<RegistryString>(data_size)?.into())
-            }
-            KeyValueDataType::RegResourceRequirementsList => {
-                Self::RegResourceRequirementsList(reader.read_le_args::<RegistryString>(data_size)?.into())
-            }
+            KeyValueDataType::RegFullResourceDescriptor => Self::RegFullResourceDescriptor(
+                reader.read_le_args::<RegistryString>(data_size)?.into(),
+            ),
+            KeyValueDataType::RegResourceRequirementsList => Self::RegResourceRequirementsList(
+                reader.read_le_args::<RegistryString>(data_size)?.into(),
+            ),
             KeyValueDataType::RegQWord => {
                 if data_size != 8 {
                     return Err(binread::Error::AssertFail {
@@ -206,7 +208,7 @@ mod tests {
             .read_ne_args((KeyValueDataType::RegFileTime, 8))
             .unwrap();
 
-        let expected = DateTime::<Utc>::from_utc(
+        let expected = DateTime::<Utc>::from_naive_utc_and_offset(
             NaiveDate::from_ymd_opt(2014, 10, 2)
                 .unwrap()
                 .and_hms_opt(19, 29, 4)