rtc: Use NaiveDateTime::and_utc()

The DateTime::from_utc() is deprecated since 0.4.27.

Signed-off-by: Akira Moroo <retrage01@gmail.com>

Author: retrage

src/rtc_goldfish.rs

@@ -3,7 +3,7 @@
 
 use crate::mem::MemoryRegion;
 use atomic_refcell::AtomicRefCell;
-use chrono::{DateTime, Datelike, NaiveDateTime, Timelike, Utc};
+use chrono::{Datelike, NaiveDateTime, Timelike};
 
 // TODO: Fill from FDT
 const RTC_GOLDFISH_ADDRESS: u64 = 0x101000;
@@ -36,7 +36,7 @@ pub fn read_date() -> Result<(u8, u8, u8), ()> {
     let ts = RTC_GOLDFISH.borrow_mut().read_ts();
 
     let naive = NaiveDateTime::from_timestamp_opt(ts as i64, 0).ok_or(())?;
-    let datetime: DateTime<Utc> = DateTime::from_utc(naive, Utc);
+    let datetime = naive.and_utc();
     Ok((
         (datetime.year() - 2000) as u8,
         datetime.month() as u8,
@@ -47,7 +47,7 @@ pub fn read_date() -> Result<(u8, u8, u8), ()> {
 pub fn read_time() -> Result<(u8, u8, u8), ()> {
     let ts = RTC_GOLDFISH.borrow_mut().read_ts();
     let naive = NaiveDateTime::from_timestamp_opt(ts as i64, 0).ok_or(())?;
-    let datetime: DateTime<Utc> = DateTime::from_utc(naive, Utc);
+    let datetime = naive.and_utc();
     Ok((
         datetime.hour() as u8,
         datetime.minute() as u8,

src/rtc_pl031.rs

@@ -2,7 +2,7 @@
 // Copyright (C) 2022 Akira Moroo
 
 use atomic_refcell::AtomicRefCell;
-use chrono::{DateTime, Datelike, NaiveDateTime, Timelike, Utc};
+use chrono::{Datelike, NaiveDateTime, Timelike};
 
 use crate::{arch::aarch64::layout::map, mem};
 
@@ -28,7 +28,7 @@ impl Pl031 {
     pub fn read_date(&self) -> Result<(u8, u8, u8), ()> {
         let timestamp = self.read_timestamp();
         let naive = NaiveDateTime::from_timestamp_opt(timestamp as i64, 0).ok_or(())?;
-        let datetime: DateTime<Utc> = DateTime::from_utc(naive, Utc);
+        let datetime = naive.and_utc();
         Ok((
             (datetime.year() - 2000) as u8,
             datetime.month() as u8,
@@ -39,7 +39,7 @@ impl Pl031 {
     pub fn read_time(&self) -> Result<(u8, u8, u8), ()> {
         let timestamp = self.read_timestamp();
         let naive = NaiveDateTime::from_timestamp_opt(timestamp as i64, 0).ok_or(())?;
-        let datetime: DateTime<Utc> = DateTime::from_utc(naive, Utc);
+        let datetime = naive.and_utc();
         Ok((
             datetime.hour() as u8,
             datetime.minute() as u8,