std.os.uefi: move allocators to heap

Author: RossComputerGuy

lib/std/heap.zig

@@ -24,6 +24,8 @@ pub const GeneralPurposeAllocatorConfig = DebugAllocatorConfig;
 /// Deprecated; to be removed after 0.14.0 is tagged.
 pub const GeneralPurposeAllocator = DebugAllocator;
 
+pub const uefi = @import("heap/uefi_allocators.zig");
+
 const memory_pool = @import("heap/memory_pool.zig");
 pub const MemoryPool = memory_pool.MemoryPool;
 pub const MemoryPoolAligned = memory_pool.MemoryPoolAligned;
@@ -355,7 +357,7 @@ else if (builtin.target.isWasm()) .{
     .ptr = undefined,
     .vtable = &SbrkAllocator(std.os.plan9.sbrk).vtable,
 } else if (builtin.target.os.tag == .uefi)
-    std.os.uefi.global_page_allocator.allocator()
+    uefi.global_page_allocator.allocator()
 else
     .{
         .ptr = undefined,

lib/std/os/uefi/allocator.zig renamed to lib/std/heap/uefi_allocators.zig

@@ -1,4 +1,4 @@
-const std = @import("../../std.zig");
+const std = @import("../std.zig");
 
 const mem = std.mem;
 const uefi = std.os.uefi;
@@ -7,6 +7,9 @@ const Allocator = mem.Allocator;
 
 const assert = std.debug.assert;
 
+pub var global_page_allocator = PageAllocator{};
+pub var global_pool_allocator = PoolAllocator{};
+
 /// Allocates memory in pages.
 ///
 /// This allocator is backed by `allocatePages` and is therefore only suitable for usage when Boot Services are available.

lib/std/os/uefi.zig

@@ -14,14 +14,6 @@ pub const tables = @import("uefi/tables.zig");
 /// used by UEFI applications to allocate pool memory.
 pub var efi_pool_memory_type: tables.MemoryType = .LoaderData;
 
-const allocator = @import("uefi/allocator.zig");
-pub const PageAllocator = allocator.Page;
-pub const PoolAllocator = allocator.Pool;
-pub const RawPoolAllocator = allocator.RawPool;
-
-pub var global_page_allocator = PageAllocator{};
-pub var global_pool_allocator = PoolAllocator{};
-
 /// The EFI image's handle that is passed to its entry point.
 pub var handle: Handle = undefined;