Use StatusExt::to_result instead of Result::from/Status::into

Author: nicholasbishop

uefi-services/src/lib.rs

@@ -82,7 +82,7 @@ pub fn init(st: &mut SystemTable<Boot>) -> Result {
     unsafe {
         // Avoid double initialization.
         if SYSTEM_TABLE.is_some() {
-            return Status::SUCCESS.into();
+            return Status::SUCCESS.to_result();
         }
 
         // Setup the system table singleton

uefi/src/proto/console/gop.rs

@@ -119,7 +119,7 @@ impl GraphicsOutput {
     ///
     /// This function will invalidate the current framebuffer.
     pub fn set_mode(&mut self, mode: &Mode) -> Result {
-        (self.set_mode)(self, mode.index).into()
+        (self.set_mode)(self, mode.index).to_result()
     }
 
     /// Performs a blt (block transfer) operation on the frame buffer.
@@ -147,7 +147,7 @@ impl GraphicsOutput {
                         height,
                         0,
                     )
-                    .into()
+                    .to_result()
                 }
                 BltOp::VideoToBltBuffer {
                     buffer,
@@ -170,7 +170,7 @@ impl GraphicsOutput {
                             height,
                             0,
                         )
-                        .into(),
+                        .to_result(),
                         BltRegion::SubRectangle {
                             coords: (dest_x, dest_y),
                             px_stride,
@@ -186,7 +186,7 @@ impl GraphicsOutput {
                             height,
                             px_stride * core::mem::size_of::<BltPixel>(),
                         )
-                        .into(),
+                        .to_result(),
                     }
                 }
                 BltOp::BufferToVideo {
@@ -210,7 +210,7 @@ impl GraphicsOutput {
                             height,
                             0,
                         )
-                        .into(),
+                        .to_result(),
                         BltRegion::SubRectangle {
                             coords: (src_x, src_y),
                             px_stride,
@@ -226,7 +226,7 @@ impl GraphicsOutput {
                             height,
                             px_stride * core::mem::size_of::<BltPixel>(),
                         )
-                        .into(),
+                        .to_result(),
                     }
                 }
                 BltOp::VideoToVideo {
@@ -248,7 +248,7 @@ impl GraphicsOutput {
                         height,
                         0,
                     )
-                    .into()
+                    .to_result()
                 }
             }
         }

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

