michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-17 06:47:49 +00:00
Code Issues Projects Releases Wiki Activity

Run rustfmt

Browse Source
This commit is contained in:
Philipp Oppermann
2018-06-12 19:26:17 +02:00
parent 8b5be6ebc0
commit 6529cbc674
5 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/test-basic-boot.rs
View File

@@ -7,9 +7,9 @@
#[macro_use] #[macro_use]
extern crate blog_os; extern crate blog_os;
use blog_os::exit_qemu;
#[cfg(not(test))] #[cfg(not(test))]
use core::panic::PanicInfo; use core::panic::PanicInfo;
use blog_os::exit_qemu;
/// This function is the entry point, since the linker looks for a function /// This function is the entry point, since the linker looks for a function
/// named `_start_` by default. /// named `_start_` by default.
@@ -18,11 +18,12 @@ use blog_os::exit_qemu;
pub extern "C" fn _start() -> ! { pub extern "C" fn _start() -> ! {
serial_println!("ok"); serial_println!("ok");
unsafe { exit_qemu(); } unsafe {
exit_qemu();
}
loop {} loop {}
} }
/// This function is called on panic. /// This function is called on panic.
#[cfg(not(test))] #[cfg(not(test))]
#[panic_implementation] #[panic_implementation]
@@ -32,6 +33,8 @@ pub fn panic(info: &PanicInfo) -> ! {
serial_println!("{}", info); serial_println!("{}", info);
unsafe { exit_qemu(); } unsafe {
exit_qemu();
}
loop {} loop {}
} }

6
src/bin/test-panic.rs
View File

@@ -6,9 +6,9 @@
#[macro_use] #[macro_use]
extern crate blog_os; extern crate blog_os;
use blog_os::exit_qemu;
#[cfg(not(test))] #[cfg(not(test))]
use core::panic::PanicInfo; use core::panic::PanicInfo;
use blog_os::exit_qemu;
#[cfg(not(test))] #[cfg(not(test))]
#[no_mangle] #[no_mangle]
@@ -22,6 +22,8 @@ pub extern "C" fn _start() -> ! {
pub fn panic(_info: &PanicInfo) -> ! { pub fn panic(_info: &PanicInfo) -> ! {
serial_println!("ok"); serial_println!("ok");
unsafe { exit_qemu(); } unsafe {
exit_qemu();
}
loop {} loop {}
} }

2
src/lib.rs
View File

@@ -13,8 +13,8 @@ extern crate array_init;
#[cfg(test)] #[cfg(test)]
extern crate std; extern crate std;
pub mod vga_buffer;
pub mod serial; pub mod serial;
pub mod vga_buffer;
pub unsafe fn exit_qemu() { pub unsafe fn exit_qemu() {
use x86_64::instructions::port::Port; use x86_64::instructions::port::Port;

2
src/main.rs
View File

@@ -26,4 +26,4 @@ pub extern "C" fn _start() -> ! {
pub fn panic(info: &PanicInfo) -> ! { pub fn panic(info: &PanicInfo) -> ! {
println!("{}", info); println!("{}", info);
loop {} loop {}
} }

9
src/serial.rs
View File

@@ -1,5 +1,5 @@
use uart_16550::SerialPort;
use spin::Mutex; use spin::Mutex;
use uart_16550::SerialPort;
lazy_static! { lazy_static! {
pub static ref SERIAL1: Mutex<SerialPort> = { pub static ref SERIAL1: Mutex<SerialPort> = {
@@ -11,7 +11,10 @@ lazy_static! {
pub fn print(args: ::core::fmt::Arguments) { pub fn print(args: ::core::fmt::Arguments) {
use core::fmt::Write; use core::fmt::Write;
SERIAL1.lock().write_fmt(args).expect("Printing to serial failed"); SERIAL1
.lock()
.write_fmt(args)
.expect("Printing to serial failed");
} }
/// Prints to the host through the serial interface. /// Prints to the host through the serial interface.
@@ -28,4 +31,4 @@ macro_rules! serial_println {
() => (serial_print!("\n")); () => (serial_print!("\n"));
($fmt:expr) => (serial_print!(concat!($fmt, "\n"))); ($fmt:expr) => (serial_print!(concat!($fmt, "\n")));
($fmt:expr, $($arg:tt)*) => (serial_print!(concat!($fmt, "\n"), $($arg)*)); ($fmt:expr, $($arg:tt)*) => (serial_print!(concat!($fmt, "\n"), $($arg)*));
} }