Fixes example and readme

Author: 0x7CFE

README.md

@@ -50,12 +50,9 @@ infrastructure. Nevertheless, `wee_alloc` is also usable with `std`.
 // We aren't using the standard library.
 #![no_std]
 
-// Required to replace the global allocator.
-#![feature(global_allocator)]
-
 // Required to use the `alloc` crate and its types, the `abort` intrinsic, and a
 // custom panic handler.
-#![feature(alloc, core_intrinsics, lang_items)]
+#![feature(alloc, core_intrinsics, panic_implementation, lang_items)]
 
 extern crate alloc;
 extern crate wee_alloc;
@@ -64,18 +61,22 @@ extern crate wee_alloc;
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
-// Need to provide a tiny `panic_fmt` lang-item implementation for `#![no_std]`.
-// This implementation will translate panics into traps in the resulting
-// WebAssembly.
-#[lang = "panic_fmt"]
-extern "C" fn panic_fmt(
-    _args: ::core::fmt::Arguments,
-    _file: &'static str,
-    _line: u32
-) -> ! {
-    use core::intrinsics;
+// Need to provide a tiny `panic` implementation for `#![no_std]`.
+// This translates into an `unreachable` instruction that will
+// raise a `trap` the WebAssembly execution if we panic at runtime.
+#[panic_implementation]
+fn panic(_info: &::core::panic::PanicInfo) -> ! {
+    unsafe {
+        ::core::intrinsics::abort();
+    }
+}
+
+// Need to provide a tiny `oom` lang-item implementation for
+// `#![no_std]`.
+#[lang = "oom"]
+extern "C" fn oom() -> ! {
     unsafe {
-        intrinsics::abort();
+        ::core::intrinsics::abort();
     }
 }
 

example/src/lib.rs

@@ -20,7 +20,9 @@ static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 // raise a `trap` the WebAssembly execution if we panic at runtime.
 #[panic_implementation]
 fn panic(_info: &::core::panic::PanicInfo) -> ! {
-    unsafe { ::core::intrinsics::abort() }
+    unsafe {
+        ::core::intrinsics::abort();
+    }
 }
 
 // Need to provide a tiny `oom` lang-item implementation for

test/src/lib.rs

@@ -1,6 +1,5 @@
 #![feature(alloc, allocator_api)]
 
-extern crate alloc;
 extern crate histo;
 #[macro_use]
 extern crate quickcheck;

wee_alloc/src/lib.rs

@@ -50,12 +50,9 @@ infrastructure. Nevertheless, `wee_alloc` is also usable with `std`.
 // We aren't using the standard library.
 #![no_std]
 
-// Required to replace the global allocator.
-#![feature(global_allocator)]
-
 // Required to use the `alloc` crate and its types, the `abort` intrinsic, and a
 // custom panic handler.
-#![feature(alloc, core_intrinsics, lang_items)]
+#![feature(alloc, core_intrinsics, panic_implementation, lang_items)]
 
 extern crate alloc;
 extern crate wee_alloc;
@@ -64,18 +61,22 @@ extern crate wee_alloc;
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
-// Need to provide a tiny `panic_fmt` lang-item implementation for `#![no_std]`.
-// This implementation will translate panics into traps in the resulting
-// WebAssembly.
-#[lang = "panic_fmt"]
-extern "C" fn panic_fmt(
-    _args: ::core::fmt::Arguments,
-    _file: &'static str,
-    _line: u32
-) -> ! {
-    use core::intrinsics;
+// Need to provide a tiny `panic` implementation for `#![no_std]`.
+// This translates into an `unreachable` instruction that will
+// raise a `trap` the WebAssembly execution if we panic at runtime.
+#[panic_implementation]
+fn panic(_info: &::core::panic::PanicInfo) -> ! {
+    unsafe {
+        ::core::intrinsics::abort();
+    }
+}
+
+// Need to provide a tiny `oom` lang-item implementation for
+// `#![no_std]`.
+#[lang = "oom"]
+extern "C" fn oom() -> ! {
     unsafe {
-        intrinsics::abort();
+        ::core::intrinsics::abort();
     }
 }