rustfmt.toml

adamperkowski · Sep 6, 2024 · 688eef4 · 688eef4
1 parent 6f3457d
commit 688eef4
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 73 deletions.
diff --git a/kernel/rustfmt.toml b/kernel/rustfmt.toml
@@ -0,0 +1,4 @@
+max_width = 120
+tab_spaces = 4
+reorder_imports = true
+reorder_modules = true
diff --git a/kernel/src/allocator.rs b/kernel/src/allocator.rs
@@ -2,9 +2,7 @@ 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,
-    },
+    structures::paging::{mapper::MapToError, FrameAllocator, Mapper, Page, PageTableFlags, Size4KiB},
     VirtAddr,
 };
 

diff --git a/kernel/src/allocator/linked_list.rs b/kernel/src/allocator/linked_list.rs
@@ -29,9 +29,7 @@ pub struct LinkedListAllocator {
 #[allow(clippy::missing_safety_doc)]
 impl LinkedListAllocator {
     pub const fn new() -> Self {
-        Self {
-            head: ListNode::new(0),
-        }
+        Self { head: ListNode::new(0) }
     }
 
     pub unsafe fn init(&mut self, heap_start: usize, heap_size: usize) {

diff --git a/kernel/src/cmd/mod.rs b/kernel/src/cmd/mod.rs
@@ -91,19 +91,15 @@ fn document(_args: Vec<&str>) -> i32 {
             println!("{}  >>  {}", command.name, command.doc);
             0
         } else {
-            WRITER.lock().print_colored(
-                "Command not found.\n".to_string(),
-                Color::LightRed,
-                Color::Black,
-            );
+            WRITER
+                .lock()
+                .print_colored("Command not found.\n".to_string(), Color::LightRed, Color::Black);
             3
         }
     } else {
-        WRITER.lock().print_colored(
-            "No command specified.\n".to_string(),
-            Color::LightRed,
-            Color::Black,
-        );
+        WRITER
+            .lock()
+            .print_colored("No command specified.\n".to_string(), Color::LightRed, Color::Black);
         4
     }
 }
@@ -113,17 +109,12 @@ fn chcolor(_args: Vec<&str>) -> i32 {
         let mut new_colors: vec::Vec<Color> = vec![];
 
         for arg in _args {
-            if let Some(color) = STR_COLORS
-                .iter()
-                .find(|&col| col.name == arg.replace("\n", ""))
-            {
+            if let Some(color) = STR_COLORS.iter().find(|&col| col.name == arg.replace("\n", "")) {
                 new_colors.push(color.color);
             } else {
-                WRITER.lock().print_colored(
-                    format!("Color not found: {}\n", arg),
-                    Color::LightRed,
-                    Color::Black,
-                );
+                WRITER
+                    .lock()
+                    .print_colored(format!("Color not found: {}\n", arg), Color::LightRed, Color::Black);
                 return 4;
             }
         }

diff --git a/kernel/src/interrupts.rs b/kernel/src/interrupts.rs
@@ -38,8 +38,7 @@ lazy_static! {
 pub const PIC_0_OFFSET: u8 = 32;
 pub const PIC_1_OFFSET: u8 = PIC_0_OFFSET + 8;
 
-pub static PICS: spin::Mutex<ChainedPics> =
-    spin::Mutex::new(unsafe { ChainedPics::new(PIC_0_OFFSET, PIC_1_OFFSET) });
+pub static PICS: spin::Mutex<ChainedPics> = spin::Mutex::new(unsafe { ChainedPics::new(PIC_0_OFFSET, PIC_1_OFFSET) });
 
 #[derive(Debug, Clone, Copy)]
 #[repr(u8)]
@@ -70,17 +69,13 @@ extern "x86-interrupt" fn breakpoint_handler(stack_frame: InterruptStackFrame) {
     );
 }
 
-extern "x86-interrupt" fn double_fault_handler(
-    stack_frame: InterruptStackFrame,
-    _error_code: u64,
-) -> ! {
+extern "x86-interrupt" fn double_fault_handler(stack_frame: InterruptStackFrame, _error_code: u64) -> ! {
     panic!("\nKERNEL CRASHED\nEX: DOUBLE FAULT\n{:#?}\n", stack_frame);
 }
 
 extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: InterruptStackFrame) {
     unsafe {
-        PICS.lock()
-            .notify_end_of_interrupt(InterruptIndex::Timer.as_u8());
+        PICS.lock().notify_end_of_interrupt(InterruptIndex::Timer.as_u8());
     }
 }
 
@@ -90,12 +85,11 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStac
     use x86_64::instructions::port::Port;
 
     lazy_static! {
-        static ref KEYBOARD: Mutex<Keyboard<layouts::Us104Key, ScancodeSet1>> =
-            Mutex::new(Keyboard::new(
-                ScancodeSet1::new(),
-                layouts::Us104Key,
-                HandleControl::Ignore
-            ));
+        static ref KEYBOARD: Mutex<Keyboard<layouts::Us104Key, ScancodeSet1>> = Mutex::new(Keyboard::new(
+            ScancodeSet1::new(),
+            layouts::Us104Key,
+            HandleControl::Ignore
+        ));
     }
 
     if unsafe { BUFFER_INDEX } < BUFFER_SIZE {
@@ -153,10 +147,7 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStac
                                     }
                                 }
 
-                                for i in cmd_history.history
-                                    [cmd_history.history.len() - cmd_history.last - 1]
-                                    .chars()
-                                {
+                                for i in cmd_history.history[cmd_history.history.len() - cmd_history.last - 1].chars() {
                                     unsafe {
                                         BUFFER[BUFFER_INDEX] = i;
                                         BUFFER_INDEX += 1;
@@ -182,10 +173,7 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStac
 
                                 cmd_history.last -= 1;
 
-                                for i in cmd_history.history
-                                    [cmd_history.history.len() - cmd_history.last]
-                                    .chars()
-                                {
+                                for i in cmd_history.history[cmd_history.history.len() - cmd_history.last].chars() {
                                     unsafe {
                                         BUFFER[BUFFER_INDEX] = i;
                                         BUFFER_INDEX += 1;
@@ -213,15 +201,11 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStac
     }
 
     unsafe {
-        PICS.lock()
-            .notify_end_of_interrupt(InterruptIndex::Keyboard.as_u8());
+        PICS.lock().notify_end_of_interrupt(InterruptIndex::Keyboard.as_u8());
     }
 }
 
-extern "x86-interrupt" fn page_fault_handler(
-    stack_frame: InterruptStackFrame,
-    error_code: PageFaultErrorCode,
-) {
+extern "x86-interrupt" fn page_fault_handler(stack_frame: InterruptStackFrame, error_code: PageFaultErrorCode) {
     use x86_64::registers::control::Cr2;
 
     WRITER.lock().print_colored(

diff --git a/kernel/src/main.rs b/kernel/src/main.rs
@@ -43,10 +43,7 @@ pub fn init_kernel(boot_info: &'static BootInfo) {
     allocator::init_heap(&mut mapper, &mut frame_allocator).expect("Heap initialization failed");
 
     #[cfg(debug_assertions)]
-    print!(
-        "\nHighlightOS v{} DEBUG\n\nhls < ",
-        env!("CARGO_PKG_VERSION")
-    );
+    print!("\nHighlightOS v{} DEBUG\n\nhls < ", env!("CARGO_PKG_VERSION"));
 
     #[cfg(not(debug_assertions))]
     print!("\nHighlightOS v{}\n\nhls < ", env!("CARGO_PKG_VERSION"));
@@ -75,8 +72,7 @@ fn kernel_main(boot_info: &'static BootInfo) -> ! {
                     let rtr = (command.fun)(args);
 
                     if rtr != 1 {
-                        if let Some(return_code) = RTR_LIST.iter().find(|&rtr_t| rtr_t.code == &rtr)
-                        {
+                        if let Some(return_code) = RTR_LIST.iter().find(|&rtr_t| rtr_t.code == &rtr) {
                             println!("\n > {}\n{} : {}\n", req_com, rtr, return_code.info);
                         } else {
                             println!("\n > {}\nreturned : {}\n", req_com, rtr);
@@ -92,8 +88,7 @@ fn kernel_main(boot_info: &'static BootInfo) -> ! {
 
                 let mut cmd_history = CMD_HISTORY.lock();
                 if !cmd_history.history.is_empty() {
-                    if cmd_history.history[cmd_history.history.len() - 1] != input.replace("\n", "")
-                    {
+                    if cmd_history.history[cmd_history.history.len() - 1] != input.replace("\n", "") {
                         cmd_history.history.push(input.replace("\n", ""));
                     }
                 } else {
@@ -129,10 +124,8 @@ const RTR_LIST: &[RtrType] = &[
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    WRITER.lock().print_colored(
-        format!("KERNEL CRASHED\n{}\n", info),
-        Color::Red,
-        Color::Black,
-    );
+    WRITER
+        .lock()
+        .print_colored(format!("KERNEL CRASHED\n{}\n", info), Color::Red, Color::Black);
     hlkernel::hlt_loop();
 }
diff --git a/kernel/src/mem.rs b/kernel/src/mem.rs
@@ -1,8 +1,6 @@
 use bootloader::bootinfo::{MemoryMap, MemoryRegionType};
 use x86_64::{
-    structures::paging::{
-        FrameAllocator, Mapper, OffsetPageTable, Page, PageTable, PhysFrame, Size4KiB,
-    },
+    structures::paging::{FrameAllocator, Mapper, OffsetPageTable, Page, PageTable, PhysFrame, Size4KiB},
     PhysAddr, VirtAddr,
 };
 
@@ -58,10 +56,7 @@ pub struct BootInfoFrameAlloc {
 #[allow(clippy::missing_safety_doc)]
 impl BootInfoFrameAlloc {
     pub unsafe fn init(memory_map: &'static MemoryMap) -> Self {
-        BootInfoFrameAlloc {
-            memory_map,
-            next: 0,
-        }
+        BootInfoFrameAlloc { memory_map, next: 0 }
     }
     fn usable_frames(&self) -> impl Iterator<Item = PhysFrame> {
         let regions = self.memory_map.iter();