about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorBarosl LEE <github@barosl.com>2015-01-21 02:16:50 +0900
committerBarosl LEE <github@barosl.com>2015-01-21 02:16:50 +0900
commita79f1921a977595a0321dee96ba08b17b52850ae (patch)
tree2da2bbe2af6684be00aa3d762ace19203abcbe50 /src/liballoc
parent0efdda314a48b5824673510fbaa0c6d9ddf301df (diff)
parent812ce6c190d896cf1cc1bef9f22c00266e962c43 (diff)
downloadrust-a79f1921a977595a0321dee96ba08b17b52850ae.tar.gz
rust-a79f1921a977595a0321dee96ba08b17b52850ae.zip
Rollup merge of #21375 - petrochenkov:ssbsl, r=alexcrichton
After PR #19766 added implicit coersions `*mut T -> *const T`, the explicit casts can be removed.
(The number of such casts turned out to be relatively small).
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 b7bc1b47646..bd5b43b782e 100644
--- a/src/liballoc/heap.rs
+++ b/src/liballoc/heap.rs
@@ -298,7 +298,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 as *const u8, cmp::min(size, old_size));
+            ptr::copy_memory(new_ptr, ptr, cmp::min(size, old_size));
             deallocate(ptr, old_size, align);
             new_ptr
         }