Removed serial_print{ln}, now print{ln} does the same thing

Signed-off-by: SlyMarbo <[email protected]>

Author: SlyMarbo

kernel/src/lib.rs

@@ -73,17 +73,17 @@ where
     T: Fn(),
 {
     fn run(&self) {
-        serial_print!("{}...\t", core::any::type_name::<T>());
+        print!("{}...\t", core::any::type_name::<T>());
         self();
-        serial_println!("[ok]");
+        println!("[ok]");
     }
 }
 
 /// Entry point for the set of unit
 /// tests.
 ///
 pub fn test_runner(tests: &[&dyn Testable]) {
-    serial_println!("Running {} tests", tests.len());
+    println!("Running {} tests", tests.len());
     for test in tests {
         test.run();
     }
@@ -94,8 +94,8 @@ pub fn test_runner(tests: &[&dyn Testable]) {
 /// Panic handler for tests.
 ///
 pub fn test_panic_handler(info: &PanicInfo) -> ! {
-    serial_println!("[failed]\n");
-    serial_println!("Error: {}\n", info);
+    println!("[failed]\n");
+    println!("Error: {}\n", info);
     exit_qemu(QemuExitCode::Failed);
     halt_loop();
 }

kernel/src/serial.rs

@@ -45,24 +45,3 @@ macro_rules! println {
     () => ($crate::print!("\n"));
     ($($arg:tt)*) => ($crate::print!("{}\n", format_args!($($arg)*)));
 }
-
-/// serial_print! prints to the host through
-/// the serial interface.
-///
-#[macro_export]
-macro_rules! serial_print {
-    ($($arg:tt)*) => {
-        $crate::serial::_print(format_args!($($arg)*));
-    };
-}
-
-/// serial_println! prints to the host through
-/// the serial interface, appending a newline.
-///
-#[macro_export]
-macro_rules! serial_println {
-    () => ($crate::serial_print!("\n"));
-    ($fmt:expr) => ($crate::serial_print!(concat!($fmt, "\n")));
-    ($fmt:expr, $($arg:tt)*) => ($crate::serial_print!(
-        concat!($fmt, "\n"), $($arg)*));
-}

kernel/tests/should_panic.rs

@@ -2,25 +2,25 @@
 #![no_main]
 
 use core::panic::PanicInfo;
-use kernel::{exit_qemu, serial_print, serial_println, QemuExitCode};
+use kernel::{exit_qemu, print, println, QemuExitCode};
 
 // _start is the entry point.
 #[no_mangle]
 pub extern "C" fn _start() -> ! {
     should_fail();
-    serial_println!("[test did not panic]");
+    println!("[test did not panic]");
     exit_qemu(QemuExitCode::Failed);
     loop {}
 }
 
 fn should_fail() {
-    serial_print!("should_panic::should_fail...\t");
+    print!("should_panic::should_fail...\t");
     assert_eq!(0, 1);
 }
 
 #[panic_handler]
 fn panic(_info: &PanicInfo) -> ! {
-    serial_println!("[ok]");
+    println!("[ok]");
     exit_qemu(QemuExitCode::Success);
     loop {}
 }

kernel/tests/stack_overflow.rs

@@ -3,7 +3,7 @@
 #![feature(abi_x86_interrupt)]
 
 use core::panic::PanicInfo;
-use kernel::{exit_qemu, serial_print, serial_println, QemuExitCode};
+use kernel::{exit_qemu, print, println, QemuExitCode};
 use lazy_static::lazy_static;
 use x86_64::structures::idt::InterruptDescriptorTable;
 use x86_64::structures::idt::InterruptStackFrame;
@@ -12,7 +12,7 @@ extern "x86-interrupt" fn test_double_fault_handler(
     _stack_frame: &mut InterruptStackFrame,
     _error_code: u64,
 ) -> ! {
-    serial_println!("[ok]");
+    println!("[ok]");
     exit_qemu(QemuExitCode::Success);
     loop {}
 }
@@ -36,7 +36,7 @@ pub fn init_test_idt() {
 
 #[no_mangle]
 pub extern "C" fn _start() -> ! {
-    serial_print!("stack_overflow::stack_overflow...\t");
+    print!("stack_overflow::stack_overflow...\t");
 
     kernel::gdt::init();
     init_test_idt();