Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 56c73c3

Browse files
authoredJul 4, 2024
Rollup merge of rust-lang#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 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.
2 parents 5dfdef7 + 2a81053 commit 56c73c3

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed
 

‎std/src/sys/pal/unix/fs.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1976,13 +1976,14 @@ pub fn chroot(dir: &Path) -> io::Result<()> {
19761976

19771977
pub use remove_dir_impl::remove_dir_all;
19781978

1979-
// Fallback for REDOX, ESP-ID, Horizon, Vita and Miri
1979+
// Fallback for REDOX, ESP-ID, Horizon, Vita, Vxworks and Miri
19801980
#[cfg(any(
19811981
target_os = "redox",
19821982
target_os = "espidf",
19831983
target_os = "horizon",
19841984
target_os = "vita",
19851985
target_os = "nto",
1986+
target_os = "vxworks",
19861987
miri
19871988
))]
19881989
mod remove_dir_impl {
@@ -1996,6 +1997,7 @@ mod remove_dir_impl {
19961997
target_os = "horizon",
19971998
target_os = "vita",
19981999
target_os = "nto",
2000+
target_os = "vxworks",
19992001
miri
20002002
)))]
20012003
mod remove_dir_impl {

‎std/src/sys/pal/unix/process/process_vxworks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::fmt;
2-
use crate::io::{self, Error, ErrorKind};
2+
use crate::io::{self, ErrorKind};
33
use crate::num::NonZero;
44
use crate::sys;
55
use crate::sys::cvt;

0 commit comments

Comments
 (0)
Failed to load comments.