about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2019-05-13 11:34:11 +0200
committerRalf Jung <post@ralfj.de>2019-05-13 11:34:11 +0200
commit4cf2379f6176b704bb8648107beee9c896d1b133 (patch)
tree292a759897a9a88eab460d9cbe28f8eec9b7e32d /src/libstd/sys
parentfe5f42cdb88d8ce31f746130099321e7c95e1ef0 (diff)
downloadrust-4cf2379f6176b704bb8648107beee9c896d1b133.tar.gz
rust-4cf2379f6176b704bb8648107beee9c896d1b133.zip
Revert "use SecRandomCopyBytes on macOS in Miri"
This reverts commit 54aefc6a2d076b74921a8d78c5d8c68c13bfa4a7.
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/unix/rand.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libstd/sys/unix/rand.rs b/src/libstd/sys/unix/rand.rs
index e923b9aa29b..77f1439e17b 100644
--- a/src/libstd/sys/unix/rand.rs
+++ b/src/libstd/sys/unix/rand.rs
@@ -13,7 +13,6 @@ pub fn hashmap_random_keys() -> (u64, u64) {
 
 #[cfg(all(unix,
           not(target_os = "ios"),
-          not(all(target_os = "macos", miri)),
           not(target_os = "openbsd"),
           not(target_os = "freebsd"),
           not(target_os = "fuchsia")))]
@@ -107,9 +106,7 @@ mod imp {
 // once per thread in `hashmap_random_keys`. Therefore `SecRandomCopyBytes` is
 // only used on iOS where direct access to `/dev/urandom` is blocked by the
 // sandbox.
-// HACK: However, we do use this when running in Miri on macOS; intercepting this is much
-// easier than intercepting accesses to /dev/urandom.
-#[cfg(any(target_os = "ios", all(target_os = "macos", miri)))]
+#[cfg(target_os = "ios")]
 mod imp {
     use crate::io;
     use crate::ptr;