aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2015-06-26 20:52:28 +0200
committerMs2ger <ms2ger@gmail.com>2015-06-26 20:52:28 +0200
commitd6aa0915c3ee761eb2374372dd92f7912772ee1e (patch)
treecb0d0678a35b6606f9dcbd982be635415095159b /components/layout
parentef97879c273e9eed3b4dece07813c2d4e6eb2c38 (diff)
downloadservo-d6aa0915c3ee761eb2374372dd92f7912772ee1e.tar.gz
servo-d6aa0915c3ee761eb2374372dd92f7912772ee1e.zip
Use the heap module through its facade in libstd.
Diffstat (limited to 'components/layout')
-rw-r--r--components/layout/flow_ref.rs2
-rw-r--r--components/layout/lib.rs2
2 files changed, 1 insertions, 3 deletions
diff --git a/components/layout/flow_ref.rs b/components/layout/flow_ref.rs
index 6b323c15f6f..6188c882ce9 100644
--- a/components/layout/flow_ref.rs
+++ b/components/layout/flow_ref.rs
@@ -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]
diff --git a/components/layout/lib.rs b/components/layout/lib.rs
index e93fe905633..682b5ea3aec 100644
--- a/components/layout/lib.rs
+++ b/components/layout/lib.rs
@@ -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;