michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Run cargo fmt for post-10

Browse Source
This commit is contained in:
Philipp Oppermann
2025-03-27 16:14:35 +01:00
parent 34195ec8b7
commit 569232322e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/allocator.rs
View File

@@ -2,10 +2,10 @@ use alloc::alloc::{GlobalAlloc, Layout};
use core::ptr::null_mut; use core::ptr::null_mut;
use linked_list_allocator::LockedHeap; use linked_list_allocator::LockedHeap;
use x86_64::{ use x86_64::{
structures::paging::{
mapper::MapToError, FrameAllocator, Mapper, Page, PageTableFlags, Size4KiB,
},
VirtAddr, VirtAddr,
structures::paging::{
FrameAllocator, Mapper, Page, PageTableFlags, Size4KiB, mapper::MapToError,
},
}; };
pub const HEAP_START: usize = 0x_4444_4444_0000; pub const HEAP_START: usize = 0x_4444_4444_0000;

2
tests/heap_allocation.rs
View File

@@ -8,7 +8,7 @@ extern crate alloc;
use alloc::{boxed::Box, vec::Vec}; use alloc::{boxed::Box, vec::Vec};
use blog_os::allocator::HEAP_SIZE; use blog_os::allocator::HEAP_SIZE;
use bootloader::{entry_point, BootInfo}; use bootloader::{BootInfo, entry_point};
use core::panic::PanicInfo; use core::panic::PanicInfo;
entry_point!(main); entry_point!(main);