Skip to content

Commit ea9d5c9

Browse files
committed
liballoc's "extern_funcs" impl mod had a duplicate and missing item
1 parent 2b84e44 commit ea9d5c9

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
@@ -142,14 +142,13 @@ mod imp {
142142
}
143143

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

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

155154
#[inline]

0 commit comments

Comments
 (0)