From 8cf2418c743407b9eee865e1ba6d870a848d1aa3 Mon Sep 17 00:00:00 2001 From: riceman2000 Date: Mon, 27 Jan 2025 21:30:27 -0500 Subject: [PATCH 1/2] Change to &raw --- README.md | 3 +-- examples/allocator_api.rs | 3 +-- examples/global_alloc.rs | 3 +-- examples/llff_integration_test.rs | 7 +++---- examples/tlsf_integration_test.rs | 7 +++---- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 5eb6cde..a1022f4 100644 --- a/README.md +++ b/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; 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. diff --git a/examples/allocator_api.rs b/examples/allocator_api.rs index ab08818..10f5261 100644 --- a/examples/allocator_api.rs +++ b/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; 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); diff --git a/examples/global_alloc.rs b/examples/global_alloc.rs index 21c95f5..81705fc 100644 --- a/examples/global_alloc.rs +++ b/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; 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(); diff --git a/examples/llff_integration_test.rs b/examples/llff_integration_test.rs index c0823e5..ce9b553 100644 --- a/examples/llff_integration_test.rs +++ b/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; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE]; + let mut heap_mem: [MaybeUninit; 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; 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)] diff --git a/examples/tlsf_integration_test.rs b/examples/tlsf_integration_test.rs index 13e95b0..26d36f4 100644 --- a/examples/tlsf_integration_test.rs +++ b/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; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE]; + let mut heap_mem: [MaybeUninit; 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) } const ELEMS: usize = 2; @@ -84,7 +83,7 @@ fn test_allocator_api() { fn main() -> ! { { static mut HEAP_MEM: [MaybeUninit; 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)] From 20d9db5e6aba2028f03c605f30efdfc3599cfdea Mon Sep 17 00:00:00 2001 From: riceman2000 Date: Mon, 3 Feb 2025 01:50:03 -0500 Subject: [PATCH 2/2] Review changes --- examples/tlsf_integration_test.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/tlsf_integration_test.rs b/examples/tlsf_integration_test.rs index 26d36f4..26a4353 100644 --- a/examples/tlsf_integration_test.rs +++ b/examples/tlsf_integration_test.rs @@ -56,7 +56,7 @@ fn test_allocator_api() { const HEAP_SIZE: usize = 256; let mut heap_mem: [MaybeUninit; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE]; let local_heap: Heap = Heap::empty(); - unsafe { local_heap.init(&raw mut heap_mem as usize, HEAP_SIZE) } + unsafe { local_heap.init(heap_mem.as_mut_ptr() as usize, HEAP_SIZE) } const ELEMS: usize = 2;