(lib/sleep_until) use target_vendor apple + fix windows removeal + add

more unix platforms

target_vendor's done by:
Co-authored-by: Jonas Böttiger <jonasboettiger@icloud.com>

Author: 2 people

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

@@ -310,10 +310,10 @@ impl Thread {
         target_os = "android",
         target_os = "solaris",
         target_os = "illumos",
-        target_os = "macos",
-        target_os = "ios",
-        target_os = "tvos",
-        target_os = "watchos"
+        target_os = "dragonfly",
+        target_os = "hurd",
+        target_os = "fuchsia",
+        target_vendor = "apple"
     )))]
     pub fn sleep_until(deadline: Instant) {
         let now = Instant::now();
@@ -323,14 +323,17 @@ impl Thread {
         }
     }
 
-    // Note depends on clock_nanosleep (not supported on macos/ios/watchos/tvos)
+    // Note depends on clock_nanosleep (not supported on os's by apple)
     #[cfg(any(
         target_os = "freebsd",
         target_os = "netbsd",
         target_os = "linux",
         target_os = "android",
         target_os = "solaris",
         target_os = "illumos",
+        target_os = "dragonfly",
+        target_os = "hurd",
+        target_os = "fuchsia",
     ))]
     pub fn sleep_until(deadline: crate::time::Instant) {
         let mut ts = deadline
@@ -355,13 +358,7 @@ impl Thread {
         }
     }
 
-    #[cfg(any(
-        target_os = "macos",
-        target_os = "ios",
-        target_os = "tvos",
-        target_os = "watchos",
-        target_os = "visionos"
-    ))]
+    #[cfg(target_vendor = "apple")]
     pub fn sleep_until(deadline: crate::time::Instant) {
         use core::mem::MaybeUninit;
 
@@ -398,35 +395,17 @@ impl Thread {
     }
 }
 
-#[cfg(any(
-    target_os = "macos",
-    target_os = "ios",
-    target_os = "tvos",
-    target_os = "watchos",
-    target_os = "visionos"
-))]
+#[cfg(target_vendor = "apple")]
 const KERN_SUCCESS: libc::c_int = 0;
 
-#[cfg(any(
-    target_os = "macos",
-    target_os = "ios",
-    target_os = "tvos",
-    target_os = "watchos",
-    target_os = "visionos"
-))]
+#[cfg(target_vendor = "apple")]
 #[repr(C)]
 struct mach_timebase_info_type {
     numer: u32,
     denom: u32,
 }
 
-#[cfg(any(
-    target_os = "macos",
-    target_os = "ios",
-    target_os = "tvos",
-    target_os = "watchos",
-    target_os = "visionos"
-))]
+#[cfg(target_vendor = "apple")]
 extern "C" {
     fn mach_wait_until(deadline: u64) -> libc::c_int;
     fn mach_timebase_info(info: *mut mach_timebase_info_type) -> libc::c_int;

library/std/src/sys/pal/windows/thread.rs

@@ -19,7 +19,7 @@ use crate::os::windows::io::{AsRawHandle, HandleOrNull};
 use crate::sys::handle::Handle;
 use crate::sys::{c, stack_overflow};
 use crate::sys_common::FromInner;
-use crate::time::Duration;
+use crate::time::{Duration, Instant};
 use crate::{io, ptr};
 
 pub const DEFAULT_MIN_STACK_SIZE: usize = 2 * 1024 * 1024;
@@ -120,7 +120,7 @@ impl Thread {
         let now = Instant::now();
 
         if let Some(delay) = deadline.checked_duration_since(now) {
-            sleep(delay);
+            Self::sleep(delay);
         }
     }
 

library/std/src/thread/mod.rs

@@ -891,6 +891,9 @@ pub fn sleep(dur: Duration) {
 /// | Android   | [clock_nanosleep] (Monotonic Clock)]                                 |
 /// | Solaris   | [clock_nanosleep] (Monotonic Clock)]                                 |
 /// | Illumos   | [clock_nanosleep] (Monotonic Clock)]                                 |
+/// | Dragonfly | [clock_nanosleep] (Monotonic Clock)]                                 |
+/// | Hurd      | [clock_nanosleep] (Monotonic Clock)]                                 |
+/// | Fuchsia   | [clock_nanosleep] (Monotonic Clock)]                                 |
 /// | Darwin    | [mach_wait_until]                                                    |
 /// | WASI      | [subscription_clock]                                                 |
 /// | Other     | `sleep_until` uses [`sleep`] and does not issue a syscall itself     |