From c3051b1f5a6fa308cab85f37be446e7946e1f22e Mon Sep 17 00:00:00 2001
From: 王宇逸 <Strawberry_Str@hotmail.com>
Date: Fri, 7 Mar 2025 15:59:49 +0800
Subject: Unify cygwin & horizon random impl

---
 library/std/src/sys/random/cygwin.rs    |  8 --------
 library/std/src/sys/random/getrandom.rs |  7 +++++++
 library/std/src/sys/random/horizon.rs   |  7 -------
 library/std/src/sys/random/mod.rs       | 11 ++++-------
 4 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 library/std/src/sys/random/cygwin.rs
 create mode 100644 library/std/src/sys/random/getrandom.rs
 delete mode 100644 library/std/src/sys/random/horizon.rs

(limited to 'library/std/src/sys/random')

diff --git a/library/std/src/sys/random/cygwin.rs b/library/std/src/sys/random/cygwin.rs
deleted file mode 100644
index e6759c8a3ed..00000000000
--- a/library/std/src/sys/random/cygwin.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-pub fn fill_bytes(mut bytes: &mut [u8]) {
-    while !bytes.is_empty() {
-        let ret =
-            unsafe { libc::getrandom(bytes.as_mut_ptr().cast(), bytes.len(), libc::GRND_NONBLOCK) };
-        assert!(ret != -1, "failed to generate random data");
-        bytes = &mut bytes[ret as usize..];
-    }
-}
diff --git a/library/std/src/sys/random/getrandom.rs b/library/std/src/sys/random/getrandom.rs
new file mode 100644
index 00000000000..0be2eae20a7
--- /dev/null
+++ b/library/std/src/sys/random/getrandom.rs
@@ -0,0 +1,7 @@
+pub fn fill_bytes(mut bytes: &mut [u8]) {
+    while !bytes.is_empty() {
+        let r = unsafe { libc::getrandom(bytes.as_mut_ptr().cast(), bytes.len(), 0) };
+        assert_ne!(r, -1, "failed to generate random data");
+        bytes = &mut bytes[r as usize..];
+    }
+}
diff --git a/library/std/src/sys/random/horizon.rs b/library/std/src/sys/random/horizon.rs
deleted file mode 100644
index 0be2eae20a7..00000000000
--- a/library/std/src/sys/random/horizon.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub fn fill_bytes(mut bytes: &mut [u8]) {
-    while !bytes.is_empty() {
-        let r = unsafe { libc::getrandom(bytes.as_mut_ptr().cast(), bytes.len(), 0) };
-        assert_ne!(r, -1, "failed to generate random data");
-        bytes = &mut bytes[r as usize..];
-    }
-}
diff --git a/library/std/src/sys/random/mod.rs b/library/std/src/sys/random/mod.rs
index 2e5765b8a42..7f598c9e5cc 100644
--- a/library/std/src/sys/random/mod.rs
+++ b/library/std/src/sys/random/mod.rs
@@ -6,9 +6,6 @@ cfg_if::cfg_if! {
     } else if #[cfg(target_os = "windows")] {
         mod windows;
         pub use windows::fill_bytes;
-    } else if #[cfg(target_os = "cygwin")] {
-        mod cygwin;
-        pub use cygwin::fill_bytes;
     } else if #[cfg(target_vendor = "apple")] {
         mod apple;
         pub use apple::fill_bytes;
@@ -38,10 +35,10 @@ cfg_if::cfg_if! {
     } else if #[cfg(target_os = "hermit")] {
         mod hermit;
         pub use hermit::fill_bytes;
-    } else if #[cfg(target_os = "horizon")] {
-        // FIXME: add arc4random_buf to shim-3ds
-        mod horizon;
-        pub use horizon::fill_bytes;
+    } else if #[cfg(any(target_os = "horizon", target_os = "cygwin"))] {
+        // FIXME(horizon): add arc4random_buf to shim-3ds
+        mod getrandom;
+        pub use getrandom::fill_bytes;
     } else if #[cfg(any(
         target_os = "aix",
         target_os = "hurd",
-- 
cgit 1.4.1-3-g733a5