From ea9d5c96536059b232dd6aa40af7a1d181f7b196 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 27 Dec 2014 00:34:51 +0100 Subject: [PATCH] liballoc's "extern_funcs" impl mod had a duplicate and missing item --- src/liballoc/heap.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs index 69aeaf44793b..14ba5437565e 100644 --- a/src/liballoc/heap.rs +++ b/src/liballoc/heap.rs @@ -142,14 +142,13 @@ mod imp { } #[inline] - pub unsafe fn reallocate_inplace(ptr: *mut u8, old_size: uint, size: uint, - align: uint) -> uint { - rust_reallocate_inplace(ptr, old_size, size, align) + pub unsafe fn deallocate(ptr: *mut u8, old_size: uint, align: uint) { + rust_deallocate(ptr, old_size, align) } #[inline] - pub unsafe fn deallocate(ptr: *mut u8, old_size: uint, align: uint) { - rust_deallocate(ptr, old_size, align) + pub unsafe fn reallocate(ptr: *mut u8, old_size: uint, size: uint, align: uint) -> *mut u8 { + rust_reallocate(ptr, old_size, size, align) } #[inline]