From 2e583141e6e39cd73240e88b655a614f54df9cef Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nbishop@nbishop.net>
Date: Wed, 25 Oct 2023 20:39:13 -0400
Subject: [PATCH] uefi-services: Remove NonNull wrapper from system_table

The `SystemTable` type is already essentially a wrapper around a pointer, so
there's no need to wrap this return value in another pointer via `NonNull`.
---
 CHANGELOG.md             | 4 ++++
 uefi-services/src/lib.rs | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9396cdd9..8025aa005 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@
 
 ## uefi-services - [Unreleased]
 
+### Changed
+- `uefi_services::system_table` now returns `SystemTable<Boot>` directly, rather
+  than wrapped in a `NonNull` pointer.
+
 ## uefi - 0.25.0 (2023-10-10)
 
 ### Changed
diff --git a/uefi-services/src/lib.rs b/uefi-services/src/lib.rs
index ef6009f43..5d22cd144 100644
--- a/uefi-services/src/lib.rs
+++ b/uefi-services/src/lib.rs
@@ -65,12 +65,12 @@ static mut LOGGER: Option<uefi::logger::Logger> = None;
 ///
 /// The returned pointer is only valid until boot services are exited.
 #[must_use]
-pub fn system_table() -> NonNull<SystemTable<Boot>> {
+pub fn system_table() -> SystemTable<Boot> {
     unsafe {
         let table_ref = SYSTEM_TABLE
             .as_ref()
             .expect("The system table handle is not available");
-        NonNull::new(table_ref as *const _ as *mut _).unwrap()
+        table_ref.unsafe_clone()
     }
 }