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

Auto merge of #13649 - servo:rustup, r=larsbergstrom

Browse source 
Update to Rust 1.14.0-nightly (19ac57926 2016-10-08)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13649)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-10-09 20:12:38 -05:00 • committed by GitHub
commit 39d3fce1af
47 changed files with 390 additions and 361 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/Cargo.toml
View file

@ -13,7 +13,7 @@ path = "lib.rs"
[features]
gecko = []
servo = ["serde/unstable", "serde", "serde_macros", "heapsize_plugin",
servo = ["serde/unstable", "serde", "serde_derive", "heapsize_plugin",
"style_traits/servo", "app_units/plugins",
"cssparser/heap_size", "cssparser/serde-serialization",
"selectors/unstable", "string_cache",
@ -45,7 +45,7 @@ rand = "0.3"
rustc-serialize = "0.3"
selectors = "0.13"
serde = {version = "0.8", optional = true}
serde_macros = {version = "0.8", optional = true}
serde_derive = {version = "0.8", optional = true}
smallvec = "0.1"
string_cache = {version = "0.2.26", features = ["heap_size"], optional = true}
style_traits = {path = "../style_traits"}

5
components/style/lib.rs
View file

@ -26,9 +26,11 @@
#![cfg_attr(feature = "servo", feature(custom_attribute))]
#![cfg_attr(feature = "servo", feature(custom_derive))]
#![cfg_attr(feature = "servo", feature(plugin))]
#![cfg_attr(feature = "servo", feature(proc_macro))]
#![cfg_attr(feature = "servo", feature(rustc_attrs))]
#![cfg_attr(feature = "servo", feature(structural_match))]
#![cfg_attr(feature = "servo", plugin(heapsize_plugin))]
#![cfg_attr(feature = "servo", plugin(plugins))]
#![cfg_attr(feature = "servo", plugin(serde_macros))]
#![deny(unsafe_code)]
@ -68,6 +70,7 @@ extern crate rustc_serialize;
extern crate selectors;
#[cfg(feature = "servo")]
extern crate serde;
#[cfg(feature = "servo")] #[macro_use] extern crate serde_derive;
extern crate smallvec;
#[cfg(feature = "servo")] #[macro_use] extern crate string_cache;
#[macro_use]