diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-01-27 18:15:50 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-01-27 18:15:50 -0700 |
| commit | 3f9012864a2cd927cf17a8e11dfa6922add1b7df (patch) | |
| tree | 2bb312c53b839df71b5f8115e91f90ea57d0620a /components/gfx/lib.rs | |
| parent | ff8cbff81016c157373c1675f3eee69dd70ae544 (diff) | |
| parent | 7fec73a432bcc2148b8866051ecb11be8d311fe3 (diff) | |
| download | servo-3f9012864a2cd927cf17a8e11dfa6922add1b7df.tar.gz servo-3f9012864a2cd927cf17a8e11dfa6922add1b7df.zip | |
auto merge of #4719 : servo/servo/rustup_20150109, r=jdm
Diffstat (limited to 'components/gfx/lib.rs')
| -rw-r--r-- | components/gfx/lib.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index d90a7185d8a..5f1eae371df 100644 --- a/components/gfx/lib.rs +++ b/components/gfx/lib.rs @@ -2,14 +2,14 @@ * 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(globs, macro_rules, phase, unsafe_destructor, default_type_params)] +#![feature(unsafe_destructor, int_uint, plugin, box_syntax)] #![deny(unused_imports)] #![deny(unused_variables)] #![allow(missing_copy_implementations)] +#![allow(unstable)] -#![feature(phase)] -#[phase(plugin, link)] +#[macro_use] extern crate log; extern crate azure; @@ -17,16 +17,15 @@ extern crate collections; extern crate geom; extern crate layers; extern crate libc; -extern crate rustrt; extern crate stb_image; extern crate png; extern crate script_traits; -extern crate serialize; +extern crate "serialize" as rustc_serialize; extern crate unicode; -#[phase(plugin)] +#[no_link] #[plugin] extern crate "plugins" as servo_plugins; extern crate "net" as servo_net; -#[phase(plugin, link)] +#[macro_use] extern crate "util" as servo_util; extern crate "msg" as servo_msg; extern crate style; |