Remove explicit dependencies on serde_derive

This commit is contained in:
Simon Sapin 2017-06-16 13:58:21 +02:00
parent 76d8573393
commit 605ef8b7ec
42 changed files with 27 additions and 96 deletions

21
Cargo.lock generated
View file

@ -6,7 +6,6 @@ dependencies = [
"msg 0.0.1",
"rust-webvr 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -250,7 +249,6 @@ dependencies = [
"ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_config 0.0.1",
]
@ -335,7 +333,6 @@ dependencies = [
"heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.43.0 (git+https://github.com/servo/webrender)",
]
@ -519,7 +516,6 @@ dependencies = [
"profile_traits 0.0.1",
"script_traits 0.0.1",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_config 0.0.1",
"servo_rand 0.0.1",
"servo_remutex 0.0.1",
@ -672,7 +668,6 @@ dependencies = [
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -689,7 +684,6 @@ dependencies = [
"ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_url 0.0.1",
"time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1050,7 +1044,6 @@ dependencies = [
"ordered-float 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"range 0.0.1",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_atoms 0.0.1",
"servo_geometry 0.0.1",
@ -1086,7 +1079,6 @@ dependencies = [
"heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"range 0.0.1",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1440,7 +1432,6 @@ dependencies = [
"script_traits 0.0.1",
"selectors 0.19.0",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_config 0.0.1",
"servo_geometry 0.0.1",
@ -1485,7 +1476,6 @@ dependencies = [
"script_layout_interface 0.0.1",
"script_traits 0.0.1",
"selectors 0.19.0",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_config 0.0.1",
"servo_geometry 0.0.1",
@ -1744,7 +1734,6 @@ dependencies = [
"heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.43.0 (git+https://github.com/servo/webrender)",
]
@ -1778,7 +1767,6 @@ dependencies = [
"parse-hosts 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"profile_traits 0.0.1",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-websocket 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_config 0.0.1",
@ -1843,7 +1831,6 @@ dependencies = [
"msg 0.0.1",
"num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_config 0.0.1",
"servo_url 0.0.1",
"url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2173,7 +2160,6 @@ dependencies = [
"profile_traits 0.0.1",
"regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_config 0.0.1",
"task_info 0.0.1",
@ -2198,7 +2184,6 @@ dependencies = [
"ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_config 0.0.1",
"signpost 0.1.0 (git+https://github.com/pcwalton/signpost.git)",
"time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2254,7 +2239,6 @@ dependencies = [
"heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2507,7 +2491,6 @@ dependencies = [
"profile_traits 0.0.1",
"rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_atoms 0.0.1",
"servo_url 0.0.1",
"style_traits 0.0.1",
@ -2737,7 +2720,6 @@ dependencies = [
"num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_geometry 0.0.1",
"servo_url 0.0.1",
"url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2791,7 +2773,6 @@ dependencies = [
"heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_rand 0.0.1",
"url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2940,7 +2921,6 @@ dependencies = [
"regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.19.0",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_arc 0.0.1",
"servo_atoms 0.0.1",
"servo_config 0.0.1",
@ -2997,7 +2977,6 @@ dependencies = [
"heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.19.0",
"serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]

View file

@ -13,5 +13,4 @@ path = "lib.rs"
ipc-channel = "0.8"
regex = "0.2"
serde = "1.0"
serde_derive = "1.0"
servo_config = {path = "../config"}

View file

@ -4,8 +4,7 @@
extern crate ipc_channel;
extern crate regex;
#[macro_use]
extern crate serde_derive;
#[macro_use] extern crate serde;
extern crate servo_config;
pub mod blocklist;

View file

@ -16,5 +16,4 @@ heapsize = "0.4"
heapsize_derive = "0.1"
ipc-channel = "0.8"
serde = "1.0"
serde_derive = "1.0"
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}

View file

@ -12,7 +12,7 @@ extern crate euclid;
extern crate heapsize;
#[macro_use] extern crate heapsize_derive;
extern crate ipc_channel;
#[macro_use] extern crate serde_derive;
#[macro_use] extern crate serde;
extern crate webrender_traits;
use cssparser::RGBA;

View file

@ -17,7 +17,6 @@ log = "0.3.5"
num_cpus = "1.1.0"
rustc-serialize = "0.3"
serde = "1.0"
serde_derive = "1.0"
servo_geometry = {path = "../geometry"}
servo_url = {path = "../url"}
url = "1.2"

View file

@ -12,7 +12,7 @@ extern crate getopts;
#[macro_use] extern crate log;
extern crate num_cpus;
extern crate rustc_serialize;
#[macro_use] extern crate serde_derive;
#[macro_use] extern crate serde;
extern crate servo_geometry;
extern crate servo_url;
extern crate url;

View file

@ -33,7 +33,6 @@ offscreen_gl_context = { version = "0.11", features = ["serde"] }
profile_traits = {path = "../profile_traits"}
script_traits = {path = "../script_traits"}
serde = "1.0"
serde_derive = "1.0"
style_traits = {path = "../style_traits"}
servo_config = {path = "../config"}
servo_rand = {path = "../rand"}

View file

@ -32,9 +32,7 @@ extern crate net_traits;
extern crate offscreen_gl_context;
extern crate profile_traits;
extern crate script_traits;
extern crate serde;
#[macro_use]
extern crate serde_derive;
#[macro_use] extern crate serde;
extern crate servo_config;
extern crate servo_rand;
extern crate servo_remutex;

View file

@ -17,6 +17,5 @@ ipc-channel = "0.8"
log = "0.3.5"
msg = {path = "../msg"}
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
time = "0.1"

View file

@ -20,9 +20,7 @@ extern crate ipc_channel;
#[macro_use]
extern crate log;
extern crate msg;
extern crate serde;
#[macro_use]
extern crate serde_derive;
#[macro_use] extern crate serde;
extern crate serde_json;
extern crate time;

View file

@ -18,6 +18,5 @@ hyper_serde = "0.7"
ipc-channel = "0.8"
msg = {path = "../msg"}
serde = "1.0"
serde_derive = "1.0"
servo_url = {path = "../url"}
time = "0.1"

View file

@ -19,7 +19,7 @@ extern crate heapsize;
extern crate hyper;
extern crate ipc_channel;
extern crate msg;
#[macro_use] extern crate serde_derive;
#[macro_use] extern crate serde;
extern crate servo_url;
extern crate time;

View file

@ -29,7 +29,6 @@ net_traits = {path = "../net_traits"}
ordered-float = "0.4"
range = {path = "../range"}
serde = "1.0"
serde_derive = "1.0"
servo_atoms = {path = "../atoms"}
servo_geometry = {path = "../geometry"}
servo_url = {path = "../url"}

View file

@ -56,10 +56,7 @@ extern crate msg;
extern crate net_traits;
extern crate ordered_float;
extern crate range;
#[cfg(target_os = "macos")]
extern crate serde;
#[macro_use]
extern crate serde_derive;
#[macro_use] extern crate serde;
extern crate servo_geometry;
extern crate servo_url;
#[macro_use] extern crate servo_atoms;

View file

@ -14,4 +14,3 @@ heapsize = "0.4"
heapsize_derive = "0.1"
range = {path = "../range"}
serde = "1.0"
serde_derive = "1.0"

View file

@ -9,10 +9,8 @@
extern crate heapsize;
#[macro_use] extern crate heapsize_derive;
#[macro_use]
extern crate range;
#[macro_use]
extern crate serde_derive;
#[macro_use] extern crate range;
#[macro_use] extern crate serde;
pub mod print_tree;

View file

@ -34,7 +34,6 @@ script_layout_interface = {path = "../script_layout_interface"}
script_traits = {path = "../script_traits"}
selectors = { path = "../selectors" }
serde = "1.0"
serde_derive = "1.0"
servo_geometry = {path = "../geometry"}
serde_json = "1.0"
servo_config = {path = "../config"}

View file

@ -36,9 +36,7 @@ extern crate range;
extern crate rayon;
extern crate script_layout_interface;
extern crate script_traits;
extern crate serde;
#[macro_use]
extern crate serde_derive;
#[macro_use] extern crate serde;
extern crate serde_json;
extern crate servo_config;
extern crate servo_geometry;

View file

@ -30,7 +30,6 @@ script = {path = "../script"}
script_layout_interface = {path = "../script_layout_interface"}
script_traits = {path = "../script_traits"}
selectors = { path = "../selectors" }
serde_derive = "1.0"
serde_json = "1.0"
servo_config = {path = "../config"}
servo_geometry = {path = "../geometry"}

View file

@ -14,5 +14,4 @@ bitflags = "0.7"
heapsize = "0.4"
heapsize_derive = "0.1"
serde = "1.0"
serde_derive = "1.0"
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}

View file

@ -8,8 +8,7 @@
extern crate bitflags;
extern crate heapsize;
#[macro_use] extern crate heapsize_derive;
#[macro_use]
extern crate serde_derive;
#[macro_use] extern crate serde;
extern crate webrender_traits;
pub mod constellation_msg;

View file

@ -31,7 +31,6 @@ openssl = "0.9"
parse-hosts = "0.3.0"
profile_traits = {path = "../profile_traits"}
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
servo_config = {path = "../config"}
servo_url = {path = "../url"}

View file

@ -28,9 +28,7 @@ extern crate net_traits;
extern crate openssl;
extern crate parse_hosts;
extern crate profile_traits;
extern crate serde;
#[macro_use]
extern crate serde_derive;
#[macro_use] extern crate serde;
extern crate serde_json;
extern crate servo_config;
extern crate servo_url;

View file

@ -23,7 +23,6 @@ log = "0.3.5"
msg = {path = "../msg"}
num-traits = "0.1.32"
serde = "1.0"
serde_derive = "1.0"
servo_config = {path = "../config"}
servo_url = {path = "../url"}
url = {version = "1.2", features = ["heap_size"]}

View file

@ -9,21 +9,16 @@
extern crate cookie as cookie_rs;
extern crate heapsize;
#[macro_use]
extern crate heapsize_derive;
#[macro_use] extern crate heapsize_derive;
extern crate hyper;
extern crate hyper_serde;
extern crate image as piston_image;
extern crate ipc_channel;
#[macro_use]
extern crate lazy_static;
#[macro_use]
extern crate log;
#[macro_use] extern crate lazy_static;
#[macro_use] extern crate log;
extern crate msg;
extern crate num_traits;
extern crate serde;
#[macro_use]
extern crate serde_derive;
#[macro_use] extern crate serde;
extern crate servo_config;
extern crate servo_url;
extern crate url;

View file

@ -15,7 +15,6 @@ ipc-channel = "0.8"
heartbeats-simple = "0.4"
log = "0.3.5"
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
servo_config = {path = "../config"}
time = "0.1.12"

View file

@ -21,7 +21,7 @@ extern crate profile_traits;
#[cfg(target_os = "linux")]
extern crate regex;
#[macro_use]
extern crate serde_derive;
extern crate serde;
extern crate serde_json;
extern crate servo_config;
#[cfg(target_os = "macos")]

View file

@ -18,7 +18,6 @@ energymon = {git = "https://github.com/energymon/energymon-rust.git", optional =
ipc-channel = "0.8"
log = "0.3.5"
serde = "1.0"
serde_derive = "1.0"
servo_config = {path = "../config"}
signpost = {git = "https://github.com/pcwalton/signpost.git"}
time = "0.1.12"

View file

@ -12,8 +12,7 @@
extern crate ipc_channel;
#[macro_use]
extern crate log;
#[macro_use]
extern crate serde_derive;
#[macro_use] extern crate serde;
extern crate servo_config;
extern crate signpost;

View file

@ -15,4 +15,3 @@ heapsize = "0.4"
heapsize_derive = "0.1"
num-traits = "0.1.32"
serde = "1.0"
serde_derive = "1.0"

View file

@ -9,8 +9,7 @@
extern crate heapsize;
#[macro_use] extern crate heapsize_derive;
extern crate num_traits;
#[macro_use]
extern crate serde_derive;
#[macro_use] extern crate serde;
use std::cmp::{self, max, min};
use std::fmt;

View file

@ -29,7 +29,6 @@ offscreen_gl_context = { version = "0.11", features = ["serde"] }
profile_traits = {path = "../profile_traits"}
rustc-serialize = "0.3.4"
serde = "1.0"
serde_derive = "1.0"
servo_atoms = {path = "../atoms"}
servo_url = {path = "../url"}
style_traits = {path = "../style_traits", features = ["servo"]}

View file

@ -28,9 +28,7 @@ extern crate net_traits;
extern crate offscreen_gl_context;
extern crate profile_traits;
extern crate rustc_serialize;
extern crate serde;
#[macro_use]
extern crate serde_derive;
#[macro_use] extern crate serde;
extern crate servo_atoms;
extern crate servo_url;
extern crate style_traits;

View file

@ -18,7 +18,7 @@ doctest = false
[features]
gecko = ["nsstring_vendor", "num_cpus", "style_traits/gecko"]
use_bindgen = ["bindgen", "regex", "toml"]
servo = ["serde", "serde_derive", "heapsize", "heapsize_derive",
servo = ["serde", "heapsize", "heapsize_derive",
"style_traits/servo", "servo_atoms", "servo_config", "html5ever",
"cssparser/heapsize", "cssparser/serde", "encoding", "smallvec/heapsizeof",
@ -60,8 +60,7 @@ precomputed-hash = "0.1"
rayon = "0.8"
selectors = { path = "../selectors" }
servo_arc = { path = "../servo_arc" }
serde = {version = "1.0", optional = true}
serde_derive = {version = "1.0", optional = true}
serde = {version = "1.0", optional = true, features = ["derive"]}
servo_atoms = {path = "../atoms", optional = true}
servo_config = {path = "../config", optional = true}
smallvec = "0.4"

View file

@ -72,7 +72,7 @@ extern crate pdqsort;
#[cfg(feature = "gecko")] extern crate precomputed_hash;
extern crate rayon;
extern crate selectors;
#[cfg(feature = "servo")] #[macro_use] extern crate serde_derive;
#[cfg(feature = "servo")] #[macro_use] extern crate serde;
pub extern crate servo_arc;
#[cfg(feature = "servo")] #[macro_use] extern crate servo_atoms;
#[cfg(feature = "servo")] extern crate servo_config;

View file

@ -10,8 +10,7 @@ name = "style_traits"
path = "lib.rs"
[features]
servo = ["heapsize", "heapsize_derive", "serde", "serde_derive",
"cssparser/heapsize", "cssparser/serde"]
servo = ["heapsize", "heapsize_derive", "serde", "cssparser/heapsize", "cssparser/serde"]
gecko = []
[dependencies]
@ -23,4 +22,3 @@ heapsize = {version = "0.4", optional = true}
heapsize_derive = {version = "0.1", optional = true}
selectors = { path = "../selectors" }
serde = {version = "1.0", optional = true}
serde_derive = {version = "1.0", optional = true}

View file

@ -20,7 +20,7 @@ extern crate euclid;
#[cfg(feature = "servo")] extern crate heapsize;
#[cfg(feature = "servo")] #[macro_use] extern crate heapsize_derive;
extern crate selectors;
#[cfg(feature = "servo")] #[macro_use] extern crate serde_derive;
#[cfg(feature = "servo")] #[macro_use] extern crate serde;
use selectors::parser::SelectorParseError;
use std::borrow::Cow;

View file

@ -13,7 +13,6 @@ path = "lib.rs"
heapsize = {version = "0.4"}
heapsize_derive = {version = "0.1"}
serde = {version = "1.0"}
serde_derive = {version = "1.0"}
servo_rand = {path = "../rand"}
url = {version = "1.2", features = ["heap_size"]}
url_serde = {version = "0.2"}

View file

@ -9,8 +9,7 @@
#[macro_use] extern crate heapsize;
#[macro_use] extern crate heapsize_derive;
extern crate serde;
#[macro_use] extern crate serde_derive;
#[macro_use] extern crate serde;
extern crate servo_rand;
extern crate url;
extern crate url_serde;

View file

@ -14,4 +14,3 @@ ipc-channel = "0.8"
msg = {path = "../msg"}
rust-webvr = {version = "0.5", features = ["serde-serialization"]}
serde = "1.0"
serde_derive = "1.0"

View file

@ -6,8 +6,7 @@
extern crate ipc_channel;
extern crate msg;
#[macro_use]
extern crate serde_derive;
#[macro_use] extern crate serde;
pub extern crate rust_webvr as webvr;
mod webvr_traits;