cargo fmt

Author: spencer3035

bios/stage-2/src/memory_map.rs

@@ -1,7 +1,7 @@
 // From http://wiki.osdev.org/Detecting_Memory_(x86)#Getting_an_E820_Memory_Map
 
 use crate::split_array_ref;
-use bootloader_x86_64_bios_common::{racy_cell::RacyCell, E820MemoryRegion};
+use bootloader_x86_64_bios_common::{E820MemoryRegion, racy_cell::RacyCell};
 use core::arch::asm;
 
 static MEMORY_MAP: RacyCell<[E820MemoryRegion; 100]> = RacyCell::new(

bios/stage-2/src/vesa.rs

@@ -2,7 +2,7 @@
 
 use bootloader_x86_64_bios_common::PixelFormat;
 
-use crate::{disk::AlignedBuffer, AlignedArrayBuffer};
+use crate::{AlignedArrayBuffer, disk::AlignedBuffer};
 use core::arch::asm;
 
 #[repr(C, packed)]
@@ -109,11 +109,7 @@ impl<'a> VesaInfo<'a> {
         let base_ptr = video_mode_ptr as *const u16;
         let ptr = unsafe { base_ptr.add(index) };
         let mode = unsafe { *ptr };
-        if mode == 0xffff {
-            None
-        } else {
-            Some(mode)
-        }
+        if mode == 0xffff { None } else { Some(mode) }
     }
 }
 

bios/stage-3/src/screen.rs

@@ -1,6 +1,6 @@
-use bootloader_x86_64_bios_common::{racy_cell::RacyCell, BiosFramebufferInfo, PixelFormat};
+use bootloader_x86_64_bios_common::{BiosFramebufferInfo, PixelFormat, racy_cell::RacyCell};
 use core::{fmt, ptr};
-use noto_sans_mono_bitmap::{get_bitmap, BitmapChar, BitmapHeight, FontWeight};
+use noto_sans_mono_bitmap::{BitmapChar, BitmapHeight, FontWeight, get_bitmap};
 
 static WRITER: RacyCell<Option<ScreenWriter>> = RacyCell::new(None);
 pub struct Writer;

common/src/framebuffer.rs

@@ -2,7 +2,7 @@ use bootloader_api::info::{FrameBufferInfo, PixelFormat};
 use core::{fmt, ptr};
 use font_constants::BACKUP_CHAR;
 use noto_sans_mono_bitmap::{
-    get_raster, get_raster_width, FontWeight, RasterHeight, RasterizedChar,
+    FontWeight, RasterHeight, RasterizedChar, get_raster, get_raster_width,
 };
 
 /// Additional vertical space between lines

common/src/gdt.rs

