Skip to content

Commit

Permalink
Rollup merge of rust-lang#127195 - biabbas:vxworks_cleanup, r=jhpratt
Browse files Browse the repository at this point in the history
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 rust-lang#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.
  • Loading branch information
jhpratt authored Jul 4, 2024
2 parents 5dfdef7 + 2a81053 commit 56c73c3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion std/src/sys/pal/unix/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion std/src/sys/pal/unix/process/process_vxworks.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit 56c73c3

Please sign in to comment.