Cleanup warnings

src/elf.rs

@@ -1,6 +1,6 @@
-use crate::error::{ImageLoadError, ProtocolError};
+use crate::error::ImageLoadError;
 use core::mem::{size_of, MaybeUninit};
-use efi::{CStr16, File, MemoryMap, Status};
+use efi::{CStr16, File, MemoryMap};
 use yboot2_proto::{LoadProtocol, Magic};
 
 type Off = u64;

src/error.rs

@@ -6,7 +6,6 @@ use efi;
 pub enum BootError {
     ImageLoadError(ImageLoadError),
     InitrdLoadError(InitrdLoadError),
-    ProtocolError(ProtocolError),
     MemoryMapError(efi::Status),
     FileError(efi::Status),
     TerminateServicesError(efi::Status),
@@ -30,15 +29,6 @@ pub enum InitrdLoadError {
     NoSpace,
 }
 
-#[derive(Debug)]
-pub enum ProtocolError {}
-
-impl From<ProtocolError> for BootError {
-    fn from(p: ProtocolError) -> Self {
-        BootError::ProtocolError(p)
-    }
-}
-
 impl From<InitrdLoadError> for BootError {
     fn from(p: InitrdLoadError) -> Self {
         BootError::InitrdLoadError(p)
@@ -52,8 +42,8 @@ impl From<ImageLoadError> for BootError {
 }
 
 impl From<&BootError> for efi::Status {
-    fn from(f: &BootError) -> Self {
-        todo!()
+    fn from(_: &BootError) -> Self {
+        efi::Status::Err
     }
 }
 

src/initrd.rs

@@ -1,7 +1,7 @@
 use crate::elf;
 use crate::error::InitrdLoadError;
 use core::mem::MaybeUninit;
-use efi::{CStr16, File, Status};
+use efi::{CStr16, File};
 
 fn check_placement(mmap: &efi::MemoryMap, base: usize, size: usize) -> bool {
     for page in (base & !0xFFF..(base + size + 0xFFF) & !0xFFF).step_by(0x1000) {

src/video.rs

@@ -1,5 +1,5 @@
 use crate::error::BootError;
-use efi::{gop::ModeInformation, BootServices, GraphicsOutputProtocol, Status};
+use efi::{gop::ModeInformation, BootServices, GraphicsOutputProtocol};
 use yboot2_proto::{video::PixelFormat, LoadProtocol, VideoInfo};
 
 // TODO: "Any" format