File tree Expand file tree Collapse file tree 4 files changed +8
-6
lines changed
Expand file tree Collapse file tree 4 files changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -139,7 +139,7 @@ enum ErrorData<C> {
139139///
140140/// [`into`]: Into::into
141141#[ unstable( feature = "raw_os_error_ty" , issue = "107792" ) ]
142- pub type RawOsError = sys:: RawOsError ;
142+ pub type RawOsError = sys:: io :: RawOsError ;
143143
144144// `#[repr(align(4))]` is probably redundant, it should have that value or
145145// higher already. We include it just because repr_bitpacked.rs's encoding
Original file line number Diff line number Diff line change @@ -55,3 +55,8 @@ pub use kernel_copy::{CopyState, kernel_copy};
5555// Bare metal platforms usually have very small amounts of RAM
5656// (in the order of hundreds of KB)
5757pub const DEFAULT_BUF_SIZE : usize = if cfg ! ( target_os = "espidf" ) { 512 } else { 8 * 1024 } ;
58+
59+ pub type RawOsError = cfg_select ! {
60+ target_os = "uefi" => usize ,
61+ _ => i32 ,
62+ } ;
Original file line number Diff line number Diff line change @@ -92,6 +92,3 @@ pub const FULL_BACKTRACE_DEFAULT: bool = cfg_select! {
9292 target_os = "fuchsia" => true ,
9393 _ => false ,
9494} ;
95-
96- #[ cfg( not( target_os = "uefi" ) ) ]
97- pub type RawOsError = i32 ;
Original file line number Diff line number Diff line change 1313//! [`OsString`]: crate::ffi::OsString
1414#![ forbid( unsafe_op_in_unsafe_fn) ]
1515
16+ use crate :: io:: RawOsError ;
17+
1618pub mod helpers;
1719pub mod os;
1820#[ path = "../unsupported/pipe.rs" ]
@@ -22,8 +24,6 @@ pub mod time;
2224#[ cfg( test) ]
2325mod tests;
2426
25- pub type RawOsError = usize ;
26-
2727use crate :: io as std_io;
2828use crate :: os:: uefi;
2929use crate :: ptr:: NonNull ;
You can’t perform that action at this time.
0 commit comments