uefi: remove unnecessary unsafe for Event::from_ptr

There is nothing unsafe here. `NonNull` properly covers null pointers by returning
`None`.

Author: phip1611

uefi/CHANGELOG.md

@@ -11,7 +11,8 @@
 - Changed ordering of `proto::pci::PciIoAddress` to (bus -> dev -> fun -> reg -> ext_reg).
 - Return request with status as error data object for `proto::ata::pass_thru::AtaDevice`.
 - **Breaking:** `proto::network::snp::SimpleNetwork::wait_for_packet` now
-  returns `Option<Event>` instead of `&Event`.
+  returns `Option<Event>` instead of `&Event`. It has also been renamed to
+  `wait_for_packet`.
 
 # uefi - v0.36.1 (2025-11-05)
 

uefi/src/boot.rs

@@ -424,7 +424,7 @@ pub unsafe fn create_event(
     unsafe { (bt.create_event)(event_ty, notify_tpl, notify_fn, notify_ctx, &mut event) }
         .to_result_with_val(
             // OK to unwrap: event is non-null for Status::SUCCESS.
-            || unsafe { Event::from_ptr(event) }.unwrap(),
+            || Event::from_ptr(event).unwrap(),
         )
 }
 
@@ -502,7 +502,7 @@ pub unsafe fn create_event_ex(
     }
     .to_result_with_val(
         // OK to unwrap: event is non-null for Status::SUCCESS.
-        || unsafe { Event::from_ptr(event) }.unwrap(),
+        || Event::from_ptr(event).unwrap(),
     )
 }
 

uefi/src/data_types/mod.rs

@@ -82,12 +82,9 @@ impl Event {
         Self(self.0)
     }
 
-    /// Create an `Event` from a raw pointer.
-    ///
-    /// # Safety
-    ///
-    /// The caller must ensure that the pointer is valid.
-    pub unsafe fn from_ptr(ptr: *mut c_void) -> Option<Self> {
+    /// Create an [`Event`] from a raw pointer. Returns [`None`] if the pointer
+    /// null.
+    pub fn from_ptr(ptr: *mut c_void) -> Option<Self> {
         NonNull::new(ptr).map(Self)
     }
 

uefi/src/proto/console/pointer/mod.rs

@@ -55,7 +55,7 @@ impl Pointer {
     /// [`boot::wait_for_event`]: crate::boot::wait_for_event
     #[must_use]
     pub fn wait_for_input_event(&self) -> Option<Event> {
-        unsafe { Event::from_ptr(self.0.wait_for_input) }
+        Event::from_ptr(self.0.wait_for_input)
     }
 
     /// Returns a reference to the pointer device information.

uefi/src/proto/console/text/input.rs

@@ -86,7 +86,7 @@ impl Input {
     /// [`boot::wait_for_event`]: crate::boot::wait_for_event
     #[must_use]
     pub fn wait_for_key_event(&self) -> Option<Event> {
-        unsafe { Event::from_ptr(self.0.wait_for_key) }
+        Event::from_ptr(self.0.wait_for_key)
     }
 }
 

uefi/src/proto/network/snp.rs

@@ -270,8 +270,8 @@ impl SimpleNetwork {
     /// On QEMU, this event seems to never fire; it is suggested to verify that your implementation
     /// of UEFI properly implements this event before using it.
     #[must_use]
-    pub fn wait_for_packet(&self) -> Option<Event> {
-        unsafe { Event::from_ptr(self.0.wait_for_packet) }
+    pub fn wait_for_packet_event(&self) -> Option<Event> {
+        Event::from_ptr(self.0.wait_for_packet)
     }
 
     /// Returns a reference to the Simple Network mode.