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

Run cargo fmt

Browse Source
This commit is contained in:
Philipp Oppermann
2019-04-25 18:10:59 +02:00
parent c8087cdd6f
commit 8374aa6ab6
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/basic_boot.rs
View File

@@ -4,8 +4,8 @@
#![test_runner(blog_os::test_runner)] #![test_runner(blog_os::test_runner)]
#![reexport_test_harness_main = "test_main"] #![reexport_test_harness_main = "test_main"]
use core::panic::PanicInfo;
use blog_os::{println, serial_print, serial_println}; use blog_os::{println, serial_print, serial_println};
use core::panic::PanicInfo;
#[no_mangle] // don't mangle the name of this function #[no_mangle] // don't mangle the name of this function
pub extern "C" fn _start() -> ! { pub extern "C" fn _start() -> ! {

7
tests/panic_handler.rs
View File

@@ -2,8 +2,11 @@
#![no_main] #![no_main]
#![feature(panic_info_message)] #![feature(panic_info_message)]
use core::{fmt::{self, Write}, panic::PanicInfo}; use blog_os::{exit_qemu, serial_print, serial_println, QemuExitCode};
use blog_os::{serial_print, serial_println, QemuExitCode, exit_qemu}; use core::{
fmt::{self, Write},
panic::PanicInfo,
};
const MESSAGE: &str = "Example panic message from panic_handler test"; const MESSAGE: &str = "Example panic message from panic_handler test";
const PANIC_LINE: u32 = 14; // adjust this when moving the `panic!` call const PANIC_LINE: u32 = 14; // adjust this when moving the `panic!` call