diff options
| author | bors <bors@rust-lang.org> | 2015-03-31 05:47:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-31 05:47:35 +0000 |
| commit | b3317d68910900f135f9f38e43a7a699bc736b4a (patch) | |
| tree | fcc7af00740cd4540119a4f4bf345cd077ed269c /src/liballoc | |
| parent | 6cf3b0b74aadcc1fe87adbd2c74876a1f6c920b3 (diff) | |
| parent | db76327ef686d81c74e74ac25028681e61badb3c (diff) | |
| download | rust-b3317d68910900f135f9f38e43a7a699bc736b4a.tar.gz rust-b3317d68910900f135f9f38e43a7a699bc736b4a.zip | |
Auto merge of #23884 - Manishearth:rollup, r=Manishearth
- Successful merges: #23558, #23813, #23826, #23836, #23839, #23846, #23852, #23859, #23862, #23865, #23866, #23869, #23874 - Failed merges:
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 3733350412e..c6c86e46b44 100644 --- a/src/liballoc/heap.rs +++ b/src/liballoc/heap.rs @@ -301,7 +301,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(new_ptr, ptr, cmp::min(size, old_size)); + ptr::copy(ptr, new_ptr, cmp::min(size, old_size)); deallocate(ptr, old_size, align); new_ptr } |
