Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use heap API from std rather than the alloc crate

Browse source
This commit is contained in:
Simon Sapin 2017-07-13 15:26:40 +02:00
parent 612dbb868d
commit db1a3e54b0
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/gfx/lib.rs
View file

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// For SIMD
#![cfg_attr(any(target_os = "linux", target_os = "android"), feature(alloc, allocator_api))]
#![cfg_attr(any(target_os = "linux", target_os = "android"), feature(allocator_api))]
#![feature(box_syntax)]
#![feature(cfg_target_feature)]
#![feature(range_contains)]
@ -11,9 +11,6 @@
#![deny(unsafe_code)]
#[cfg(any(target_os = "linux", target_os = "android"))]
extern crate alloc;
extern crate app_units;
#[macro_use]
extern crate bitflags;

3
components/gfx/platform/freetype/font_context.rs
View file

@ -2,8 +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/. */
use alloc::allocator::{Alloc, Layout};
use alloc::heap::Heap;
use freetype::freetype::FT_Add_Default_Modules;
use freetype::freetype::FT_Done_Library;
use freetype::freetype::FT_Library;
@ -11,6 +9,7 @@ use freetype::freetype::FT_Memory;
use freetype::freetype::FT_MemoryRec_;
use freetype::freetype::FT_New_Library;
use heapsize::{HeapSizeOf, heap_size_of};
use std::heap::{Heap, Alloc, Layout};
use std::os::raw::{c_long, c_void};
use std::ptr;
use std::rc::Rc;