bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #131646 - RalfJung:unix-miri-fallbacks, r=joboet

Browse source 
sys/unix: add comments for some Miri fallbacks
This commit is contained in:
Matthias Krüger 2024-10-13 18:27:21 +02:00 • committed by GitHub
commit b9651d00d4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/std/src/sys/pal/unix/fs.rs
View file

@ -899,7 +899,7 @@ impl DirEntry {
target_os = "android", target_os = "android",
target_os = "hurd" target_os = "hurd"
), ),
not(miri) not(miri) // no dirfd on Miri
))] ))]
pub fn metadata(&self) -> io::Result<FileAttr> { pub fn metadata(&self) -> io::Result<FileAttr> {
let fd = cvt(unsafe { dirfd(self.dir.dirp.0) })?; let fd = cvt(unsafe { dirfd(self.dir.dirp.0) })?;

1
library/std/src/sys/sync/thread_parking/mod.rs
View file

@ -23,6 +23,7 @@ cfg_if::cfg_if! {
mod windows7; mod windows7;
pub use windows7::Parker; pub use windows7::Parker;
} else if #[cfg(all(target_vendor = "apple", not(miri)))] { } 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; mod darwin;
pub use darwin::Parker; pub use darwin::Parker;
} else if #[cfg(target_os = "xous")] { } else if #[cfg(target_os = "xous")] {