Skip to content

Commit 020111a

Browse files
authored
Rollup merge of #60780 - RalfJung:miri, r=oli-obk
fix Miri This reverts #60156, which turned out to be a dead end (see #60469). r? @oli-obk
2 parents 3b4234a + 43207ca commit 020111a

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

src/libstd/sys/unix/rand.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ pub fn hashmap_random_keys() -> (u64, u64) {
1313

1414
#[cfg(all(unix,
1515
not(target_os = "ios"),
16-
not(all(target_os = "macos", miri)),
1716
not(target_os = "openbsd"),
1817
not(target_os = "freebsd"),
1918
not(target_os = "fuchsia")))]
@@ -107,9 +106,7 @@ mod imp {
107106
// once per thread in `hashmap_random_keys`. Therefore `SecRandomCopyBytes` is
108107
// only used on iOS where direct access to `/dev/urandom` is blocked by the
109108
// sandbox.
110-
// HACK: However, we do use this when running in Miri on macOS; intercepting this is much
111-
// easier than intercepting accesses to /dev/urandom.
112-
#[cfg(any(target_os = "ios", all(target_os = "macos", miri)))]
109+
#[cfg(target_os = "ios")]
113110
mod imp {
114111
use crate::io;
115112
use crate::ptr;

0 commit comments

Comments
 (0)