Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-11 16:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade rust to f93ab64d4a1a7ee91759a1594ab2a426b6cc657e/rustc-1.5.0-dev.

Browse source
This commit is contained in:
Manish Goregaokar 2015-09-21 13:12:01 +05:30 • committed by Ms2ger
parent 8f1469eb08
commit 3c969b346a
40 changed files with 253 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gfx/Cargo.toml
View file

@ -18,7 +18,7 @@ libc = "0.1"
log = "0.3"
rand = "0.3"
rustc-serialize = "0.3"
serde = "0.5"
serde = "0.6"
serde_macros = "0.5"
smallvec = "0.1"
string_cache = "0.1"

4
components/gfx/lib.rs
View file

@ -2,8 +2,7 @@
* 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(arc_weak)]
#![feature(box_raw)]
#![feature(alloc)]
#![feature(box_syntax)]
// For simd (currently x86_64/aarch64)
@ -26,6 +25,7 @@
extern crate log;
extern crate serde;
extern crate alloc;
extern crate azure;
#[macro_use] extern crate bitflags;
extern crate fnv;

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

@ -2,6 +2,7 @@
* 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::heap;
use freetype::freetype::FTErrorMethods;
use freetype::freetype::FT_Add_Default_Modules;
use freetype::freetype::FT_Done_Library;
@ -12,7 +13,6 @@ use freetype::freetype::struct_FT_MemoryRec_;
use libc::{c_void, c_long};
use std::ptr;
use std::rc::Rc;
use std::rt::heap;
use util::mem::{HeapSizeOf, heap_size_of};
// We pass a |User| struct -- via an opaque |void*| -- to FreeType each time a new instance is