@@ -1,10 +1,10 @@
 use x86_64::{
+    VirtAddr,
     instructions::segmentation::{self, Segment},
     structures::{
         gdt::{Descriptor, GlobalDescriptorTable},
         paging::PhysFrame,
     },
-    VirtAddr,
 };
 
 pub fn create_and_load(frame: PhysFrame) {

common/src/legacy_memory_region.rs

@@ -1,9 +1,8 @@
 use bootloader_api::info::{MemoryRegion, MemoryRegionKind};
 use core::{cmp, mem::MaybeUninit};
 use x86_64::{
-    align_down, align_up,
+    PhysAddr, align_down, align_up,
     structures::paging::{FrameAllocator, PhysFrame, Size4KiB},
-    PhysAddr,
 };
 
 /// A slice of memory that is used by the bootloader and needs to be reserved

common/src/level_4_entries.rs

@@ -1,9 +1,8 @@
 use crate::{
-    entropy,
-    load_kernel::{calc_elf_memory_requirements, ElfMemoryRequirements, VirtualAddressOffset},
-    BootInfo, RawFrameBufferInfo,
+    BootInfo, RawFrameBufferInfo, entropy,
+    load_kernel::{ElfMemoryRequirements, VirtualAddressOffset, calc_elf_memory_requirements},
 };
-use bootloader_api::{config, info::MemoryRegion, BootloaderConfig};
+use bootloader_api::{BootloaderConfig, config, info::MemoryRegion};
 use core::{alloc::Layout, iter::Step};
 use rand::{
     distributions::{Distribution, Uniform},
@@ -12,10 +11,10 @@ use rand::{
 use rand_hc::Hc128Rng;
 use usize_conversions::IntoUsize;
 use x86_64::{
-    structures::paging::{Page, PageTableIndex, Size4KiB},
     PhysAddr, VirtAddr,
+    structures::paging::{Page, PageTableIndex, Size4KiB},
 };
-use xmas_elf::{header, program::ProgramHeader, ElfFile};
+use xmas_elf::{ElfFile, header, program::ProgramHeader};
 
 /// Keeps track of used entries in a level 4 page table.
 ///

common/src/lib.rs

@@ -4,20 +4,20 @@
 
 use crate::legacy_memory_region::{LegacyFrameAllocator, LegacyMemoryRegion};
 use bootloader_api::{
+    BootInfo, BootloaderConfig,
     config::Mapping,
     info::{FrameBuffer, FrameBufferInfo, MemoryRegion, TlsTemplate},
-    BootInfo, BootloaderConfig,
 };
 use bootloader_boot_config::{BootConfig, LevelFilter};
 use core::{alloc::Layout, arch::asm, mem::MaybeUninit, slice};
 use level_4_entries::UsedLevel4Entries;
 use usize_conversions::FromUsize;
 use x86_64::{
+    PhysAddr, VirtAddr,
     structures::paging::{
-        page_table::PageTableLevel, FrameAllocator, Mapper, OffsetPageTable, Page, PageSize,
-        PageTableFlags, PageTableIndex, PhysFrame, Size2MiB, Size4KiB,
+        FrameAllocator, Mapper, OffsetPageTable, Page, PageSize, PageTableFlags, PageTableIndex,
+        PhysFrame, Size2MiB, Size4KiB, page_table::PageTableLevel,
     },
-    PhysAddr, VirtAddr,
 };
 use xmas_elf::ElfFile;
 

common/src/load_kernel.rs

@@ -1,20 +1,18 @@
-use crate::{level_4_entries::UsedLevel4Entries, PAGE_SIZE};
+use crate::{PAGE_SIZE, level_4_entries::UsedLevel4Entries};
 use bootloader_api::{config::Mapping, info::TlsTemplate};
 use core::{cmp, iter::Step, mem::size_of, ops::Add};
 
 use x86_64::{
-    align_up,
+    PhysAddr, VirtAddr, align_up,
     structures::paging::{
-        mapper::{MappedFrame, MapperAllSizes, TranslateResult},
         FrameAllocator, Page, PageSize, PageTableFlags as Flags, PhysFrame, Size4KiB, Translate,
+        mapper::{MappedFrame, MapperAllSizes, TranslateResult},
     },
-    PhysAddr, VirtAddr,
 };
 use xmas_elf::{
-    dynamic, header,
+    ElfFile, dynamic, header,
     program::{self, ProgramHeader, SegmentData, Type},
     sections::Rela,
-    ElfFile,
 };
 
 use super::Kernel;
@@ -65,7 +63,7 @@ where
                     return Err(concat!(
                         "Invalid kernel_code mapping. ",
                         "Executable can only be mapped at virtual_address_offset 0."
-                    ))
+                    ));
                 }
             },
             header::Type::SharedObject => {

tests/test_kernels/config_file/src/bin/custom_config.rs

@@ -1,9 +1,9 @@
 #![no_std] // don't link the Rust standard library
 #![no_main] // disable all Rust-level entry points
 
-use bootloader_api::{entry_point, BootInfo};
+use bootloader_api::{BootInfo, entry_point};
 use core::fmt::Write;
-use test_kernel_config_file::{exit_qemu, serial, QemuExitCode};
+use test_kernel_config_file::{QemuExitCode, exit_qemu, serial};
 
 entry_point!(kernel_main);