diff --git a/src/allocator.rs b/src/allocator.rs index 60444675..e0e12918 100644 --- a/src/allocator.rs +++ b/src/allocator.rs @@ -2,10 +2,10 @@ use alloc::alloc::{GlobalAlloc, Layout}; use core::ptr::null_mut; use fixed_size_block::FixedSizeBlockAllocator; use x86_64::{ - structures::paging::{ - mapper::MapToError, FrameAllocator, Mapper, Page, PageTableFlags, Size4KiB, - }, VirtAddr, + structures::paging::{ + FrameAllocator, Mapper, Page, PageTableFlags, Size4KiB, mapper::MapToError, + }, }; pub mod bump; diff --git a/tests/heap_allocation.rs b/tests/heap_allocation.rs index bcdeac65..5c9799bc 100644 --- a/tests/heap_allocation.rs +++ b/tests/heap_allocation.rs @@ -8,7 +8,7 @@ extern crate alloc; use alloc::{boxed::Box, vec::Vec}; use blog_os::allocator::HEAP_SIZE; -use bootloader::{entry_point, BootInfo}; +use bootloader::{BootInfo, entry_point}; use core::panic::PanicInfo; entry_point!(main);