Use unix implementation of Instant for macos aarch64

Author: lyinch

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

@@ -114,7 +114,7 @@ impl Hash for Timespec {
     }
 }
 
-#[cfg(any(target_os = "macos", target_os = "ios"))]
+#[cfg(any(all(target_os = "macos", not(target_arch = "aarch64")), target_os = "ios"))]
 mod inner {
     use crate::fmt;
     use crate::sync::atomic::{AtomicU64, Ordering};
@@ -146,14 +146,12 @@ mod inner {
     type mach_timebase_info_t = *mut mach_timebase_info;
     type kern_return_t = libc::c_int;
 
-    pub type clockid_t = libc::clockid_t;
-
     impl Instant {
         pub fn now() -> Instant {
             extern "C" {
-                fn clock_gettime_nsec_np(clock_id: clockid_t) -> u64;
+                fn mach_absolute_time() -> u64;
             }
-            Instant { t: unsafe { clock_gettime_nsec_np(8) } }
+            Instant { t: unsafe { mach_absolute_time() } }
         }
 
         pub fn checked_sub_instant(&self, other: &Instant) -> Option<Duration> {
@@ -265,7 +263,7 @@ mod inner {
     }
 }
 
-#[cfg(not(any(target_os = "macos", target_os = "ios")))]
+#[cfg(not(any(all(target_os = "macos", not(target_arch = "aarch64")), target_os = "ios")))]
 mod inner {
     use crate::fmt;
     use crate::sys::cvt;
@@ -287,7 +285,11 @@ mod inner {
 
     impl Instant {
         pub fn now() -> Instant {
-            Instant { t: now(libc::CLOCK_MONOTONIC) }
+            #[cfg(target_os = "macos")]
+            const clock_id: clock_t = 8;
+            #[cfg(not(target_os = "macos"))]
+            const clock_id: clock_t  = libc::CLOCK_MONOTONIC;
+            Instant { t: now(clock_id) }
         }
 
         pub fn checked_sub_instant(&self, other: &Instant) -> Option<Duration> {
@@ -345,10 +347,12 @@ mod inner {
         }
     }
 
-    #[cfg(not(any(target_os = "dragonfly", target_os = "espidf")))]
+    #[cfg(not(any(target_os = "dragonfly", target_os = "espidf", target_os = "macos")))]
     pub type clock_t = libc::c_int;
     #[cfg(any(target_os = "dragonfly", target_os = "espidf"))]
     pub type clock_t = libc::c_ulong;
+    #[cfg(target_os = "macos")]
+    pub type clock_t = libc::clockid_t;
 
     fn now(clock: clock_t) -> Timespec {
         let mut t = Timespec { t: libc::timespec { tv_sec: 0, tv_nsec: 0 } };

library/std/src/time/tests.rs

@@ -18,7 +18,6 @@ fn macos_resolution_regression() {
     let t0 = Instant::now();
     let t1 = t0 + Duration::from_nanos(50);
     let d = t1 - t0;
-    dbg!(t0, t1, d);
     assert_eq!(t0 + d, t1);
 }