refactor: 修复clippy警告

但是safety懒得写了

Author: moyanj

kernel/src/libs/bitmap.rs

@@ -73,6 +73,12 @@ impl<const N: usize> BitMap<N> {
     }
 }
 
+impl<const N: usize> Default for BitMap<N> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 pub struct PreAllocBitMap<const N: usize> {
     bits: [u64; N],
 }
@@ -132,6 +138,12 @@ impl<const N: usize> PreAllocBitMap<N> {
     }
 }
 
+impl<const N: usize> Default for PreAllocBitMap<N> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

kernel/src/memory/frame/buddy.rs

@@ -282,6 +282,8 @@ impl<const MAX_ORDER: usize> BuddyAllocator<MAX_ORDER> {
     }
 
     /// Deallocate a frame of the given order.
+    /// # Safety
+    /// This function is unsafe because it does not check if the frame is allocated.
     pub unsafe fn dealloc(&mut self, frame: PhysFrame<Size4KiB>, order: usize) {
         if self.used_frames >= (1 << order) {
             self.used_frames -= 1 << order;
@@ -295,6 +297,8 @@ impl<const MAX_ORDER: usize> BuddyAllocator<MAX_ORDER> {
 
     /// Deallocate a range of frames.
     /// This splits the range into power-of-two blocks and deallocates them.
+    /// # Safety
+    /// This function is unsafe because it does not check if the frames are allocated.
     pub unsafe fn dealloc_range(&mut self, start: PhysFrame<Size4KiB>, end: PhysFrame<Size4KiB>) {
         let mut current = start;
         while current < end {
@@ -306,10 +310,10 @@ impl<const MAX_ORDER: usize> BuddyAllocator<MAX_ORDER> {
             while order < MAX_ORDER - 1 {
                 let next_order = order + 1;
                 let size_frames = 1 << next_order;
-                let size_bytes = 4096 * (size_frames as u64);
+                let size_bytes = 4096 * size_frames;
 
                 // Check alignment
-                if current_addr % size_bytes != 0 {
+                if !current_addr.is_multiple_of(size_bytes) {
                     break;
                 }
                 // Check size
@@ -321,12 +325,11 @@ impl<const MAX_ORDER: usize> BuddyAllocator<MAX_ORDER> {
 
             self.dealloc(current, order);
             // PhysFrame + u64 is supported
-            current = current + (1 << order);
+            current += 1 << order;
         }
     }
 
     /// Get the total number of frames managed.
-
     pub fn total_frames(&self) -> usize {
         self.total_frames
     }
@@ -341,3 +344,9 @@ impl<const MAX_ORDER: usize> BuddyAllocator<MAX_ORDER> {
         self.total_frames - self.used_frames
     }
 }
+
+impl<const MAX_ORDER: usize> Default for BuddyAllocator<MAX_ORDER> {
+    fn default() -> Self {
+        Self::new()
+    }
+}

kernel/src/memory/frame/mod.rs

@@ -69,8 +69,8 @@ impl LockedFrameAllocator {
 
             // 2. Allocate bitmap
             // Bitmap needs 1 bit per page.
-            let total_pages = (max_phys_addr as usize + PAGE_SIZE - 1) / PAGE_SIZE;
-            let bitmap_size_u64 = (total_pages + 63) / 64;
+            let total_pages = (max_phys_addr as usize).div_ceil(PAGE_SIZE);
+            let bitmap_size_u64 = total_pages.div_ceil(64);
             let bitmap_size_bytes = bitmap_size_u64 * 8;
 
             let mut bitmap_slice: Option<&'static mut [u64]> = None;

kernel/src/memory/heap.rs

@@ -31,7 +31,7 @@ impl talc::OomHandler for KernelOomHandler {
                 .ok_or(())?;
             let old_end = heap_area.end;
             let expand_size = crate::config::OOM_EXPAND_SIZE.max(4 * 1024 * 1024);
-            let new_end = old_end + (expand_size as u64);
+            let new_end = old_end + expand_size;
             heap_area.end = new_end;
             (old_end, new_end)
         };

kernel/src/output/console/console_ttf.rs

@@ -221,18 +221,13 @@ impl<'a> TtfConsole<'a> {
     }
 
     pub fn set_font(&mut self, new_font_data: &'static [u8], new_font_size: Option<f32>) {
-        match FontRef::try_from_slice(new_font_data) {
-            Ok(new_font) => {
-                self.font = new_font;
-                let size_to_use = new_font_size.unwrap_or(self.font_size);
-                self.init_font_metrics(size_to_use);
-                self.cursor_needs_redraw = true;
-                self.glyph_cache.clear();
-                self.redraw();
-            }
-            Err(_) => {
-                return;
-            }
+        if let Ok(new_font) = FontRef::try_from_slice(new_font_data) {
+            self.font = new_font;
+            let size_to_use = new_font_size.unwrap_or(self.font_size);
+            self.init_font_metrics(size_to_use);
+            self.cursor_needs_redraw = true;
+            self.glyph_cache.clear();
+            self.redraw();
         }
     }
 

kernel/src/panic.rs

@@ -71,15 +71,13 @@ impl<'a> PanicConsole<'a> {
             return;
         }
         let glyph = FONT8X16[c as usize & 0x7F];
-        for row in 0..16 {
-            for col in 0..8 {
-                let color = if glyph[row] & (0x80 >> col) != 0 {
-                    fg
-                } else {
-                    bg
-                };
-                self.set_pixel(self.x + col as u64, self.y + row as u64, color);
-            }
+        for (row, col) in glyph.iter().enumerate() {
+            let color = if glyph[row] & (0x80 >> col) != 0 {
+                fg
+            } else {
+                bg
+            };
+            self.set_pixel(self.x + *col as u64, self.y + row as u64, color);
         }
         self.x += 8;
         if self.x + 8 > self.framebuffer.width() - 20 {
@@ -92,9 +90,9 @@ impl<'a> PanicConsole<'a> {
 impl<'a> Write for PanicConsole<'a> {
     fn write_str(&mut self, s: &str) -> core::fmt::Result {
         let fb = &self.framebuffer;
-        let fg = ((255 as u32) << fb.red_mask_shift())
-            | ((255 as u32) << fb.green_mask_shift())
-            | ((255 as u32) << fb.blue_mask_shift());
+        let fg = ((255_u32) << fb.red_mask_shift())
+            | ((255_u32) << fb.green_mask_shift())
+            | ((255_u32) << fb.blue_mask_shift());
         let bg = ((BG_COLOR.r as u32) << fb.red_mask_shift())
             | ((BG_COLOR.g as u32) << fb.green_mask_shift())
             | ((BG_COLOR.b as u32) << fb.blue_mask_shift());
@@ -108,6 +106,7 @@ impl<'a> Write for PanicConsole<'a> {
 
 // This is the default panic handler
 #[cfg(not(test))]
+#[warn(unused_must_use)]
 #[panic_handler]
 pub fn panic(info: &PanicInfo) -> ! {
     let boot_time = crate::libs::time::time_since_boot();
@@ -179,48 +178,57 @@ pub fn panic(info: &PanicInfo) -> ! {
             let mut console = PanicConsole::new(framebuffer);
             console.clear(bg);
 
-            let _ = write!(console, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
-            let _ = write!(console, "!!                            PROKA KERNEL PANIC                              !!\n");
-            let _ = write!(console, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
-            let _ = write!(console, "\n");
-            let _ = write!(
+            let _ = writeln!(
+                console,
+                "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+            );
+            let _ = writeln!(
+                console,
+                "!!                            PROKA KERNEL PANIC                              !!"
+            );
+            let _ = writeln!(
+                console,
+                "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+            );
+            let _ = writeln!(console);
+            let _ = writeln!(
                 console,
-                "A problem has been detected and the system has been halted to prevent damage.\n"
+                "A problem has been detected and the system has been halted to prevent damage."
             );
-            let _ = write!(console, "\n");
-            let _ = write!(console, "--- ERROR INFO ---\n");
-            let _ = write!(console, "Reason:   {}\n", info.message());
+            let _ = writeln!(console);
+            let _ = writeln!(console, "--- ERROR INFO ---");
+            let _ = writeln!(console, "Reason:   {}", info.message());
             if is_exception {
-                let _ = write!(console, "Exception: {}\n", exc_name);
+                let _ = writeln!(console, "Exception: {}", exc_name);
                 if let Some(err) = exc_error {
-                    let _ = write!(console, "Error Code: {:#x}\n", err);
+                    let _ = writeln!(console, "Error Code: {:#x}", err);
                 }
             }
             if let Some(location) = info.location() {
-                let _ = write!(
+                let _ = writeln!(
                     console,
-                    "Location: {}, line {}\n",
+                    "Location: {}, line {}",
                     location.file(),
                     location.line()
                 );
             }
-            let _ = write!(console, "\n");
-            let _ = write!(console, "--- SYSTEM STATE ---\n");
-            let _ = write!(console, "Boot Time: {:.4}s\n", boot_time);
-            let _ = write!(console, "RIP:       {:#018x}\n", rip);
-            let _ = write!(console, "RFLAGS:    {:#018x}\n", rflags);
-            let _ = write!(console, "\n");
-            let _ = write!(console, "--- REGISTERS ---\n");
-            let _ = write!(console, "RAX: {:#018x}  RBX: {:#018x}\n", rax, rbx);
-            let _ = write!(console, "RCX: {:#018x}  RDX: {:#018x}\n", rcx, rdx);
-            let _ = write!(console, "RSI: {:#018x}  RDI: {:#018x}\n", rsi, rdi);
-            let _ = write!(console, "RBP: {:#018x}  RSP: {:#018x}\n", rbp, rsp);
-            let _ = write!(console, "R8:  {:#018x}  R9:  {:#018x}\n", r8, r9);
-            let _ = write!(console, "R10: {:#018x}  R11: {:#018x}\n", r10, r11);
-            let _ = write!(console, "R12: {:#018x}  R13: {:#018x}\n", r12, r13);
-            let _ = write!(console, "R14: {:#018x}  R15: {:#018x}\n", r14, r15);
-            let _ = write!(console, "\n");
-            let _ = write!(console, "Please restart your computer.\n");
+            let _ = writeln!(console);
+            let _ = writeln!(console, "--- SYSTEM STATE ---");
+            let _ = writeln!(console, "Boot Time: {:.4}s", boot_time);
+            let _ = writeln!(console, "RIP:       {:#018x}", rip);
+            let _ = writeln!(console, "RFLAGS:    {:#018x}", rflags);
+            let _ = writeln!(console);
+            let _ = writeln!(console, "--- REGISTERS ---");
+            let _ = writeln!(console, "RAX: {:#018x}  RBX: {:#018x}", rax, rbx);
+            let _ = writeln!(console, "RCX: {:#018x}  RDX: {:#018x}", rcx, rdx);
+            let _ = writeln!(console, "RSI: {:#018x}  RDI: {:#018x}", rsi, rdi);
+            let _ = writeln!(console, "RBP: {:#018x}  RSP: {:#018x}", rbp, rsp);
+            let _ = writeln!(console, "R8:  {:#018x}  R9:  {:#018x}", r8, r9);
+            let _ = writeln!(console, "R10: {:#018x}  R11: {:#018x}", r10, r11);
+            let _ = writeln!(console, "R12: {:#018x}  R13: {:#018x}", r12, r13);
+            let _ = writeln!(console, "R14: {:#018x}  R15: {:#018x}", r14, r15);
+            let _ = writeln!(console);
+            let _ = writeln!(console, "Please restart your computer.");
         }
     }
 
@@ -239,6 +247,6 @@ pub fn panic(info: &PanicInfo) -> ! {
 #[cfg(test)]
 pub fn panic_for_test(info: &PanicInfo) -> ! {
     serial_println!("[FAILED]");
-    serial_println!("Caused by:\n\t{}", info);
+    serial_println!("Caused by:\t{}", info);
     crate::test::long_jmp();
 }