Upgrade rust to f93ab64d4a1a7ee91759a1594ab2a426b6cc657e/rustc-1.5.0-dev.

components/util/Cargo.toml

@@ -52,7 +52,7 @@ smallvec = "0.1"
 num_cpus = "0.2.2"
 num = "0.1.24"
 euclid = "0.2"
-serde = "0.5"
+serde = "0.6"
 serde_macros = "0.5"
 string_cache = "0.1"
 lazy_static = "0.1"

components/util/deque/mod.rs

@@ -52,7 +52,7 @@ pub use self::Stolen::{Empty, Abort, Data};
 use std::marker;
 use std::mem::{forget, align_of, size_of, transmute};
 use std::ptr;
-use std::rt::heap::{allocate, deallocate};
+use alloc::heap::{allocate, deallocate};
 use std::sync::Arc;
 
 use std::sync::Mutex;

components/util/lib.rs

@@ -4,7 +4,6 @@
 
 #![feature(alloc)]
 #![feature(box_syntax)]
-#![feature(box_raw)]
 #![feature(core_intrinsics)]
 #![feature(custom_derive)]
 #![feature(fnbox)]

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 }