diff options
| author | Jacob Pratt <jacob@jhpratt.dev> | 2024-07-04 04:09:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-04 04:09:49 -0400 |
| commit | 5712539a627ef2f8bf3ce8889940b3ba4dc55e6f (patch) | |
| tree | 9b527a7792cfed245c8b08fc363b0b7a922b3a59 /library/std/src/sys | |
| parent | 6cf34c0cfdaa85a207a9639f0c42e0433f16a3b0 (diff) | |
| parent | a6c03ae6fe3dd93146be3a1f7fd65ccd58e3ab67 (diff) | |
| download | rust-5712539a627ef2f8bf3ce8889940b3ba4dc55e6f.tar.gz rust-5712539a627ef2f8bf3ce8889940b3ba4dc55e6f.zip | |
Rollup merge of #127195 - biabbas:vxworks_cleanup, r=jhpratt
Remove unqualified form import of io::Error in process_vxworks.rs and fallback on remove_dir_impl for vxworks Hi all, This is to address issue #127084. On inspections it was found that io::Error refrences were all of qualified form and there was no need to add a unqualified form import. Also to successfully build rust for vxworks, we need to fallback on the remove_impl_dir implementations. Thank you.
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/pal/unix/fs.rs | 4 | ||||
| -rw-r--r-- | library/std/src/sys/pal/unix/process/process_vxworks.rs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/library/std/src/sys/pal/unix/fs.rs b/library/std/src/sys/pal/unix/fs.rs index 92c76ec4303..f9d6b5fbc86 100644 --- a/library/std/src/sys/pal/unix/fs.rs +++ b/library/std/src/sys/pal/unix/fs.rs @@ -1976,13 +1976,14 @@ pub fn chroot(dir: &Path) -> io::Result<()> { pub use remove_dir_impl::remove_dir_all; -// Fallback for REDOX, ESP-ID, Horizon, Vita and Miri +// Fallback for REDOX, ESP-ID, Horizon, Vita, Vxworks and Miri #[cfg(any( target_os = "redox", target_os = "espidf", target_os = "horizon", target_os = "vita", target_os = "nto", + target_os = "vxworks", miri ))] mod remove_dir_impl { @@ -1996,6 +1997,7 @@ mod remove_dir_impl { target_os = "horizon", target_os = "vita", target_os = "nto", + target_os = "vxworks", miri )))] mod remove_dir_impl { diff --git a/library/std/src/sys/pal/unix/process/process_vxworks.rs b/library/std/src/sys/pal/unix/process/process_vxworks.rs index 76179e0910d..5007dbd34b4 100644 --- a/library/std/src/sys/pal/unix/process/process_vxworks.rs +++ b/library/std/src/sys/pal/unix/process/process_vxworks.rs @@ -1,5 +1,5 @@ use crate::fmt; -use crate::io::{self, Error, ErrorKind}; +use crate::io::{self, ErrorKind}; use crate::num::NonZero; use crate::sys; use crate::sys::cvt; |