FileHandle::into_type does no longer return a result

Author: phip1611

CHANGELOG.md

@@ -13,6 +13,7 @@
 - Added `BootServices::get_handle_for_protocol`.
 - the `File` trait now knows the methods `is_regular_file()` and `is_directory`.
   Developers profit from this on the struct `FileHandle`, for example.
+- **Breaking**`: FileHandle::into_type()` does no longer return a Result but a direct type
 
 ### Changed
 

src/proto/media/file/mod.rs

@@ -252,20 +252,20 @@ impl FileHandle {
 
     /// Converts `File` into a more specific subtype based on if it is a
     /// directory or not. It does this via a call to `get_position`.
-    pub fn into_type(self) -> Result<FileType> {
+    pub fn into_type(self) -> FileType {
         use FileType::*;
 
         if self.is_regular_file() {
-            unsafe { Ok(Regular(RegularFile::new(self))) }
+            unsafe { Regular(RegularFile::new(self)) }
         } else {
-            unsafe { Ok(Dir(Directory::new(self))) }
+            unsafe { Dir(Directory::new(self)) }
         }
     }
 
     /// If the handle represents a directory, convert it into a
     /// [`Directory`]. Otherwise returns `None`.
     pub fn into_directory(self) -> Option<Directory> {
-        if let Ok(FileType::Dir(dir)) = self.into_type() {
+        if let FileType::Dir(dir) = self.into_type() {
             Some(dir)
         } else {
             None
@@ -275,7 +275,7 @@ impl FileHandle {
     /// If the handle represents a regular file, convert it into a
     /// [`RegularFile`]. Otherwise returns `None`.
     pub fn into_regular_file(self) -> Option<RegularFile> {
-        if let Ok(FileType::Regular(regular)) = self.into_type() {
+        if let FileType::Regular(regular) = self.into_type() {
             Some(regular)
         } else {
             None

uefi-test-runner/src/proto/media/mod.rs

@@ -79,7 +79,7 @@ pub fn test_simple_file_system_protocol(image: Handle, bt: &BootServices) {
             )
             .unwrap();
         assert!(created_file.is_regular_file());
-        let created_file = match created_file.into_type().unwrap() {
+        let created_file = match created_file.into_type() {
             FileType::Regular(file) => file,
             _ => panic!("unsupported value"),
         };