mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-28 12:45:27 +00:00
servo: Merge #6474 - Use the heap module through its facade in libstd (from Ms2ger:alloc); r=metajack
Source-Repo: https://github.com/servo/servo Source-Revision: e6db6ae61f3962b17b6e6b3af6249037484fdf0e
This commit is contained in:
parent
112f9f7675
commit
8e614a31b9
@ -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;
|
||||
|
@ -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};
|
||||
|
@ -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]
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user