Merge pull request #102 from Riceman2000/master

Change to &raw

Author: Dirbaio

README.md

@@ -22,7 +22,6 @@ Starting with Rust 1.68, this crate can be used as a global allocator on stable
 
 extern crate alloc;
 
-use core::ptr::addr_of_mut;
 use cortex_m_rt::entry;
 use embedded_alloc::LlffHeap as Heap;
 
@@ -36,7 +35,7 @@ fn main() -> ! {
         use core::mem::MaybeUninit;
         const HEAP_SIZE: usize = 1024;
         static mut HEAP_MEM: [MaybeUninit<u8>; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE];
-        unsafe { HEAP.init(addr_of_mut!(HEAP_MEM) as usize, HEAP_SIZE) }
+        unsafe { HEAP.init(&raw mut HEAP_MEM as usize, HEAP_SIZE) }
     }
 
     // now the allocator is ready types like Box, Vec can be used.

examples/allocator_api.rs

@@ -7,7 +7,6 @@ extern crate alloc;
 use alloc::vec::Vec;
 use core::mem::MaybeUninit;
 use core::panic::PanicInfo;
-use core::ptr::addr_of_mut;
 use cortex_m_rt::entry;
 use embedded_alloc::LlffHeap as Heap;
 
@@ -21,7 +20,7 @@ fn main() -> ! {
     const HEAP_SIZE: usize = 16;
     static mut HEAP_MEM: [MaybeUninit<u8>; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE];
     let heap: Heap = Heap::empty();
-    unsafe { heap.init(addr_of_mut!(HEAP_MEM) as usize, HEAP_SIZE) }
+    unsafe { heap.init(&raw mut HEAP_MEM as usize, HEAP_SIZE) }
 
     let mut xs = Vec::new_in(heap);
     xs.push(1);

examples/global_alloc.rs

@@ -5,7 +5,6 @@ extern crate alloc;
 
 use alloc::vec::Vec;
 use core::panic::PanicInfo;
-use core::ptr::addr_of_mut;
 use cortex_m_rt::entry;
 // Linked-List First Fit Heap allocator (feature = "llff")
 use embedded_alloc::LlffHeap as Heap;
@@ -22,7 +21,7 @@ fn main() -> ! {
         use core::mem::MaybeUninit;
         const HEAP_SIZE: usize = 1024;
         static mut HEAP_MEM: [MaybeUninit<u8>; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE];
-        unsafe { HEAP.init(addr_of_mut!(HEAP_MEM) as usize, HEAP_SIZE) }
+        unsafe { HEAP.init(&raw mut HEAP_MEM as usize, HEAP_SIZE) }
     }
 
     let mut xs = Vec::new();

examples/llff_integration_test.rs

@@ -21,7 +21,6 @@ extern crate panic_semihosting;
 
 use alloc::vec::Vec;
 use core::mem::{size_of, MaybeUninit};
-use core::ptr::addr_of_mut;
 use cortex_m_rt::entry;
 use cortex_m_semihosting::{debug, hprintln};
 use embedded_alloc::LlffHeap as Heap;
@@ -46,9 +45,9 @@ fn test_global_heap() {
 fn test_allocator_api() {
     // small local heap
     const HEAP_SIZE: usize = 16;
-    let heap_mem: [MaybeUninit<u8>; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE];
+    let mut heap_mem: [MaybeUninit<u8>; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE];
     let local_heap: Heap = Heap::empty();
-    unsafe { local_heap.init(heap_mem.as_ptr() as usize, HEAP_SIZE) }
+    unsafe { local_heap.init(&raw mut heap_mem as usize, HEAP_SIZE) }
 
     assert_eq!(local_heap.used(), 0);
 
@@ -67,7 +66,7 @@ fn main() -> ! {
     {
         const HEAP_SIZE: usize = 1024;
         static mut HEAP_MEM: [MaybeUninit<u8>; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE];
-        unsafe { HEAP.init(addr_of_mut!(HEAP_MEM) as usize, HEAP_SIZE) }
+        unsafe { HEAP.init(&raw mut HEAP_MEM as usize, HEAP_SIZE) }
     }
 
     #[allow(clippy::type_complexity)]

examples/tlsf_integration_test.rs

@@ -21,7 +21,6 @@ extern crate panic_semihosting;
 
 use alloc::collections::LinkedList;
 use core::mem::MaybeUninit;
-use core::ptr::addr_of_mut;
 use cortex_m_rt::entry;
 use cortex_m_semihosting::{debug, hprintln};
 use embedded_alloc::TlsfHeap as Heap;
@@ -55,9 +54,9 @@ fn test_global_heap() {
 fn test_allocator_api() {
     // small local heap
     const HEAP_SIZE: usize = 256;
-    let heap_mem: [MaybeUninit<u8>; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE];
+    let mut heap_mem: [MaybeUninit<u8>; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE];
     let local_heap: Heap = Heap::empty();
-    unsafe { local_heap.init(heap_mem.as_ptr() as usize, HEAP_SIZE) }
+    unsafe { local_heap.init(heap_mem.as_mut_ptr() as usize, HEAP_SIZE) }
 
     const ELEMS: usize = 2;
 
@@ -84,7 +83,7 @@ fn test_allocator_api() {
 fn main() -> ! {
     {
         static mut HEAP_MEM: [MaybeUninit<u8>; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE];
-        unsafe { HEAP.init(addr_of_mut!(HEAP_MEM) as usize, HEAP_SIZE) }
+        unsafe { HEAP.init(&raw mut HEAP_MEM as usize, HEAP_SIZE) }
     }
 
     #[allow(clippy::type_complexity)]