@@ -24,7 +24,7 @@ impl Pointer {
     ///
     /// - `DeviceError` if the device is malfunctioning and cannot be reset.
     pub fn reset(&mut self, extended_verification: bool) -> Result {
-        (self.reset)(self, extended_verification).into()
+        (self.reset)(self, extended_verification).to_result()
     }
 
     /// Retrieves the pointer device's current state, if a state change occurred

uefi/src/proto/console/serial.rs

@@ -39,7 +39,7 @@ pub struct Serial {
 impl Serial {
     /// Reset the device.
     pub fn reset(&mut self) -> Result {
-        (self.reset)(self).into()
+        (self.reset)(self).to_result()
     }
 
     /// Returns the current I/O mode.
@@ -71,7 +71,7 @@ impl Serial {
             mode.data_bits as u8,
             mode.stop_bits,
         )
-        .into()
+        .to_result()
     }
 
     /// Retrieve the device's current control bits.
@@ -85,7 +85,7 @@ impl Serial {
     /// Not all bits can be modified with this function. A mask of the allowed
     /// bits is stored in the [`ControlBits::SETTABLE`] constant.
     pub fn set_control_bits(&mut self, bits: ControlBits) -> Result {
-        (self.set_control_bits)(self, bits).into()
+        (self.set_control_bits)(self, bits).to_result()
     }
 
     /// Reads data from this device.

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

@@ -21,7 +21,7 @@ impl Input {
     ///
     /// - `DeviceError` if the device is malfunctioning and cannot be reset.
     pub fn reset(&mut self, extended_verification: bool) -> Result {
-        (self.reset)(self, extended_verification).into()
+        (self.reset)(self, extended_verification).to_result()
     }
 
     /// Reads the next keystroke from the input device, if any.

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

@@ -43,20 +43,20 @@ pub struct Output {
 impl Output {
     /// Resets and clears the text output device hardware.
     pub fn reset(&mut self, extended: bool) -> Result {
-        (self.reset)(self, extended).into()
+        (self.reset)(self, extended).to_result()
     }
 
     /// Clears the output screen.
     ///
     /// The background is set to the current background color.
     /// The cursor is moved to (0, 0).
     pub fn clear(&mut self) -> Result {
-        (self.clear_screen)(self).into()
+        (self.clear_screen)(self).to_result()
     }
 
     /// Writes a string to the output device.
     pub fn output_string(&mut self, string: &CStr16) -> Result {
-        unsafe { (self.output_string)(self, string.as_ptr()) }.into()
+        unsafe { (self.output_string)(self, string.as_ptr()) }.to_result()
     }
 
     /// Writes a string to the output device. If the string contains
@@ -125,7 +125,7 @@ impl Output {
 
     /// Sets a mode as current.
     pub fn set_mode(&mut self, mode: OutputMode) -> Result {
-        (self.set_mode)(self, mode.index).into()
+        (self.set_mode)(self, mode.index).to_result()
     }
 
     /// Returns whether the cursor is currently shown or not.
@@ -139,7 +139,7 @@ impl Output {
     /// The output device may not support this operation, in which case an
     /// `Unsupported` error will be returned.
     pub fn enable_cursor(&mut self, visible: bool) -> Result {
-        (self.enable_cursor)(self, visible).into()
+        (self.enable_cursor)(self, visible).to_result()
     }
 
     /// Returns the column and row of the cursor.
@@ -154,7 +154,7 @@ impl Output {
     ///
     /// This function will fail if the cursor's new position would exceed the screen's bounds.
     pub fn set_cursor_position(&mut self, column: usize, row: usize) -> Result {
-        (self.set_cursor_position)(self, column, row).into()
+        (self.set_cursor_position)(self, column, row).to_result()
     }
 
     /// Sets the text and background colors for the console.
@@ -168,7 +168,7 @@ impl Output {
         assert!(bgc < 8, "An invalid background color was requested");
 
         let attr = ((bgc & 0x7) << 4) | (fgc & 0xF);
-        (self.set_attribute)(self, attr).into()
+        (self.set_attribute)(self, attr).to_result()
     }
 
     /// Get a reference to `OutputData`. The lifetime of the reference is tied

uefi/src/proto/debug/mod.rs

@@ -95,7 +95,7 @@ impl DebugSupport {
         }
 
         // Safety: As we've validated the `processor_index`, this should always be safe
-        (self.register_periodic_callback)(self, processor_index, callback).into()
+        (self.register_periodic_callback)(self, processor_index, callback).to_result()
     }
 
     /// Registers a function to be called when a given processor exception occurs.
@@ -119,7 +119,8 @@ impl DebugSupport {
         }
 
         // Safety: As we've validated the `processor_index`, this should always be safe
-        (self.register_exception_callback)(self, processor_index, callback, exception_type).into()
+        (self.register_exception_callback)(self, processor_index, callback, exception_type)
+            .to_result()
     }
 
     /// Invalidates processor instruction cache for a memory range for a given `processor_index`.
@@ -140,7 +141,7 @@ impl DebugSupport {
 
         // per the UEFI spec, this call should only return EFI_SUCCESS
         // Safety: As we've validated the `processor_index`, this should always be safe
-        (self.invalidate_instruction_cache)(self, processor_index, start, length).into()
+        (self.invalidate_instruction_cache)(self, processor_index, start, length).to_result()
     }
 }
 
@@ -195,7 +196,7 @@ pub struct DebugPort {
 impl DebugPort {
     /// Resets the debugport device.
     pub fn reset(&self) -> Result {
-        (self.reset)(self).into()
+        (self.reset)(self).to_result()
     }
 
     /// Write data to the debugport device.
@@ -236,6 +237,6 @@ impl DebugPort {
 
     /// Check to see if any data is available to be read from the debugport device.
     pub fn poll(&self) -> Result {
-        (self.poll)(self).into()
+        (self.poll)(self).to_result()
     }
 }

uefi/src/proto/media/block.rs

@@ -1,7 +1,7 @@
 //! Block I/O protocols.
 
 use crate::proto::unsafe_protocol;
-use crate::{Result, Status};
+use crate::{Result, Status, StatusExt};
 
 /// The Block I/O protocol.
 #[repr(C)]
@@ -44,7 +44,7 @@ impl BlockIO {
     /// # Errors
     /// * `uefi::Status::DEVICE_ERROR`  The block device is not functioning correctly and could not be reset.
     pub fn reset(&mut self, extended_verification: bool) -> Result {
-        (self.reset)(self, extended_verification).into()
+        (self.reset)(self, extended_verification).to_result()
     }
 
     /// Read the requested number of blocks from the device.
@@ -65,7 +65,7 @@ impl BlockIO {
     ///     proper alignment.
     pub fn read_blocks(&self, media_id: u32, lba: Lba, buffer: &mut [u8]) -> Result {
         let buffer_size = buffer.len();
-        (self.read_blocks)(self, media_id, lba, buffer_size, buffer.as_mut_ptr()).into()
+        (self.read_blocks)(self, media_id, lba, buffer_size, buffer.as_mut_ptr()).to_result()
     }
 
     /// Writes the requested number of blocks to the device.
@@ -87,7 +87,7 @@ impl BlockIO {
     ///     on proper alignment.
     pub fn write_blocks(&mut self, media_id: u32, lba: Lba, buffer: &[u8]) -> Result {
         let buffer_size = buffer.len();
-        (self.write_blocks)(self, media_id, lba, buffer_size, buffer.as_ptr()).into()
+        (self.write_blocks)(self, media_id, lba, buffer_size, buffer.as_ptr()).to_result()
     }
 
     /// Flushes all modified data to a physical block device.
@@ -96,7 +96,7 @@ impl BlockIO {
     /// * `uefi::Status::DEVICE_ERROR`          The device reported an error while attempting to write data.
     /// * `uefi::Status::NO_MEDIA`              There is no media in the device.
     pub fn flush_blocks(&mut self) -> Result {
-        (self.flush_blocks)(self).into()
+        (self.flush_blocks)(self).to_result()
     }
 }
 

uefi/src/proto/media/disk.rs

@@ -1,7 +1,7 @@
 //! Disk I/O protocols.
 
 use crate::proto::unsafe_protocol;
-use crate::{Event, Result, Status};
+use crate::{Event, Result, Status, StatusExt};
 use core::ptr::NonNull;
 
 /// The disk I/O protocol.
@@ -46,7 +46,7 @@ impl DiskIo {
     /// * `uefi::status::NO_MEDIA`          There is no medium in the device.
     /// * `uefi::status::MEDIA_CHANGED`     `media_id` is not for the current medium.
     pub fn read_disk(&self, media_id: u32, offset: u64, buffer: &mut [u8]) -> Result {
-        (self.read_disk)(self, media_id, offset, buffer.len(), buffer.as_mut_ptr()).into()
+        (self.read_disk)(self, media_id, offset, buffer.len(), buffer.as_mut_ptr()).to_result()
     }
 
     /// Writes bytes to the disk device.
@@ -65,7 +65,7 @@ impl DiskIo {
     /// * `uefi::status::MEDIA_CHANGED`     `media_id` is not for the current medium.
     /// * `uefi::status::WRITE_PROTECTED`   The device cannot be written to.
     pub fn write_disk(&mut self, media_id: u32, offset: u64, buffer: &[u8]) -> Result {
-        (self.write_disk)(self, media_id, offset, buffer.len(), buffer.as_ptr()).into()
+        (self.write_disk)(self, media_id, offset, buffer.len(), buffer.as_ptr()).to_result()
     }
 }
 
@@ -115,7 +115,7 @@ impl DiskIo2 {
     /// * `uefi::status::DEVICE_ERROR`  The device reported an error while performing
     ///                                 the cancel operation.
     pub fn cancel(&mut self) -> Result {
-        (self.cancel)(self).into()
+        (self.cancel)(self).to_result()
     }
 
     /// Reads bytes from the disk device.
@@ -149,7 +149,7 @@ impl DiskIo2 {
         len: usize,
         buffer: *mut u8,
     ) -> Result {
-        (self.read_disk_ex)(self, media_id, offset, token, len, buffer).into()
+        (self.read_disk_ex)(self, media_id, offset, token, len, buffer).to_result()
     }
 
     /// Writes bytes to the disk device.
@@ -184,7 +184,7 @@ impl DiskIo2 {
         len: usize,
         buffer: *const u8,
     ) -> Result {
-        (self.write_disk_ex)(self, media_id, offset, token, len, buffer).into()
+        (self.write_disk_ex)(self, media_id, offset, token, len, buffer).to_result()
     }
 
     /// Flushes all modified data to the physical device.
@@ -202,6 +202,6 @@ impl DiskIo2 {
     ///                                     the flush operation.
     /// * `uefi::status::WRITE_PROTECTED`   The device cannot be written to.
     pub fn flush_disk(&mut self, token: Option<NonNull<DiskIo2Token>>) -> Result {
-        (self.flush_disk_ex)(self, token).into()
+        (self.flush_disk_ex)(self, token).to_result()
     }
 }

uefi/src/proto/media/file/mod.rs

@@ -90,7 +90,7 @@ pub trait File: Sized {
     ///
     /// * [`uefi::Status::WARN_DELETE_FAILURE`]
     fn delete(mut self) -> Result {
-        let result = (self.imp().delete)(self.imp()).into();
+        let result = (self.imp().delete)(self.imp()).to_result();
         mem::forget(self);
         result
     }
@@ -165,7 +165,7 @@ pub trait File: Sized {
     fn set_info<Info: FileProtocolInfo + ?Sized>(&mut self, info: &Info) -> Result {
         let info_ptr = (info as *const Info).cast::<c_void>();
         let info_size = mem::size_of_val(info);
-        unsafe { (self.imp().set_info)(self.imp(), &Info::GUID, info_size, info_ptr).into() }
+        unsafe { (self.imp().set_info)(self.imp(), &Info::GUID, info_size, info_ptr).to_result() }
     }
 
     /// Flushes all modified data associated with the file handle to the device
@@ -181,7 +181,7 @@ pub trait File: Sized {
     /// * [`uefi::Status::ACCESS_DENIED`]
     /// * [`uefi::Status::VOLUME_FULL`]
     fn flush(&mut self) -> Result {
-        (self.imp().flush)(self.imp()).into()
+        (self.imp().flush)(self.imp()).to_result()
     }
 
     /// Read the dynamically allocated info for a file.
@@ -307,7 +307,7 @@ impl File for FileHandle {
 
 impl Drop for FileHandle {
     fn drop(&mut self) {
-        let result: Result = (self.imp().close)(self.imp()).into();
+        let result: Result = (self.imp().close)(self.imp()).to_result();
         // The spec says this always succeeds.
         result.expect("Failed to close file");
     }

uefi/src/proto/media/file/regular.rs

@@ -112,7 +112,7 @@ impl RegularFile {
     ///
     /// * [`uefi::Status::DEVICE_ERROR`]
     pub fn set_position(&mut self, position: u64) -> Result {
-        (self.imp().set_position)(self.imp(), position).into()
+        (self.imp().set_position)(self.imp(), position).to_result()
     }
 }