diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-09-21 13:12:01 +0530 |
|---|---|---|
| committer | Ms2ger <Ms2ger@gmail.com> | 2015-09-23 14:44:59 +0200 |
| commit | 3c969b346a02928abeea2796a0ec92a072f70b6e (patch) | |
| tree | fbf7b015edf85032dd2327dde6867da2c568b594 /components/util/mem.rs | |
| parent | 8f1469eb08a437bcc6cfb510334be2b6430b4a8f (diff) | |
| download | servo-3c969b346a02928abeea2796a0ec92a072f70b6e.tar.gz servo-3c969b346a02928abeea2796a0ec92a072f70b6e.zip | |
Upgrade rust to f93ab64d4a1a7ee91759a1594ab2a426b6cc657e/rustc-1.5.0-dev.
Diffstat (limited to 'components/util/mem.rs')
| -rw-r--r-- | components/util/mem.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/util/mem.rs b/components/util/mem.rs index ff28a8e230c..802d34c5385 100644 --- a/components/util/mem.rs +++ b/components/util/mem.rs @@ -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 } |