Auto merge of #136929 - joboet:move_process_pal, r=Mark-Simulacrum · rust-lang/rust@aa8f0fd (original) (raw)
1
1
`use r_efi::protocols::simple_text_output;
`
2
2
``
3
``
`-
use super::helpers;
`
4
3
`use crate::collections::BTreeMap;
`
5
4
`pub use crate::ffi::OsString as EnvKey;
`
6
5
`use crate::ffi::{OsStr, OsString};
`
7
6
`use crate::num::{NonZero, NonZeroI32};
`
8
7
`use crate::path::Path;
`
9
8
`use crate::sys::fs::File;
`
``
9
`+
use crate::sys::pal::helpers;
`
``
10
`+
use crate::sys::pal::os::error_string;
`
10
11
`use crate::sys::pipe::AnonPipe;
`
11
12
`use crate::sys::unsupported;
`
12
13
`use crate::sys_common::process::{CommandEnv, CommandEnvs};
`
`@@ -225,7 +226,7 @@ impl ExitStatus {
`
225
226
``
226
227
`impl fmt::Display for ExitStatus {
`
227
228
`fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
`
228
``
`-
let err_str = super::os::error_string(self.0.as_usize());
`
``
229
`+
let err_str = error_string(self.0.as_usize());
`
229
230
`write!(f, "{}", err_str)
`
230
231
`}
`
231
232
`}
`
`@@ -241,7 +242,7 @@ pub struct ExitStatusError(r_efi::efi::Status);
`
241
242
``
242
243
`impl fmt::Debug for ExitStatusError {
`
243
244
`fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
`
244
``
`-
let err_str = super::os::error_string(self.0.as_usize());
`
``
245
`+
let err_str = error_string(self.0.as_usize());
`
245
246
`write!(f, "{}", err_str)
`
246
247
`}
`
247
248
`}
`
`@@ -335,15 +336,14 @@ impl<'a> fmt::Debug for CommandArgs<'a> {
`
335
336
`mod uefi_command_internal {
`
336
337
`use r_efi::protocols::{loaded_image, simple_text_output};
`
337
338
``
338
``
`-
use super::super::helpers;
`
339
339
`use crate::ffi::{OsStr, OsString};
`
340
340
`use crate::io::{self, const_error};
`
341
341
`use crate::mem::MaybeUninit;
`
342
342
`use crate::os::uefi::env::{boot_services, image_handle, system_table};
`
343
343
`use crate::os::uefi::ffi::{OsStrExt, OsStringExt};
`
344
344
`use crate::ptr::NonNull;
`
345
345
`use crate::slice;
`
346
``
`-
use crate::sys::pal::uefi::helpers::OwnedTable;
`
``
346
`+
use crate::sys::pal::helpers::{self, OwnedTable};
`
347
347
`use crate::sys_common::wstr::WStrUnits;
`
348
348
``
349
349
`pub struct Image {
`