Skip to content

Commit

Permalink
Unrolled build for rust-lang#119935
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#119935 - joboet:move_pal_personality, r=ChrisDenton

Move personality implementation out of PAL

The module already follows the new convention described in rust-lang#117276. This PR also includes a small fix in the tidy pal check, that was just an oversight in rust-lang#117285.
  • Loading branch information
rust-timer authored Jan 14, 2024
2 parents d78329b + b8d996c commit 7c81f0c
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 3 deletions.
2 changes: 2 additions & 0 deletions library/std/src/sys/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
/// descriptors.
mod pal;

mod personality;

// FIXME(117276): remove this, move feature implementations into individual
// submodules.
pub use pal::*;
1 change: 0 additions & 1 deletion library/std/src/sys/pal/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#![allow(missing_debug_implementations)]

pub mod common;
mod personality;

cfg_if::cfg_if! {
if #[cfg(unix)] {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions src/tools/tidy/src/pal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ const EXCEPTION_PATHS: &[&str] = &[
// we must use `#[cfg(windows)]` to conditionally compile the
// correct `VaList` structure for windows.
"library/core/src/ffi/mod.rs",
"library/std/src/sys/pal/", // Platform-specific code for std lives here.
"library/std/src/os", // Platform-specific public interfaces
"library/std/src/sys", // Platform-specific code for std lives here.
"library/std/src/os", // Platform-specific public interfaces
// Temporary `std` exceptions
// FIXME: platform-specific code should be moved to `sys`
"library/std/src/io/copy.rs",
Expand Down

0 comments on commit 7c81f0c

Please sign in to comment.