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

Pub and no_mangle are no longer required for panic_handler (#468)

Browse Source
This commit is contained in:
Philipp Oppermann
2018-10-01 13:11:39 +02:00
committed by GitHub
parent 2dd925d34d
commit 6f48a17ba4
10 changed files with 39 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
blog/content/second-edition/posts/05-integration-tests/index.md
View File

@@ -344,8 +344,7 @@ pub extern "C" fn _start() -> ! {
#[cfg(not(test))]
#[panic_handle]
#[no_mangle]
pub fn panic(_info: &PanicInfo) -> ! {
fn panic(_info: &PanicInfo) -> ! {
loop {}
}
```
@@ -424,8 +423,7 @@ pub extern "C" fn _start() -> ! {
/// This function is called on panic.
#[cfg(not(test))]
#[panic_handler]
#[no_mangle]
pub fn panic(info: &PanicInfo) -> ! {
fn panic(info: &PanicInfo) -> ! {
println!("{}", info);
loop {}
}
@@ -488,8 +486,7 @@ pub extern "C" fn _start() -> ! {
/// This function is called on panic.
#[cfg(not(test))]
#[panic_handler]
#[no_mangle]
pub fn panic(info: &PanicInfo) -> ! {
fn panic(info: &PanicInfo) -> ! {
serial_println!("failed");
serial_println!("{}", info);
@@ -546,8 +543,7 @@ pub extern "C" fn _start() -> ! {
#[cfg(not(test))]
#[panic_handler]
#[no_mangle]
pub fn panic(_info: &PanicInfo) -> ! {
fn panic(_info: &PanicInfo) -> ! {
serial_println!("ok");
unsafe { exit_qemu(); }