diff options
| author | bors <bors@rust-lang.org> | 2024-01-13 22:05:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-13 22:05:46 +0000 |
| commit | 3deb9bbf84f6431ebcbb7cbdbe3d89bc2636bc1b (patch) | |
| tree | a8e4fa55ce4186137a2ffb2ddcf816ae5ed91e99 /library/std/src/sys | |
| parent | d78329b92e8d141d19505e7c1527181c4ab87ed4 (diff) | |
| parent | 847aad75ad7c3a5691a5f45fcf371cc729dbfd77 (diff) | |
Auto merge of #119945 - matthiaskrgr:rollup-oy3e1j2, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #119189 (Move section "Installing from Source" to seperate file) - #119925 (store the segment name when resolution fails) - #119935 (Move personality implementation out of PAL) - #119937 (Improve UEFI target docs) - #119938 (Allow unauthorized users to user the has-merge-commits label) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/mod.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/pal/mod.rs | 1 | ||||
| -rw-r--r-- | library/std/src/sys/personality/dwarf/eh.rs (renamed from library/std/src/sys/pal/personality/dwarf/eh.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/personality/dwarf/mod.rs (renamed from library/std/src/sys/pal/personality/dwarf/mod.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/personality/dwarf/tests.rs (renamed from library/std/src/sys/pal/personality/dwarf/tests.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/personality/emcc.rs (renamed from library/std/src/sys/pal/personality/emcc.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/personality/gcc.rs (renamed from library/std/src/sys/pal/personality/gcc.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/personality/mod.rs (renamed from library/std/src/sys/pal/personality/mod.rs) | 0 |
8 files changed, 2 insertions, 1 deletions
diff --git a/library/std/src/sys/mod.rs b/library/std/src/sys/mod.rs index 0cd4528b69e..bbdcb32606c 100644 --- a/library/std/src/sys/mod.rs +++ b/library/std/src/sys/mod.rs @@ -3,6 +3,8 @@ /// descriptors. mod pal; +mod personality; + // FIXME(117276): remove this, move feature implementations into individual // submodules. pub use pal::*; diff --git a/library/std/src/sys/pal/mod.rs b/library/std/src/sys/pal/mod.rs index 88420bd3612..66b2a4b8885 100644 --- a/library/std/src/sys/pal/mod.rs +++ b/library/std/src/sys/pal/mod.rs @@ -23,7 +23,6 @@ #![allow(missing_debug_implementations)] pub mod common; -mod personality; cfg_if::cfg_if! { if #[cfg(unix)] { diff --git a/library/std/src/sys/pal/personality/dwarf/eh.rs b/library/std/src/sys/personality/dwarf/eh.rs index a78084de0fa..a78084de0fa 100644 --- a/library/std/src/sys/pal/personality/dwarf/eh.rs +++ b/library/std/src/sys/personality/dwarf/eh.rs diff --git a/library/std/src/sys/pal/personality/dwarf/mod.rs b/library/std/src/sys/personality/dwarf/mod.rs index 652fbe95a14..652fbe95a14 100644 --- a/library/std/src/sys/pal/personality/dwarf/mod.rs +++ b/library/std/src/sys/personality/dwarf/mod.rs diff --git a/library/std/src/sys/pal/personality/dwarf/tests.rs b/library/std/src/sys/personality/dwarf/tests.rs index 1644f37083a..1644f37083a 100644 --- a/library/std/src/sys/pal/personality/dwarf/tests.rs +++ b/library/std/src/sys/personality/dwarf/tests.rs diff --git a/library/std/src/sys/pal/personality/emcc.rs b/library/std/src/sys/personality/emcc.rs index cb52ae89b19..cb52ae89b19 100644 --- a/library/std/src/sys/pal/personality/emcc.rs +++ b/library/std/src/sys/personality/emcc.rs diff --git a/library/std/src/sys/pal/personality/gcc.rs b/library/std/src/sys/personality/gcc.rs index 6f317131145..6f317131145 100644 --- a/library/std/src/sys/pal/personality/gcc.rs +++ b/library/std/src/sys/personality/gcc.rs diff --git a/library/std/src/sys/pal/personality/mod.rs b/library/std/src/sys/personality/mod.rs index d37b8ce6346..d37b8ce6346 100644 --- a/library/std/src/sys/pal/personality/mod.rs +++ b/library/std/src/sys/personality/mod.rs |
