From d624c09bd4766813560e137d066d64c1ba66965d Mon Sep 17 00:00:00 2001 From: Rajas Paranjpe Date: Tue, 25 Feb 2025 11:39:17 -0800 Subject: [PATCH 1/2] Use `Result::ok` --- uefi/src/main.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/uefi/src/main.rs b/uefi/src/main.rs index 1ee17c0d..8595adc1 100644 --- a/uefi/src/main.rs +++ b/uefi/src/main.rs @@ -313,10 +313,7 @@ fn load_file_from_disk( let file_handle_result = root.open(filename, FileMode::Read, FileAttribute::empty()); - let file_handle = match file_handle_result { - Err(_) => return None, - Ok(handle) => handle, - }; + let file_handle = file_handle_result.ok(); let mut file = match file_handle.into_type().unwrap() { uefi::proto::media::file::FileType::Regular(f) => f, From ea582ba50f62e6a70029a41fb4ecfcdea1ddec16 Mon Sep 17 00:00:00 2001 From: Rajas Paranjpe Date: Tue, 25 Feb 2025 13:20:32 -0800 Subject: [PATCH 2/2] Update uefi/src/main.rs Co-authored-by: Tom Dohrmann --- uefi/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uefi/src/main.rs b/uefi/src/main.rs index 8595adc1..99a4821c 100644 --- a/uefi/src/main.rs +++ b/uefi/src/main.rs @@ -313,7 +313,7 @@ fn load_file_from_disk( let file_handle_result = root.open(filename, FileMode::Read, FileAttribute::empty()); - let file_handle = file_handle_result.ok(); + let file_handle = file_handle_result.ok()?; let mut file = match file_handle.into_type().unwrap() { uefi::proto::media::file::FileType::Regular(f) => f,