about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-02-27 11:43:00 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-02-27 20:37:38 +0530
commitd9704bdfdb3057ed2a28fcf0dd5c9165ed45189b (patch)
treebef2042d3de517260a5c68cfd4d1528df2063cec /src/liballoc
parent19ab0b9a3ca64016c4b46e91a2ab75879be7e20d (diff)
parentd0bb57cfc38bfa2347c4b65ee6abd20a9462847c (diff)
downloadrust-d9704bdfdb3057ed2a28fcf0dd5c9165ed45189b.tar.gz
rust-d9704bdfdb3057ed2a28fcf0dd5c9165ed45189b.zip
Rollup merge of #22843 - vhbit:no-jemalloc-fix, r=alexcrichton
   "body": null,
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/heap.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs
index d3d86270d1e..726d5c8a23b 100644
--- a/src/liballoc/heap.rs
+++ b/src/liballoc/heap.rs
@@ -300,7 +300,7 @@ mod imp {
             libc::realloc(ptr as *mut libc::c_void, size as libc::size_t) as *mut u8
         } else {
             let new_ptr = allocate(size, align);
-            ptr::copy_memory(new_ptr, ptr, cmp::min(size, old_size));
+            ptr::copy(new_ptr, ptr, cmp::min(size, old_size));
             deallocate(ptr, old_size, align);
             new_ptr
         }