e

src/main.rs

@@ -4,10 +4,10 @@
 #![test_runner(CrystalOS::test_runner)]
 #![reexport_test_harness_main = "test_main"]
 
+use bootloader::{entry_point, BootInfo};
 use core::panic::PanicInfo;
-use CrystalOS::{println, print, println_log, print_log, kernel, printerr};
+use CrystalOS::kernel::tasks::{executor::Executor, Task};
-use CrystalOS::kernel::tasks::{Task, executor::Executor};
+use CrystalOS::{kernel, print, print_log, printerr, println, println_log};
-use bootloader::{BootInfo, entry_point};
 extern crate alloc;
 use CrystalOS::user::bin::shell;
 
@@ -25,22 +25,21 @@ fn panic(info: &PanicInfo) -> ! {
     CrystalOS::test_panic_handler(info)
 }
 
+// some comment
+
 entry_point!(main);
 
-
 fn main(boot_info: &'static BootInfo) -> ! {
+    use x86_64::VirtAddr;
     use CrystalOS::kernel::allocator;
     use CrystalOS::kernel::memory;
     use CrystalOS::kernel::memory::BootInfoFrameAllocator;
-	use x86_64::VirtAddr;
 
     CrystalOS::init();
 
     let physical_memory_offset = VirtAddr::new(boot_info.physical_memory_offset);
     let mut mapper = unsafe { memory::init(physical_memory_offset) };
-	let mut frame_allocator = unsafe {
+    let mut frame_allocator = unsafe { BootInfoFrameAllocator::init(&boot_info.memory_map) };
-		BootInfoFrameAllocator::init(&boot_info.memory_map)
-	};
 
     allocator::init_heap(&mut mapper, &mut frame_allocator).expect("heap initialisation failed");
 
@@ -48,7 +47,6 @@ fn main(boot_info: &'static BootInfo) -> ! {
 
     executor.spawn(Task::new(shell::command_handler()));
 
-
     loop {
         executor.try_run();
     }
@@ -58,5 +56,3 @@ fn main(boot_info: &'static BootInfo) -> ! {
 
     loop {}
 }
-
-