Skip to content

Commit 5188225

Browse files
committed
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)
2 parents b658e77 + 7aef6c0 commit 5188225

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

std/src/sys/unix/time.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ impl From<libc::timespec> for Timespec {
150150
}
151151

152152
#[cfg(any(
153-
all(target_os = "macos", any(not(target_arch = "aarch64"), miri)),
153+
all(target_os = "macos", any(not(target_arch = "aarch64"))),
154154
target_os = "ios",
155155
target_os = "watchos"
156156
))]
@@ -270,7 +270,7 @@ mod inner {
270270
}
271271

272272
#[cfg(not(any(
273-
all(target_os = "macos", any(not(target_arch = "aarch64"), miri)),
273+
all(target_os = "macos", any(not(target_arch = "aarch64"))),
274274
target_os = "ios",
275275
target_os = "watchos"
276276
)))]

0 commit comments

Comments
 (0)