diff --git a/src/lib.rs b/src/lib.rs index 4d531d7..056888b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -34,34 +34,27 @@ const MIN_ALIGN: usize = 8; target_arch = "sparc64")))] const MIN_ALIGN: usize = 16; -use core::alloc::{Alloc, GlobalAlloc, AllocErr, Layout}; +use core::alloc::{Allocator, GlobalAlloc, AllocError, Layout}; use core::ptr::NonNull; pub struct System; -unsafe impl Alloc for System { +unsafe impl Allocator for System { #[inline] - unsafe fn alloc(&mut self, layout: Layout) -> Result, AllocErr> { - NonNull::new(GlobalAlloc::alloc(self, layout)).ok_or(AllocErr) + unsafe fn allocate(&mut self, layout: Layout) -> Result, AllocError> { + NonNull::new(GlobalAlloc::alloc(self, layout)).ok_or(AllocError) } #[inline] - unsafe fn alloc_zeroed(&mut self, layout: Layout) -> Result, AllocErr> { - NonNull::new(GlobalAlloc::alloc_zeroed(self, layout)).ok_or(AllocErr) + unsafe fn allocate_zeroed(&mut self, layout: Layout) -> Result, AllocError> { + NonNull::new(GlobalAlloc::alloc_zeroed(self, layout)).ok_or(AllocError) } #[inline] - unsafe fn dealloc(&mut self, ptr: NonNull, layout: Layout) { + unsafe fn deallocate(&mut self, ptr: NonNull, layout: Layout) { GlobalAlloc::dealloc(self, ptr.as_ptr(), layout) } - #[inline] - unsafe fn realloc(&mut self, - ptr: NonNull, - layout: Layout, - new_size: usize) -> Result, AllocErr> { - NonNull::new(GlobalAlloc::realloc(self, ptr.as_ptr(), layout, new_size)).ok_or(AllocErr) - } } mod realloc_fallback {