From c005be94939cdb80a130ce5b8ebb7d786168637b Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 7 Sep 2018 18:52:02 +0200 Subject: [PATCH] panic_implementation -> panic_handler; remove unstable features --- src/SUMMARY.md | 2 +- ...nic-implementation.md => panic-handler.md} | 25 ++++++++----------- 2 files changed, 11 insertions(+), 16 deletions(-) rename src/{panic-implementation.md => panic-handler.md} (69%) diff --git a/src/SUMMARY.md b/src/SUMMARY.md index a513456..dfb8e7b 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -57,4 +57,4 @@ * [Implementing Arc and Mutex](arc-and-mutex.md) * [FFI](ffi.md) * [Beneath `std`](beneath-std.md) - * [#[panic_implementation]](panic-implementation.md) + * [#[panic_handler]](panic-handler.md) diff --git a/src/panic-implementation.md b/src/panic-handler.md similarity index 69% rename from src/panic-implementation.md rename to src/panic-handler.md index 963a853..8c9a43e 100644 --- a/src/panic-implementation.md +++ b/src/panic-handler.md @@ -1,7 +1,7 @@ -## #[panic_implementation] +## #[panic_handler] -`#[panic_implementation]` is used to define the behavior of `panic!` in `#![no_std]` applications. -The `#[panic_implementation]` attribute must be applied to a function with signature `fn(&PanicInfo) +`#[panic_handler]` is used to define the behavior of `panic!` in `#![no_std]` applications. +The `#[panic_handler]` attribute must be applied to a function with signature `fn(&PanicInfo) -> !` and such function must appear *once* in the dependency graph of a binary / dylib / cdylib crate. The API of `PanicInfo` can be found in the [API docs]. @@ -9,7 +9,7 @@ crate. The API of `PanicInfo` can be found in the [API docs]. Given that `#![no_std]` applications have no *standard* output and that some `#![no_std]` applications, e.g. embedded applications, need different panicking behaviors for development and for -release it can be helpful to have panic crates, crate that only contain a `#[panic_implementation]`. +release it can be helpful to have panic crates, crate that only contain a `#[panic_handler]`. This way applications can easily swap the panicking behavior by simply linking to a different panic crate. @@ -20,32 +20,27 @@ whether is compiled using the dev profile (`cargo build`) or using the release p ``` rust // crate: panic-semihosting -- log panic message to the host stderr using semihosting -#![feature(core_intrinsics)] -#![feature(panic_implementation)] #![no_std] -#[panic_implementation] +#[panic_handler] fn panic(info: &PanicInfo) -> ! { let host_stderr = /* .. */; + // logs "panicked at '$reason', src/main.rs:27:4" to the host stderr writeln!(host_stderr, "{}", info).ok(); - core::intrinsics::breakpoint(); - loop {} } ``` ``` rust -// crate: panic-abort -- abort on panic! +// crate: panic-halt -- halt the thread on panic; messages are discarded -#![feature(core_intrinsics)] -#![feature(panic_implementation)] #![no_std] -#[panic_implementation] +#[panic_handler] fn panic(info: &PanicInfo) -> ! { - unsafe { core::intrinsics::abort() } + loop {} } ``` @@ -60,7 +55,7 @@ extern crate panic_semihosting; // release profile #[cfg(not(debug_assertions))] -extern crate panic_abort; +extern crate panic_halt; // omitted: other `extern crate`s