Merge pull request #1202 from andre-braga/idiom

nicholasbishop · web-flow · commit 34e52a13c36c · 2024-06-11T22:40:55.000Z
uefi: make DevicePathHeader::try_from idiomatic
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)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -124,11 +124,10 @@ impl<'a> TryFrom<&[u8]> for &'a DevicePathHeader {`
`124`	`124`
`125`	`125`	`fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {`
`126`	`126`	`if mem::size_of::<DevicePathHeader>() <= bytes.len() {`
`127`		`- unsafe {`
`128`		`- return Ok(&*bytes.as_ptr().cast::<DevicePathHeader>());`
`129`		`- }`
	`127`	`+ unsafe { Ok(&*bytes.as_ptr().cast::<DevicePathHeader>()) }`
	`128`	`+ } else {`
	`129`	`+ Err(ByteConversionError::InvalidLength)`
`130`	`130`	`}`
`131`		`- Err(ByteConversionError::InvalidLength)`
`132`	`131`	`}`
`133`	`132`	`}`
`134`	`133`