Skip to content

Commit

Permalink
Rollup merge of #131646 - RalfJung:unix-miri-fallbacks, r=joboet
Browse files Browse the repository at this point in the history
sys/unix: add comments for some Miri fallbacks
  • Loading branch information
matthiaskrgr authored Oct 13, 2024
2 parents 9c5b446 + a87f5ca commit b9651d0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion library/std/src/sys/pal/unix/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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) })?;
Expand Down
1 change: 1 addition & 0 deletions library/std/src/sys/sync/thread_parking/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")] {
Expand Down

0 comments on commit b9651d0

Please sign in to comment.