Merge pull request #1202 from andre-braga/idiom

uefi: make DevicePathHeader::try_from idiomatic
rust-osdev · Jun 11, 2024 · 34e52a1 · 34e52a1
2 parents ed28e51 + faf56c7
commit 34e52a1
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/uefi/src/proto/device_path/mod.rs b/uefi/src/proto/device_path/mod.rs
@@ -124,11 +124,10 @@ impl<'a> TryFrom<&[u8]> for &'a DevicePathHeader {
 
     fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
         if mem::size_of::<DevicePathHeader>() <= bytes.len() {
-            unsafe {
-                return Ok(&*bytes.as_ptr().cast::<DevicePathHeader>());
-            }
+            unsafe { Ok(&*bytes.as_ptr().cast::<DevicePathHeader>()) }
+        } else {
+            Err(ByteConversionError::InvalidLength)
         }
-        Err(ByteConversionError::InvalidLength)
     }
 }