Auto merge of #6474 - Ms2ger:alloc, r=metajack

Use the heap module through its facade in libstd.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6474)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-26 15:26:25 -06:00
commit e6db6ae61f
4 changed files with 2 additions and 6 deletions

View file

@ -13,11 +13,11 @@
use flow::Flow;
use flow;
use alloc::heap;
use std::mem;
use std::ops::{Deref, DerefMut};
use std::ptr;
use std::raw;
use std::rt::heap;
use std::sync::atomic::{self, Ordering};
#[unsafe_no_drop_flag]

View file

@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(alloc)]
#![feature(append)]
#![feature(arc_unique)]
#![feature(box_syntax)]
@ -40,7 +39,6 @@ extern crate profile_traits;
extern crate util;
extern crate rustc_serialize;
extern crate alloc;
extern crate azure;
extern crate canvas_traits;
extern crate clock_ticks;