From 16fd0bb04da7975e0ea2438db6885df9064444a5 Mon Sep 17 00:00:00 2001
From: Jason Couture <jasonc@alertr.info>
Date: Thu, 5 Jan 2023 21:16:04 -0500
Subject: [PATCH] Run cargo fmt

---
 bios/stage-2/src/main.rs  |  8 +++++++-
 bios/stage-4/src/main.rs  |  6 +++++-
 tests/default_settings.rs |  2 +-
 uefi/src/main.rs          | 12 ++++++++++--
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/bios/stage-2/src/main.rs b/bios/stage-2/src/main.rs
index b2bc5e6a..a1ba8566 100644
--- a/bios/stage-2/src/main.rs
+++ b/bios/stage-2/src/main.rs
@@ -101,7 +101,13 @@ fn start(disk_number: u16, partition_table_start: *const u8) -> ! {
     let kernel_page_size = (((kernel_len - 1) / 4096) + 1) as usize;
     let ramdisk_start = KERNEL_DST.wrapping_add(kernel_page_size * 4096);
     writeln!(screen::Writer, "Loading ramdisk...").unwrap();
-    let ramdisk_len = match try_load_file("ramdisk", KERNEL_DST.wrapping_add(kernel_page_size * 4096), &mut fs, &mut disk, disk_buffer) {
+    let ramdisk_len = match try_load_file(
+        "ramdisk",
+        KERNEL_DST.wrapping_add(kernel_page_size * 4096),
+        &mut fs,
+        &mut disk,
+        disk_buffer,
+    ) {
         Some(s) => s,
         None => 0u64,
     };
diff --git a/bios/stage-4/src/main.rs b/bios/stage-4/src/main.rs
index d37ac245..8e9e776d 100644
--- a/bios/stage-4/src/main.rs
+++ b/bios/stage-4/src/main.rs
@@ -58,7 +58,11 @@ pub extern "C" fn _start(info: &mut BiosInfo) -> ! {
     let kernel_size = info.kernel.len;
     let next_free_frame = match info.ramdisk.len {
         0 => PhysFrame::containing_address(kernel_start + kernel_size - 1u64) + 1,
-        _ => PhysFrame::containing_address(PhysAddr::new(info.ramdisk.start + info.ramdisk.len - 1u64)) + 1
+        _ => {
+            PhysFrame::containing_address(PhysAddr::new(
+                info.ramdisk.start + info.ramdisk.len - 1u64,
+            )) + 1
+        }
     };
     let mut frame_allocator = LegacyFrameAllocator::new_starting_at(
         next_free_frame,
diff --git a/tests/default_settings.rs b/tests/default_settings.rs
index 5d5a6395..0a7e6c47 100644
--- a/tests/default_settings.rs
+++ b/tests/default_settings.rs
@@ -4,7 +4,7 @@ use bootloader_test_runner::run_test_kernel;
 fn basic_boot() {
     run_test_kernel(
         env!("CARGO_BIN_FILE_TEST_KERNEL_DEFAULT_SETTINGS_basic_boot"),
-        None
+        None,
     );
 }
 
diff --git a/uefi/src/main.rs b/uefi/src/main.rs
index 1cdb30c9..68b35327 100644
--- a/uefi/src/main.rs
+++ b/uefi/src/main.rs
@@ -73,7 +73,11 @@ fn main_inner(image: Handle, mut st: SystemTable<Boot>) -> Status {
         *SYSTEM_TABLE.get() = Some(st.unsafe_clone());
     }
     st.stdout().clear().unwrap();
-    writeln!(st.stdout(), "UEFI bootloader started; trying to load kernel").unwrap();
+    writeln!(
+        st.stdout(),
+        "UEFI bootloader started; trying to load kernel"
+    )
+    .unwrap();
 
     let mut boot_mode = BootMode::Disk;
     let mut kernel = load_kernel(image, &mut st, boot_mode);
@@ -439,7 +443,11 @@ fn create_page_tables(
     }
 }
 
-fn init_logger(image_handle: Handle, st: &SystemTable<Boot>, config: BootloaderConfig) -> Option<RawFrameBufferInfo> {
+fn init_logger(
+    image_handle: Handle,
+    st: &SystemTable<Boot>,
+    config: BootloaderConfig,
+) -> Option<RawFrameBufferInfo> {
     let gop_handle = st
         .boot_services()
         .get_handle_for_protocol::<GraphicsOutput>()