aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/gfx/lib.rs2
-rw-r--r--components/gfx/platform/freetype/font_context.rs2
-rw-r--r--components/layout/flow_ref.rs2
-rw-r--r--components/layout/lib.rs2
4 files changed, 2 insertions, 6 deletions
diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs
index dec7548cdae..fb9e36884a1 100644
--- a/components/gfx/lib.rs
+++ b/components/gfx/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(arc_weak)]
#![feature(box_raw)]
#![feature(box_syntax)]
@@ -21,7 +20,6 @@
#[macro_use]
extern crate log;
-extern crate alloc;
extern crate azure;
#[macro_use] extern crate bitflags;
extern crate fnv;
diff --git a/components/gfx/platform/freetype/font_context.rs b/components/gfx/platform/freetype/font_context.rs
index 489edf18505..eeaec2a0491 100644
--- a/components/gfx/platform/freetype/font_context.rs
+++ b/components/gfx/platform/freetype/font_context.rs
@@ -10,9 +10,9 @@ use freetype::freetype::FT_Memory;
use freetype::freetype::FT_New_Library;
use freetype::freetype::struct_FT_MemoryRec_;
-use alloc::heap;
use std::ptr;
use std::rc::Rc;
+use std::rt::heap;
use util::mem::{HeapSizeOf, heap_size_of};
use libc::{c_void, c_long};
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;