diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-10-13 18:27:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-13 18:27:21 +0200 |
| commit | b9651d00d4d4ca8e4321c6ae26a68151dc4addb0 (patch) | |
| tree | 188a1e8585af102f5a8dbfea65ed341f859ba09d /library/std/src | |
| parent | 9c5b4460dd5ba582c50dc567989b1cbb8f493349 (diff) | |
| parent | a87f5ca917b5c3c10163601da74df2045ee8e6ea (diff) | |
| download | rust-b9651d00d4d4ca8e4321c6ae26a68151dc4addb0.tar.gz rust-b9651d00d4d4ca8e4321c6ae26a68151dc4addb0.zip | |
Rollup merge of #131646 - RalfJung:unix-miri-fallbacks, r=joboet
sys/unix: add comments for some Miri fallbacks
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/sys/pal/unix/fs.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/sync/thread_parking/mod.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/library/std/src/sys/pal/unix/fs.rs b/library/std/src/sys/pal/unix/fs.rs index 39aabf0b2d6..e80299f1868 100644 --- a/library/std/src/sys/pal/unix/fs.rs +++ b/library/std/src/sys/pal/unix/fs.rs @@ -899,7 +899,7 @@ impl DirEntry { target_os = "android", target_os = "hurd" ), - not(miri) + not(miri) // no dirfd on Miri ))] pub fn metadata(&self) -> io::Result<FileAttr> { let fd = cvt(unsafe { dirfd(self.dir.dirp.0) })?; diff --git a/library/std/src/sys/sync/thread_parking/mod.rs b/library/std/src/sys/sync/thread_parking/mod.rs index 0ebc5e093ee..f4d8fa0a58c 100644 --- a/library/std/src/sys/sync/thread_parking/mod.rs +++ b/library/std/src/sys/sync/thread_parking/mod.rs @@ -23,6 +23,7 @@ cfg_if::cfg_if! { mod windows7; pub use windows7::Parker; } else if #[cfg(all(target_vendor = "apple", not(miri)))] { + // Doesn't work in Miri, see <https://github.com/rust-lang/miri/issues/2589>. mod darwin; pub use darwin::Parker; } else if #[cfg(target_os = "xous")] { |