Switch to CortexMHeap

Author: f-bro

Cargo.lock

@@ -17,7 +17,7 @@ spin = "0.4.5"
 volatile = "0.2.1"
 net = {git = "https://github.com/embed-rs/net.git"}
 rusttype = {git = "https://github.com/phil-opp/rusttype.git", branch = "no_std"}
-linked_list_allocator = "0.4.1"
+alloc-cortex-m = {git = "https://github.com/f-bro/alloc-cortex-m.git", branch = "alloc_api"}
 
 [dependencies.arrayvec]
 default-features = false

Cargo.toml

@@ -10,5 +10,5 @@ pub unsafe fn init() {
     let start = &__HEAP_START as *const _ as usize;
     let end = &__HEAP_END as *const _ as usize;
     let size = end - start;
-    ALLOCATOR.lock().init(start, size);
+    ALLOCATOR.init(start, size);
 }

src/heap.rs

@@ -5,7 +5,6 @@
 #![feature(alloc)]
 #![feature(try_from)]
 #![feature(drop_types_in_const)]
-#![feature(option_entry)]
 #![feature(global_allocator)]
 
 #![no_std]
@@ -26,7 +25,7 @@ extern crate spin;
 extern crate byteorder;
 extern crate net;
 extern crate rusttype;
-extern crate linked_list_allocator;
+extern crate alloc_cortex_m;
 
 #[macro_use]
 pub mod semi_hosting;
@@ -64,7 +63,7 @@ pub extern "C" fn panic_fmt(fmt: core::fmt::Arguments, file: &'static str, line:
 }
 
 
-use linked_list_allocator::LockedHeap;
+use alloc_cortex_m::CortexMHeap;
 
 #[global_allocator]
-static ALLOCATOR: LockedHeap = LockedHeap::empty();
+static ALLOCATOR: CortexMHeap = CortexMHeap::empty();