diff options
| author | bors <bors@rust-lang.org> | 2015-02-27 23:15:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-27 23:15:17 +0000 |
| commit | e233987ce1de88a48db2ce612019ba644d3cf5dd (patch) | |
| tree | f776ae018199c9ff2350a29dc569630f64455f87 /src/liballoc | |
| parent | bd0d8e47e53f25bbd50418a0f117973c366c1b08 (diff) | |
| parent | bde4c1d6fbefcd914a06b5eab6ef6f9a6f26f271 (diff) | |
| download | rust-e233987ce1de88a48db2ce612019ba644d3cf5dd.tar.gz rust-e233987ce1de88a48db2ce612019ba644d3cf5dd.zip | |
Auto merge of #22860 - Manishearth:rollup, r=alexcrichton
Passes check-stage1, check-stage2
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/heap.rs | 2 |
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 } |
