Use common Timestamp impl in Hermit (attempt 2)

Author: stepancheg

library/std/src/sys/fs/hermit.rs

@@ -109,15 +109,15 @@ pub struct DirBuilder {
 
 impl FileAttr {
     pub fn modified(&self) -> io::Result<SystemTime> {
-        Ok(SystemTime::new(self.stat_val.st_mtim.tv_sec, self.stat_val.st_mtim.tv_nsec))
+        SystemTime::new(self.stat_val.st_mtim.tv_sec, self.stat_val.st_mtim.tv_nsec.into())
     }
 
     pub fn accessed(&self) -> io::Result<SystemTime> {
-        Ok(SystemTime::new(self.stat_val.st_atim.tv_sec, self.stat_val.st_atim.tv_nsec))
+        SystemTime::new(self.stat_val.st_atim.tv_sec, self.stat_val.st_atim.tv_nsec.into())
     }
 
     pub fn created(&self) -> io::Result<SystemTime> {
-        Ok(SystemTime::new(self.stat_val.st_ctim.tv_sec, self.stat_val.st_ctim.tv_nsec))
+        SystemTime::new(self.stat_val.st_ctim.tv_sec, self.stat_val.st_ctim.tv_nsec.into())
     }
 
     pub fn size(&self) -> u64 {

library/std/src/sys/pal/hermit/mod.rs

@@ -23,6 +23,7 @@ use crate::sys::env;
 
 pub mod futex;
 pub mod os;
+#[path = "../unix/time.rs"]
 pub mod time;
 
 pub fn unsupported<T>() -> io::Result<T> {

library/std/src/sys/pal/hermit/time.rs

@@ -17,7 +17,7 @@ pub(in crate::sys) const TIMESPEC_MAX_CAPPED: libc::timespec = libc::timespec {
     tv_nsec: (u64::MAX % NSEC_PER_SEC) as i64,
 };
 
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
 pub(crate) struct Timespec {
     pub tv_sec: i64,
     pub tv_nsec: Nanoseconds,
@@ -66,6 +66,7 @@ impl Timespec {
         }
     }
 
+    #[allow(dead_code)]
     pub fn now(clock: libc::clockid_t) -> Timespec {
         use crate::mem::MaybeUninit;
         use crate::sys::cvt;

library/std/src/sys/pal/unix/time.rs

@@ -1,18 +1,21 @@
 use hermit_abi::{self, CLOCK_MONOTONIC, CLOCK_REALTIME};
 
-use crate::hash::Hash;
+use crate::io;
 use crate::sys::pal::time::Timespec;
 use crate::time::Duration;
 
+fn clock_gettime(clock: hermit_abi::clockid_t) -> Timespec {
+    let mut t = hermit_abi::timespec { tv_sec: 0, tv_nsec: 0 };
+    let _ = unsafe { hermit_abi::clock_gettime(clock, &raw mut t) };
+    Timespec::new(t.tv_sec, t.tv_nsec.into()).unwrap()
+}
+
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
 pub struct Instant(Timespec);
 
 impl Instant {
     pub fn now() -> Instant {
-        let mut time: Timespec = Timespec::zero();
-        let _ = unsafe { hermit_abi::clock_gettime(CLOCK_MONOTONIC, &raw mut time.t) };
-
-        Instant(time)
+        Instant(clock_gettime(CLOCK_MONOTONIC))
     }
 
     pub fn checked_sub_instant(&self, other: &Instant) -> Option<Duration> {
@@ -38,15 +41,12 @@ impl SystemTime {
 
     pub const MIN: SystemTime = SystemTime(Timespec::MIN);
 
-    pub fn new(tv_sec: i64, tv_nsec: i32) -> SystemTime {
-        SystemTime(Timespec::new(tv_sec, tv_nsec))
+    pub fn new(tv_sec: i64, tv_nsec: i64) -> Result<SystemTime, io::Error> {
+        Ok(SystemTime(Timespec::new(tv_sec, tv_nsec)?))
     }
 
     pub fn now() -> SystemTime {
-        let mut time: Timespec = Timespec::zero();
-        let _ = unsafe { hermit_abi::clock_gettime(CLOCK_REALTIME, &raw mut time.t) };
-
-        SystemTime(time)
+        SystemTime(clock_gettime(CLOCK_REALTIME))
     }
 
     pub fn sub_time(&self, other: &SystemTime) -> Result<Duration, Duration> {