Skip to content

Commit 6688294

Browse files
committed
Run rustfmt
1 parent 95663ac commit 6688294

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/main.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
use bootloader::bootinfo::BootInfo;
1212
use core::panic::PanicInfo;
1313
use core::{mem, slice};
14+
use fixedvec::alloc_stack;
1415
use usize_conversions::usize_from;
1516
use x86_64::structures::paging::{Mapper, RecursivePageTable};
1617
use x86_64::structures::paging::{Page, PageTableFlags, PhysFrame, Size2MiB};
1718
use x86_64::ux::u9;
1819
use x86_64::{PhysAddr, VirtAddr};
19-
use fixedvec::alloc_stack;
2020

2121
global_asm!(include_str!("stage_1.s"));
2222
global_asm!(include_str!("stage_2.s"));
@@ -239,8 +239,11 @@ fn load_elf(
239239

240240
if cfg!(not(feature = "recursive_level_4_table")) {
241241
// unmap recursive entry
242-
rec_page_table.unmap(recursive_page_table_addr)
243-
.expect("error deallocating recursive entry").1.flush();
242+
rec_page_table
243+
.unmap(recursive_page_table_addr)
244+
.expect("error deallocating recursive entry")
245+
.1
246+
.flush();
244247
mem::drop(rec_page_table);
245248
}
246249

src/page_table.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use crate::frame_allocator::FrameAllocator;
12
use bootloader::bootinfo::MemoryRegionType;
23
use fixedvec::FixedVec;
3-
use crate::frame_allocator::FrameAllocator;
44
use x86_64::structures::paging::{self, MapToError, RecursivePageTable, UnmapError};
55
use x86_64::structures::paging::{
66
Mapper, MapperFlush, Page, PageSize, PageTableFlags, PhysFrame, Size4KiB,

0 commit comments

Comments
 (0)