From 84add9b54aac258afd743657ccc1c52d534f42a3 Mon Sep 17 00:00:00 2001 From: Niklas Adofsson Date: Sun, 2 Sep 2018 20:52:46 +0200 Subject: [PATCH 1/2] Add `no-std-tests` to the workspace --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d7120e9..cbd3f49 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,2 +1,2 @@ [workspace] -members = ["ethereum-types", "ethbloom"] +members = ["ethereum-types", "ethbloom", "no-std-tests"] From 801c37dfaa95ff833701c584513902897048e005 Mon Sep 17 00:00:00 2001 From: Niklas Adofsson Date: Sun, 2 Sep 2018 20:53:10 +0200 Subject: [PATCH 2/2] `panic_implementation` -> `panic_handler` --- no-std-tests/src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/no-std-tests/src/main.rs b/no-std-tests/src/main.rs index c0be458..7ecd222 100644 --- a/no-std-tests/src/main.rs +++ b/no-std-tests/src/main.rs @@ -1,4 +1,4 @@ -#![feature(lang_items, start, panic_implementation)] +#![feature(lang_items, start, panic_handler)] #![no_std] extern crate libc; @@ -19,7 +19,7 @@ fn start(_argc: isize, _argv: *const *const u8) -> isize { pub extern "C" fn rust_eh_personality() {} #[cfg(not(test))] -#[panic_implementation] +#[panic_handler] fn panic(_info: &core::panic::PanicInfo) -> ! { unsafe { libc::abort();