Refactor UEFI implementation for compliance with rust-lang/rust#107457 lint

Author: kennystrawnmusic

Cargo.lock

@@ -31,7 +31,7 @@ exclude = ["examples/basic", "examples/test_framework"]
 
 [workspace.package]
 # don't forget to update `workspace.dependencies` below
-version = "0.11.3"
+version = "0.11.4"
 license = "MIT/Apache-2.0"
 repository = "https://github.com/rust-osdev/bootloader"
 

Cargo.toml

@@ -2,6 +2,7 @@ use bootloader::BootConfig;
 use bootloader::DiskImageBuilder;
 use std::{io::Read, path::Path, process::Command};
 
+#[allow(dead_code)]
 const QEMU_ARGS: &[&str] = &[
     "-device",
     "isa-debug-exit,iobase=0xf4,iosize=0x04",
@@ -11,6 +12,8 @@ const QEMU_ARGS: &[&str] = &[
     "none",
     "--no-reboot",
 ];
+
+#[allow(dead_code)]
 const SEPARATOR: &str = "\n____________________________________\n";
 
 pub fn run_test_kernel(kernel_binary_path: &str) {
@@ -98,6 +101,7 @@ pub fn run_test_kernel_on_uefi_pxe(out_tftp_path: &Path) {
     run_qemu(args);
 }
 
+#[allow(dead_code)]
 fn run_qemu<'a, A>(args: A)
 where
     A: IntoIterator<Item = &'a str>,

tests/runner/src/lib.rs

@@ -13,6 +13,6 @@ bootloader_api = { workspace = true }
 bootloader-x86_64-common = { workspace = true }
 bootloader-boot-config = { workspace = true }
 log = "0.4.14"
-uefi = "0.18.0"
 x86_64 = "0.14.8"
 serde-json-core = "0.5.0"
+uefi = "0.20.0"

uefi/Cargo.toml

@@ -136,7 +136,7 @@ fn main_inner(image: Handle, mut st: SystemTable<Boot>) -> Status {
         }
     );
 
-    let mmap_storage = {
+    let _mmap_storage = {
         let mut memory_map_size = st.boot_services().memory_map_size();
         loop {
             let ptr = st
@@ -162,11 +162,10 @@ fn main_inner(image: Handle, mut st: SystemTable<Boot>) -> Status {
 
     log::trace!("exiting boot services");
     let (system_table, memory_map) = st
-        .exit_boot_services(image, mmap_storage)
-        .expect("Failed to exit boot services");
+        .exit_boot_services();
 
     let mut frame_allocator =
-        LegacyFrameAllocator::new(memory_map.copied().map(UefiMemoryDescriptor));
+        LegacyFrameAllocator::new(memory_map.entries().copied().map(UefiMemoryDescriptor));
 
     let page_tables = create_page_tables(&mut frame_allocator);
     let mut ramdisk_len = 0u64;