diff --git a/src/main.rs b/src/main.rs index d448574..da1cd90 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,9 +11,9 @@ use x86_64::instructions::hlt; mod color; mod serial; -mod vga_buffer; mod testable; mod utils; +mod vga_buffer; #[cfg(test)] fn test_runner(tests: &[&dyn Fn()]) { @@ -30,7 +30,6 @@ fn trivial_assertion() { assert_eq!(1, 1); } - #[cfg(not(test))] #[panic_handler] fn panic(info: &PanicInfo) -> ! { diff --git a/src/testable.rs b/src/testable.rs index 83b6d14..cc49194 100644 --- a/src/testable.rs +++ b/src/testable.rs @@ -1,4 +1,4 @@ -use crate::{serial_print,serial_println}; +use crate::{serial_print, serial_println}; pub trait Testable { fn run(&self) -> (); @@ -13,4 +13,4 @@ where self(); serial_println!("[ok]"); } -} \ No newline at end of file +} diff --git a/src/utils.rs b/src/utils.rs index 0569e48..f8451ef 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -17,7 +17,6 @@ pub fn exit_qemu(exit_code: QemuExitCode) { } pub fn print_logo() { - let text = r###" _ _ __ _ |_ |_) _ _|_/ \(_ @@ -26,4 +25,4 @@ pub fn print_logo() { crate::vga_buffer::change_color(crate::color::Color::BrightRed); println!("{}", text); crate::vga_buffer::reset_color(); -} \ No newline at end of file +} diff --git a/src/vga_buffer.rs b/src/vga_buffer.rs index 7434b06..025e123 100644 --- a/src/vga_buffer.rs +++ b/src/vga_buffer.rs @@ -100,8 +100,7 @@ impl fmt::Write for Writer { } } - -pub fn change_color(color : Color) { +pub fn change_color(color: Color) { WRITER.lock().color_code = ColorCode::new(color, Color::Black); } pub fn reset_color() {