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

Auto merge of #15712 - nox:rustc-serialize, r=metajack

Browse source 
Remove rustc-serialize from style and style_traits

<!-- 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/15712)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-02-23 19:19:34 -08:00 • committed by GitHub
commit f9f55789b8
9 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/style_traits/Cargo.toml
View file

@ -19,6 +19,5 @@ cssparser = "0.10"
euclid = "0.11"
heapsize = {version = "0.3.0", optional = true}
heapsize_derive = {version = "0.1", optional = true}
rustc-serialize = "0.3"
serde = {version = "0.9", optional = true}
serde_derive = {version = "0.9", optional = true}

1
components/style_traits/lib.rs
View file

@ -19,7 +19,6 @@ extern crate cssparser;
extern crate euclid;
#[cfg(feature = "servo")] extern crate heapsize;
#[cfg(feature = "servo")] #[macro_use] extern crate heapsize_derive;
extern crate rustc_serialize;
#[cfg(feature = "servo")] #[macro_use] extern crate serde_derive;
/// Opaque type stored in type-unsafe work queues for parallel layout.

2
components/style_traits/values.rs
View file

@ -108,7 +108,7 @@ macro_rules! __define_css_keyword_enum__add_optional_traits {
macro_rules! __define_css_keyword_enum__actual {
($name: ident [ $( $derived_trait: ident),* ] [ $( $css: expr => $variant: ident ),+ ]) => {
#[allow(non_camel_case_types, missing_docs)]
#[derive(Clone, Eq, PartialEq, Copy, Hash, RustcEncodable, Debug $(, $derived_trait )* )]
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq $(, $derived_trait )* )]
pub enum $name {
$( $variant ),+
}