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/src/allocator/bump.rs b/src/allocator/bump.rs index 37031254..33c61779 100644 --- a/src/allocator/bump.rs +++ b/src/allocator/bump.rs @@ -1,4 +1,4 @@ -use super::{align_up, Locked}; +use super::{Locked, align_up}; use alloc::alloc::{GlobalAlloc, Layout}; use core::ptr; diff --git a/src/task/keyboard.rs b/src/task/keyboard.rs index 7c34a254..23b2b3ef 100644 --- a/src/task/keyboard.rs +++ b/src/task/keyboard.rs @@ -9,7 +9,7 @@ use futures_util::{ stream::{Stream, StreamExt}, task::AtomicWaker, }; -use pc_keyboard::{layouts, DecodedKey, HandleControl, Keyboard, ScancodeSet1}; +use pc_keyboard::{DecodedKey, HandleControl, Keyboard, ScancodeSet1, layouts}; static SCANCODE_QUEUE: OnceCell> = OnceCell::uninit(); static WAKER: AtomicWaker = AtomicWaker::new(); 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);