From f5f5aeb8dc2d32e7d47bd8414fab80fe99fcfbbc Mon Sep 17 00:00:00 2001 From: Jacob Hinchliffe Date: Sat, 22 Feb 2025 03:09:46 +0000 Subject: [PATCH] Formatting changes, called 'cargo fmt' --- kernel/build.rs | 4 ++-- kernel/src/arch/mod.rs | 2 +- kernel/src/arch/x86_64/interrupts.rs | 6 +----- kernel/src/arch/x86_64/mod.rs | 2 +- kernel/src/lib.rs | 10 +++------- kernel/src/main.rs | 14 +++++--------- lib/lib_application | 2 +- lib/lib_ascii | 2 +- lib/lib_framebuffer | 2 +- lib/lib_serial | 2 +- 10 files changed, 17 insertions(+), 29 deletions(-) diff --git a/kernel/build.rs b/kernel/build.rs index a9b7914..9553c96 100644 --- a/kernel/build.rs +++ b/kernel/build.rs @@ -1,10 +1,10 @@ +use cc; use std::process::Command; use std::{env, path::Path}; -use cc; fn main() { // Tell cargo to rerun if these files change println!("cargo:rerun-if-changed=src"); println!("cargo:rerun-if-changed=linker.ld"); println!("cargo:rerun-if-changed=../config/limine.conf"); -} \ No newline at end of file +} diff --git a/kernel/src/arch/mod.rs b/kernel/src/arch/mod.rs index 0bffdbe..2a99bf5 100644 --- a/kernel/src/arch/mod.rs +++ b/kernel/src/arch/mod.rs @@ -1 +1 @@ -pub mod x86_64; \ No newline at end of file +pub mod x86_64; diff --git a/kernel/src/arch/x86_64/interrupts.rs b/kernel/src/arch/x86_64/interrupts.rs index 56a0b21..9f4d82a 100644 --- a/kernel/src/arch/x86_64/interrupts.rs +++ b/kernel/src/arch/x86_64/interrupts.rs @@ -9,14 +9,10 @@ static IDT: Lazy = Lazy::new(|| { idt }); - pub fn init_idt() { IDT.load(); } -extern "x86-interrupt" fn breakpoint_handler( - stack_frame: InterruptStackFrame -) { +extern "x86-interrupt" fn breakpoint_handler(stack_frame: InterruptStackFrame) { println_log!("Exception: Breakpoint\n{:#?}", stack_frame); } - diff --git a/kernel/src/arch/x86_64/mod.rs b/kernel/src/arch/x86_64/mod.rs index 4c09fa4..136e70b 100644 --- a/kernel/src/arch/x86_64/mod.rs +++ b/kernel/src/arch/x86_64/mod.rs @@ -1 +1 @@ -pub mod interrupts; \ No newline at end of file +pub mod interrupts; diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs index 78dd3ba..3ea6f29 100644 --- a/kernel/src/lib.rs +++ b/kernel/src/lib.rs @@ -1,19 +1,17 @@ #![no_std] - #![feature(abi_x86_interrupt)] use core::arch::asm; use limine::request::{RequestsEndMarker, RequestsStartMarker}; use limine::BaseRevision; -pub use lib_serial::{serial_print, serial_println, serial_read}; pub use lib_ascii::{print, print_log, println, println_log, WRITER}; +pub use lib_serial::{serial_print, serial_println, serial_read}; mod arch; use lib_framebuffer; - /// Sets the base revision to the latest revision supported by the crate. /// See specification for further info. /// Be sure to mark all limine requests with #[used], otherwise they may be removed by the compiler. @@ -49,14 +47,12 @@ pub fn hcf() -> ! { } pub fn boot() -> Result<(), &'static str> { - if !BASE_REVISION.is_supported() { return Err("base revision not supported"); } lib_serial::init()?; arch::x86_64::interrupts::init_idt(); - - + Ok(()) -} \ No newline at end of file +} diff --git a/kernel/src/main.rs b/kernel/src/main.rs index 552e081..5e64b54 100644 --- a/kernel/src/main.rs +++ b/kernel/src/main.rs @@ -1,9 +1,7 @@ #![no_std] #![no_main] -use FoundryOS::{ - println, println_log -}; +use FoundryOS::{println, println_log}; #[no_mangle] unsafe extern "C" fn kmain() -> ! { @@ -21,7 +19,8 @@ unsafe extern "C" fn kmain() -> ! { println!("Dimensions: {}x{} (px)", dimensions2.0, dimensions2.1); println!("Dimensions: {}x{} (chars)", dimensions.0, dimensions.1); - println!(" + println!( + " $$$$$$$$\\ $$\\ $$ _____| $$ | $$ | $$$$$$\\ $$\\ $$\\ $$$$$$$\\ $$$$$$$ | $$$$$$\\ $$\\ $$\\ @@ -38,11 +37,8 @@ unsafe extern "C" fn kmain() -> ! { $$ | $$ |$$\\ $$ | \\$$$ / $$ | $$$$$$ |\\$$$$$$ | \\$ / $$$$$$\\ \\______/ \\______/ \\_/ \\______| - "); + " + ); - FoundryOS::hcf(); } - - - diff --git a/lib/lib_application b/lib/lib_application index df1cbd1..4b1c606 160000 --- a/lib/lib_application +++ b/lib/lib_application @@ -1 +1 @@ -Subproject commit df1cbd1170723ad75045052dec5b2641fb154591 +Subproject commit 4b1c60676a2f67c2f95139ef2820238cdcbbf19e diff --git a/lib/lib_ascii b/lib/lib_ascii index fefe217..d48792e 160000 --- a/lib/lib_ascii +++ b/lib/lib_ascii @@ -1 +1 @@ -Subproject commit fefe217980e5535bfb9de4de1dbc84db3def93ae +Subproject commit d48792ecd011f88acb84e93e2e2ba33ac2598a72 diff --git a/lib/lib_framebuffer b/lib/lib_framebuffer index c515b89..5355327 160000 --- a/lib/lib_framebuffer +++ b/lib/lib_framebuffer @@ -1 +1 @@ -Subproject commit c515b8913625728924cef92993cb65aa03e2b1c5 +Subproject commit 53553278d11e798f8dc770b9f5efe50d9b737c68 diff --git a/lib/lib_serial b/lib/lib_serial index 92032eb..6731ed5 160000 --- a/lib/lib_serial +++ b/lib/lib_serial @@ -1 +1 @@ -Subproject commit 92032eb5b400fe1afd851dfd613e6d98f04eda40 +Subproject commit 6731ed5ef601201f746946f4c0eea90050414f2a