diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-03-20 09:14:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-20 09:14:58 +0100 |
| commit | acb7ed141be1ea5b4c7120708d7a48d9155fb38c (patch) | |
| tree | 6fcea6593d78e2d5609648d3e9e3a03a343c727b /library/std/src/sys | |
| parent | 499d4a56840e3760905fbda95550553281828dc6 (diff) | |
| parent | 28eb06bd98169c985f4951b6aaf6855d52ffd514 (diff) | |
| download | rust-acb7ed141be1ea5b4c7120708d7a48d9155fb38c.tar.gz rust-acb7ed141be1ea5b4c7120708d7a48d9155fb38c.zip | |
Rollup merge of #94749 - RalfJung:remove-dir-all-miri, r=cuviper
remove_dir_all: use fallback implementation on Miri Fixes https://github.com/rust-lang/miri/issues/1966 The new implementation requires `openat`, `unlinkat`, and `fdopendir`. These cannot easily be shimmed in Miri since libstd does not expose APIs corresponding to them. So for now it is probably easiest to just use the fallback code in Miri. Nobody should run Miri as root anyway...
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/unix/fs.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/std/src/sys/unix/fs.rs b/library/std/src/sys/unix/fs.rs index a3e6b081936..b93a3d67771 100644 --- a/library/std/src/sys/unix/fs.rs +++ b/library/std/src/sys/unix/fs.rs @@ -1517,14 +1517,14 @@ pub fn chroot(dir: &Path) -> io::Result<()> { pub use remove_dir_impl::remove_dir_all; -// Fallback for REDOX and ESP-IDF -#[cfg(any(target_os = "redox", target_os = "espidf"))] +// Fallback for REDOX and ESP-IDF (and Miri) +#[cfg(any(target_os = "redox", target_os = "espidf", miri))] mod remove_dir_impl { pub use crate::sys_common::fs::remove_dir_all; } // Modern implementation using openat(), unlinkat() and fdopendir() -#[cfg(not(any(target_os = "redox", target_os = "espidf")))] +#[cfg(not(any(target_os = "redox", target_os = "espidf", miri)))] mod remove_dir_impl { use super::{cstr, lstat, Dir, DirEntry, InnerReadDir, ReadDir}; use crate::ffi::CStr; |