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
This commit is contained in:
commit
020111adfc
2 changed files with 2 additions and 5 deletions
|
@ -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;
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 053aa694990a212ad8942dd72101ede23597c0e9
|
||||
Subproject commit bc0c76d861a178911f3f506196a7404eda1e690d
|
Loading…
Reference in a new issue