Skip to content

Remove unqualified form import of io::Error in process_vxworks.rs and fallback on remove_dir_impl for vxworks #127195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 4, 2024
Merged

Remove unqualified form import of io::Error in process_vxworks.rs and fallback on remove_dir_impl for vxworks #127195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9732251
Remove unqualified import io:: Error for vxworks as all Error referen…
Jul 1, 2024
a6c03ae
Fall back on remove dir implementation for vxworks
Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion library/std/src/sys/pal/unix/fs.rs
View file
Open in desktop
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 library/std/src/sys/pal/unix/process/process_vxworks.rs
View file
Open in desktop
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