rustfmt

4 files changed, 11 insertions, 16 deletions

diff --git a/src/efi/mod.rs b/src/efi/mod.rs
index 761e91b..b6bea0e 100644
--- a/src/efi/mod.rs
+++ b/src/efi/mod.rs
@@ -9,9 +9,9 @@ use crate::efi::memmap::*;
 use crate::efi::runtimeservices::RuntimeServices;
 use crate::efi::MemoryType::*;
 use crate::efi::{loadedimage::*, memorytype::*, systemtable::*};
-use crate::RTSCODE;
-use crate::RTRODATA;
 use crate::PeImage;
+use crate::RTRODATA;
+use crate::RTSCODE;
 
 use core::pin::Pin;
 use core::sync::atomic::{AtomicUsize, Ordering};
@@ -35,13 +35,13 @@ mod loadedimage;
 pub mod memattr;
 pub mod memmap;
 pub mod memorytype;
+pub mod peloader;
 pub mod rng;
 mod runtimeservices;
 mod simpletext;
 pub mod status;
 mod systemtable;
 mod tableheader;
-pub mod peloader;
 
 pub type Bool = u8;
 pub type Char16 = u16;
@@ -173,7 +173,7 @@ impl MemoryAttributesTable<[MemoryDescriptor]> {
                         core::mem::size_of_val(&RTRODATA) as u64 >> EFI_PAGE_SHIFT
                     },
                     attribute: EFI_MEMORY_RO | EFI_MEMORY_XP,
-                }
+                },
             ],
         });
         alloc::boxed::Box::leak(m)
diff --git a/src/efi/peloader.rs b/src/efi/peloader.rs
index d97a288..50993f7 100644
--- a/src/efi/peloader.rs
+++ b/src/efi/peloader.rs
@@ -289,4 +289,3 @@ impl Iterator for PeImageSectionIterator<'_> {
         Some((start..end, s.characteristics))
     }
 }
-
diff --git a/src/fwcfg.rs b/src/fwcfg.rs
index a65f8fd..8930e7e 100644
--- a/src/fwcfg.rs
+++ b/src/fwcfg.rs
@@ -523,18 +523,14 @@ impl efi::FileLoader for FwCfgFileLoader<'_> {
             .or(Err("Failed to load file from fwcfg"))
     }
 
-    unsafe fn load_range<'a>(
-        &self,
-        ptr: *mut (),
-        offset: usize,
-        size: usize,
-    ) -> Result<(), &str> {
+    unsafe fn load_range<'a>(&self, ptr: *mut (), offset: usize, size: usize) -> Result<(), &str> {
         if offset > self.size {
             return Err("Offset out of range");
         }
         let loadbuffer = slice::from_raw_parts_mut(ptr as *mut MaybeUninit<u8>, size);
         self.fwcfg
             .load_file(loadbuffer, offset, size, self.data_cfg)
-            .or(Err("Failed to load range from fwcfg")).and(Ok(()))
+            .or(Err("Failed to load range from fwcfg"))
+            .and(Ok(()))
     }
 }
diff --git a/src/main.rs b/src/main.rs
index f4ccb06..8fbea76 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -30,19 +30,19 @@ mod rng;
 
 use core::{arch::global_asm, panic::PanicInfo, slice};
 use linked_list_allocator::LockedHeap;
-use log::{error, warn, info, debug};
+use log::{debug, error, info, warn};
 
 extern crate alloc;
 use alloc::vec::Vec;
 
 extern crate aarch64_intrinsics;
 
-use crate::efi::{Guid, guid};
-use crate::efi::FileLoader;
 use crate::efi::memmap::*;
 use crate::efi::memorytype::*;
-use crate::paging::Attributes;
 use crate::efi::peloader::*;
+use crate::efi::FileLoader;
+use crate::efi::{guid, Guid};
+use crate::paging::Attributes;
 use crate::MemoryType::EfiBootServicesData;
 use crate::MemoryType::EfiRuntimeServicesData;