Upgrade rust to f93ab64d4a1a7ee91759a1594ab2a426b6cc657e/rustc-1.5.0-dev.

This commit is contained in:
Manish Goregaokar 2015-09-21 13:12:01 +05:30 committed by Ms2ger
parent 8f1469eb08
commit 3c969b346a
40 changed files with 253 additions and 253 deletions

View file

@ -53,7 +53,7 @@ extern {
// A wrapper for je_malloc_usable_size that handles `EMPTY` and returns `usize`.
pub fn heap_size_of(ptr: *const c_void) -> usize {
if ptr == ::std::rt::heap::EMPTY as *const c_void {
if ptr == ::alloc::heap::EMPTY as *const c_void {
0
} else {
unsafe { je_malloc_usable_size(ptr) as usize }