diff options
| author | bors <bors@rust-lang.org> | 2022-11-20 12:57:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-20 12:57:48 +0000 |
| commit | 911cbf8e46f0f3b044c87fc5cbca922878db757b (patch) | |
| tree | caf694c41a68b061249617e457bed1600dda075c /library/std/src | |
| parent | 9cdfe03b0601d5328406746a7923a8a4eaa0cf3c (diff) | |
| parent | c043a0e7d6f347f9b2c7f08c5b3a179470e0f0c5 (diff) | |
| download | rust-911cbf8e46f0f3b044c87fc5cbca922878db757b.tar.gz rust-911cbf8e46f0f3b044c87fc5cbca922878db757b.zip | |
Auto merge of #104617 - RalfJung:miri, r=RalfJung
update Miri r? `@thomcc` for the lib changes (removing a `cfg(miri)` that is no longer needed)
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/sys/unix/time.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/sys/unix/time.rs b/library/std/src/sys/unix/time.rs index ffcc507d2a7..d5abd9b581c 100644 --- a/library/std/src/sys/unix/time.rs +++ b/library/std/src/sys/unix/time.rs @@ -150,7 +150,7 @@ impl From<libc::timespec> for Timespec { } #[cfg(any( - all(target_os = "macos", any(not(target_arch = "aarch64"), miri)), + all(target_os = "macos", any(not(target_arch = "aarch64"))), target_os = "ios", target_os = "watchos" ))] @@ -270,7 +270,7 @@ mod inner { } #[cfg(not(any( - all(target_os = "macos", any(not(target_arch = "aarch64"), miri)), + all(target_os = "macos", any(not(target_arch = "aarch64"))), target_os = "ios", target_os = "watchos" )))] |