Merge pull request #2024 from rust-osdev/revert-2007-push-qrstumutxspt
Some checks failed
Book / deploy (push) Failing after 0s
Developer Productivity / changes (push) Failing after 2s
QA / Spellcheck (push) Failing after 2s
QA / Lints (push) Failing after 2s
Release / release (push) Failing after 2s
Developer Productivity / Nix shell toolchain: `cargo xtask run` works (push) Failing after 0s
Rust / Integration Test (AArch64) (push) Has been cancelled
Rust / Integration Test (x86_64) (push) Has been cancelled
Rust / Integration Test (IA-32) (push) Has been cancelled
Rust / Integration Test (x86_64 Windows) (push) Has been cancelled
Rust / Unit + Doc Tests (push) Has been cancelled
Rust / Build (stable MSRV) (push) Has been cancelled
Rust / Build (uefi-raw MSRV) (push) Has been cancelled
Rust / Build (feature permutations) (push) Has been cancelled
Rust / Nightly (build, test, doc) (push) Has been cancelled
Rust / Unit + Doc Tests (Miri) (push) Has been cancelled
Rust / Build Standard Binary (nightly) (push) Has been cancelled
Rust / Test Coverage (push) Has been cancelled

Revert "Make memory maps repr(C)"
This commit is contained in:
Philipp Schuster 2026-08-25 04:04:57 +00:00 committed by GitHub
commit a830de7fcf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 0 additions and 6 deletions

View file

@ -5,7 +5,6 @@
the extended processor topology.
## Changed
- Made memory map types `#[repr(C)]`
- Added `char16!` const-compatible macro as convenient replacement for `Char16::try_from().unwrap()`
- `proto::debug::SystemContextARM` now contains the trailing `IFAR` field
mandated by the spec.

View file

@ -44,7 +44,6 @@ impl core::error::Error for MemoryMapError {}
/// Implementation of [`MemoryMap`] for the given buffer.
#[derive(Debug)]
#[repr(C)]
pub struct MemoryMapRef<'a> {
buf: &'a [u8],
meta: MemoryMapMeta,
@ -108,7 +107,6 @@ impl Index<usize> for MemoryMapRef<'_> {
/// Implementation of [`MemoryMapMut`] for the given buffer.
#[derive(Debug)]
#[repr(C)]
pub struct MemoryMapRefMut<'a> {
buf: &'a mut [u8],
meta: MemoryMapMeta,
@ -289,7 +287,6 @@ impl IndexMut<usize> for MemoryMapRefMut<'_> {
///
/// [`boot::get_memory_map`]: crate::boot::get_memory_map
#[derive(Debug)]
#[repr(C)]
pub(crate) struct MemoryMapBackingMemory(NonNull<[u8]>);
impl MemoryMapBackingMemory {
@ -389,7 +386,6 @@ impl Drop for MemoryMapBackingMemory {
/// Implementation of [`MemoryMapMut`] that owns the buffer on the UEFI heap.
#[derive(Debug)]
#[repr(C)]
pub struct MemoryMapOwned {
/// Backing memory, properly initialized at this point.
pub(crate) buf: MemoryMapBackingMemory,

View file

@ -64,7 +64,6 @@ pub struct MemoryMapKey(pub(crate) usize);
/// called. All following invocations (hidden, subtle, and asynchronous ones)
/// will likely invalidate this.
#[derive(Copy, Clone, Debug)]
#[repr(C)]
pub struct MemoryMapMeta {
/// The actual size of the map.
pub map_size: usize,