Browse Source

Merge #16

16: Update for newer Rust versions r=dvc94ch a=fintelia

A couple features are now stable as of Rust 1.30, and panic the definition of the panic_fmt lang item is now slightly different.

Co-authored-by: Jonathan Behrens <fintelia@gmail.com>
bors[bot] 6 years ago
parent
commit
c3a2bcf159
2 changed files with 2 additions and 5 deletions
  1. 2 2
      riscv-rt/src/lang_items.rs
  2. 0 3
      riscv-rt/src/lib.rs

+ 2 - 2
riscv-rt/src/lang_items.rs

@@ -3,8 +3,8 @@
 use riscv::asm;
 
 /// Default panic handler
-#[panic_implementation]
-fn panic_fmt(_info: &core::panic::PanicInfo) -> ! {
+#[panic_handler]
+fn panic(_info: &core::panic::PanicInfo) -> ! {
     asm::ebreak();
     loop {}
 }

+ 0 - 3
riscv-rt/src/lib.rs

@@ -167,12 +167,9 @@
 #![feature(asm)]
 #![feature(compiler_builtins_lib)]
 #![feature(const_fn)]
-#![feature(extern_prelude)]
 #![feature(global_asm)]
 #![feature(lang_items)]
 #![feature(linkage)]
-#![feature(panic_implementation)]
-#![feature(used)]
 
 extern crate riscv;
 extern crate r0;