From df505076cbdaf695268ef24487f07611e3c2898f Mon Sep 17 00:00:00 2001 From: Guanqun Lu Date: Wed, 29 Aug 2018 16:09:13 +0800 Subject: [PATCH] rename to panic_handler as panic_implementation is deprecated in nightly --- substrate/executor/wasm/src/lib.rs | 2 +- substrate/runtime-io/src/lib.rs | 2 +- substrate/runtime-io/without_std.rs | 2 +- substrate/runtime-sandbox/src/lib.rs | 2 +- substrate/runtime-std/src/lib.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/substrate/executor/wasm/src/lib.rs b/substrate/executor/wasm/src/lib.rs index 126d1bbf86c61..cbb6dfc31f455 100644 --- a/substrate/executor/wasm/src/lib.rs +++ b/substrate/executor/wasm/src/lib.rs @@ -1,5 +1,5 @@ #![no_std] -#![feature(panic_implementation)] +#![feature(panic_handler)] #![cfg_attr(feature = "strict", deny(warnings))] #![feature(alloc)] diff --git a/substrate/runtime-io/src/lib.rs b/substrate/runtime-io/src/lib.rs index 9d57f537f73d8..88446c21e804d 100644 --- a/substrate/runtime-io/src/lib.rs +++ b/substrate/runtime-io/src/lib.rs @@ -18,7 +18,7 @@ #![cfg_attr(not(feature = "std"), no_std)] #![cfg_attr(not(feature = "std"), feature(lang_items))] -#![cfg_attr(not(feature = "std"), feature(panic_implementation))] +#![cfg_attr(not(feature = "std"), feature(panic_handler))] #![cfg_attr(not(feature = "std"), feature(alloc_error_handler))] #![cfg_attr(not(feature = "std"), feature(core_intrinsics))] #![cfg_attr(not(feature = "std"), feature(alloc))] diff --git a/substrate/runtime-io/without_std.rs b/substrate/runtime-io/without_std.rs index 438b1a84fc976..c99486cbdb7f9 100644 --- a/substrate/runtime-io/without_std.rs +++ b/substrate/runtime-io/without_std.rs @@ -27,7 +27,7 @@ use core::intrinsics; use rstd::vec::Vec; pub use rstd::{mem, slice}; -#[panic_implementation] +#[panic_handler] #[no_mangle] pub fn panic(info: &::core::panic::PanicInfo) -> ! { unsafe { diff --git a/substrate/runtime-sandbox/src/lib.rs b/substrate/runtime-sandbox/src/lib.rs index 2556608047085..e0e6cdf09fe26 100755 --- a/substrate/runtime-sandbox/src/lib.rs +++ b/substrate/runtime-sandbox/src/lib.rs @@ -37,7 +37,7 @@ #![warn(missing_docs)] #![cfg_attr(not(feature = "std"), no_std)] -#![cfg_attr(not(feature = "std"), feature(panic_implementation))] +#![cfg_attr(not(feature = "std"), feature(panic_handler))] #![cfg_attr(not(feature = "std"), feature(core_intrinsics))] #![cfg_attr(not(feature = "std"), feature(alloc))] diff --git a/substrate/runtime-std/src/lib.rs b/substrate/runtime-std/src/lib.rs index b3d7c4530ce43..aabcd0122f779 100644 --- a/substrate/runtime-std/src/lib.rs +++ b/substrate/runtime-std/src/lib.rs @@ -18,7 +18,7 @@ //! or core/alloc to be used with any code that depends on the runtime. #![cfg_attr(not(feature = "std"), no_std)] -#![cfg_attr(not(feature = "std"), feature(panic_implementation))] +#![cfg_attr(not(feature = "std"), feature(panic_handler))] #![cfg_attr(not(feature = "std"), feature(core_intrinsics))] #![cfg_attr(not(feature = "std"), feature(alloc))]