Remove stabilized feature flags and new panic_abort

aurabindo · dvc94ch · commit 5cfa3acbfc43 · 2019-03-03T20:25:14.000+01:00
Signed-off-by: Aurabindo Jayamohanan &lt;mail@aurabindo.in&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,6 +2,8 @@
 name = "rust-picosoc"
 version = "0.1.0"
 authors = ["David Craven <david@craven.ch>"]
+edition = "2018"
 
 [dependencies]
-r0 = "0.2.2"
+r0 = "0.2.2"
+panic-abort = "0.3.1"
diff --git a/src/main.rs b/src/main.rs
@@ -1,11 +1,11 @@
-#![feature(extern_prelude)]
 #![feature(global_asm)]
-#![feature(panic_implementation)]
 #![no_main]
 #![no_std]
 
 const LED_ADDRESS: u32 = 0x0300_0000;
 
+use panic_abort;
+
 // The reset handler
 #[no_mangle]
 pub unsafe extern "C" fn Reset() -> ! {
@@ -35,11 +35,6 @@ extern "C" {
     static _sidata: u32;
 }
 
-#[panic_implementation]
-#[no_mangle]
-pub fn panic_fmt(_info: &core::panic::PanicInfo) -> ! {
-    loop {}
-}
 
 // Make sure there is an abort when linking
 #[cfg(target_arch = "riscv32")]
