uefi-test-runner: use new uefi::helpers module

Note that even without these changes, everything works. This proves
that we stay API compatible for the next uefi-services release.

Author: phip1611

Cargo.lock

@@ -6,8 +6,7 @@ publish = false
 edition = "2021"
 
 [dependencies]
-uefi = { path = "../uefi", features = ["alloc"] }
-uefi-services = { path = "../uefi-services" }
+uefi = { path = "../uefi", features = ["alloc", "global_allocator", "panic_handler", "logger"] }
 
 log.workspace = true
 

uefi-test-runner/Cargo.toml

@@ -14,7 +14,7 @@ use uefi::prelude::*;
 fn main(_image_handle: Handle, mut system_table: SystemTable<Boot>) -> Status {
     // ANCHOR_END: entry
     // ANCHOR: services
-    uefi_services::init(&mut system_table).unwrap();
+    uefi::helpers::init(&mut system_table).unwrap();
     // ANCHOR_END: services
     // ANCHOR: log
     info!("Hello world!");

uefi-test-runner/examples/hello_world.rs

@@ -14,7 +14,7 @@ use uefi::{Identify, Result};
 // ANCHOR: main
 #[entry]
 fn main(image_handle: Handle, mut system_table: SystemTable<Boot>) -> Status {
-    uefi_services::init(&mut system_table).unwrap();
+    uefi::helpers::init(&mut system_table).unwrap();
     let boot_services = system_table.boot_services();
 
     print_image_path(boot_services).unwrap();

uefi-test-runner/examples/loaded_image.rs

@@ -7,8 +7,8 @@
 use log::error;
 // ANCHOR: use
 use uefi::prelude::*;
+use uefi::println;
 use uefi::proto::shell_params::ShellParameters;
-use uefi_services::println;
 
 extern crate alloc;
 use alloc::string::{String, ToString};
@@ -20,7 +20,7 @@ use alloc::vec::Vec;
 fn main(image_handle: Handle, mut system_table: SystemTable<Boot>) -> Status {
     // ANCHOR_END: entry
     // ANCHOR: services
-    uefi_services::init(&mut system_table).unwrap();
+    uefi::helpers::init(&mut system_table).unwrap();
     let boot_services = system_table.boot_services();
     // ANCHOR_END: services
 

uefi-test-runner/examples/shell_params.rs

@@ -125,7 +125,7 @@ fn draw_sierpinski(bt: &BootServices) -> Result {
 
 #[entry]
 fn main(_handle: Handle, mut system_table: SystemTable<Boot>) -> Status {
-    uefi_services::init(&mut system_table).unwrap();
+    uefi::helpers::init(&mut system_table).unwrap();
     let bt = system_table.boot_services();
     draw_sierpinski(bt).unwrap();
     Status::SUCCESS

uefi-test-runner/examples/sierpinski.rs

@@ -46,7 +46,7 @@ fn get_shell_app_device_path<'a>(
 
 #[entry]
 fn efi_main(image: Handle, mut st: SystemTable<Boot>) -> Status {
-    uefi_services::init(&mut st).unwrap();
+    uefi::helpers::init(&mut st).unwrap();
     let boot_services = st.boot_services();
 
     let mut storage = Vec::new();

uefi-test-runner/src/bin/shell_launcher.rs

@@ -14,7 +14,7 @@ use uefi::proto::device_path::build::{self, DevicePathBuilder};
 use uefi::proto::device_path::messaging::Vendor;
 use uefi::table::boot::MemoryType;
 use uefi::Result;
-use uefi_services::{print, println};
+use uefi::{print, println};
 
 mod boot;
 mod fs;
@@ -24,7 +24,7 @@ mod runtime;
 #[entry]
 fn efi_main(image: Handle, mut st: SystemTable<Boot>) -> Status {
     // Initialize utilities (logging, memory allocation...)
-    uefi_services::init(&mut st).expect("Failed to initialize utilities");
+    uefi::helpers::init(&mut st).expect("Failed to initialize utilities");
 
     // unit tests here