Skip to content

Commit 08504e0

Browse files
committed
liballoc's "extern_funcs" impl mod had a duplicate and missing item
1 parent 5c93a5c commit 08504e0

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/liballoc/heap.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,13 @@ mod imp {
141141
}
142142

143143
#[inline]
144-
pub unsafe fn reallocate_inplace(ptr: *mut u8, old_size: uint, size: uint,
145-
align: uint) -> uint {
146-
rust_reallocate_inplace(ptr, old_size, size, align)
144+
pub unsafe fn deallocate(ptr: *mut u8, old_size: uint, align: uint) {
145+
rust_deallocate(ptr, old_size, align)
147146
}
148147

149148
#[inline]
150-
pub unsafe fn deallocate(ptr: *mut u8, old_size: uint, align: uint) {
151-
rust_deallocate(ptr, old_size, align)
149+
pub unsafe fn reallocate(ptr: *mut u8, old_size: uint, size: uint, align: uint) -> *mut u8 {
150+
rust_reallocate(ptr, old_size, size, align)
152151
}
153152

154153
#[inline]

0 commit comments

Comments
 (0)