From c3280cbbfc8cb710c36ac50b2857a23dd61709a9 Mon Sep 17 00:00:00 2001 From: August Date: Tue, 30 Jun 2026 21:27:27 +0000 Subject: [PATCH] shut up clippy --- build.rs | 2 +- src/kernel/main.rs | 21 +++++++++++++++------ src/userboot/main.rs | 6 +++--- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/build.rs b/build.rs index db2e744..657622b 100644 --- a/build.rs +++ b/build.rs @@ -4,4 +4,4 @@ fn main() { println!("cargo:rustc-link-arg=-Tsrc/linker_scripts/{arch}/linker.ld"); // ..and to re-run if it changes. println!("cargo:rerun-if-changed=src/linker_scripts/{arch}linker.ld"); -} \ No newline at end of file +} diff --git a/src/kernel/main.rs b/src/kernel/main.rs index f650ab1..4eca7b4 100644 --- a/src/kernel/main.rs +++ b/src/kernel/main.rs @@ -41,7 +41,9 @@ use crate::{ gdt::dump_gdt, interrupts::get_lapic_addr, }, - }, boot::modules::MODULE_RESPONSE, memory::paging::{self, active_root_table, map_page, phys_to_virt}, + }, + boot::modules::MODULE_RESPONSE, + memory::paging::{self, active_root_table, map_page, phys_to_virt}, }; lazy_static! { @@ -203,11 +205,18 @@ unsafe extern "C" fn main() -> ! { let res = map_page(phys_to_virt(lapic), mapping); log_info!("Map status: {:?}", res); - if let Some(modules_list) = *MODULE_RESPONSE { - if modules_list.modules()[0].path().ends_with("/userboot") { - log_info!("Found userboot: {} {}", modules_list.modules()[0].path(), modules_list.modules()[0].cmdline()); - log_info!("Start address: 0x{:x}", modules_list.modules()[0].data().as_ptr() as usize); - } + if let Some(modules_list) = *MODULE_RESPONSE + && modules_list.modules()[0].path().ends_with("/userboot") + { + log_info!( + "Found userboot: {} {}", + modules_list.modules()[0].path(), + modules_list.modules()[0].cmdline() + ); + log_info!( + "Start address: 0x{:x}", + modules_list.modules()[0].data().as_ptr() as usize + ); } panic!("Finished boot, but cannot start init because processes not implemented!"); diff --git a/src/userboot/main.rs b/src/userboot/main.rs index 077bd11..b756363 100644 --- a/src/userboot/main.rs +++ b/src/userboot/main.rs @@ -5,10 +5,10 @@ use core::panic::PanicInfo; #[unsafe(no_mangle)] unsafe extern "C" fn main() -> ! { - loop {} + panic!() } #[panic_handler] -pub fn panic(info: &PanicInfo) -> ! { +pub fn panic(_info: &PanicInfo) -> ! { loop {} -} \ No newline at end of file +}