diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-05-14 22:00:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-14 22:00:19 +0200 |
| commit | 020111adfcb1e2e40aab64987cb3f76618ae4e42 (patch) | |
| tree | 23aaa763fbed95a2fec554face370e6f02b37050 /src/libstd | |
| parent | 3b4234a175347a6d9d555ac0ee56212b1296c8b7 (diff) | |
| parent | 43207cada264796fe9307ded77e63751c1e0646a (diff) | |
| download | rust-020111adfcb1e2e40aab64987cb3f76618ae4e42.tar.gz rust-020111adfcb1e2e40aab64987cb3f76618ae4e42.zip | |
Rollup merge of #60780 - RalfJung:miri, r=oli-obk
fix Miri This reverts https://github.com/rust-lang/rust/pull/60156, which turned out to be a dead end (see https://github.com/rust-lang/rust/pull/60469). r? @oli-obk
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/unix/rand.rs | 5 |
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; |
