From 605ef8b7ecd31aead8c29dcc034bcf1e4f3c73c7 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 16 Jun 2017 13:58:21 +0200 Subject: [PATCH] Remove explicit dependencies on serde_derive --- Cargo.lock | 21 --------------------- components/bluetooth_traits/Cargo.toml | 1 - components/bluetooth_traits/lib.rs | 3 +-- components/canvas_traits/Cargo.toml | 1 - components/canvas_traits/lib.rs | 2 +- components/config/Cargo.toml | 1 - components/config/lib.rs | 2 +- components/constellation/Cargo.toml | 1 - components/constellation/lib.rs | 4 +--- components/devtools/Cargo.toml | 1 - components/devtools/lib.rs | 4 +--- components/devtools_traits/Cargo.toml | 1 - components/devtools_traits/lib.rs | 2 +- components/gfx/Cargo.toml | 1 - components/gfx/lib.rs | 5 +---- components/gfx_traits/Cargo.toml | 1 - components/gfx_traits/lib.rs | 6 ++---- components/layout/Cargo.toml | 1 - components/layout/lib.rs | 4 +--- components/layout_thread/Cargo.toml | 1 - components/msg/Cargo.toml | 1 - components/msg/lib.rs | 3 +-- components/net/Cargo.toml | 1 - components/net/lib.rs | 4 +--- components/net_traits/Cargo.toml | 1 - components/net_traits/lib.rs | 13 ++++--------- components/profile/Cargo.toml | 1 - components/profile/lib.rs | 2 +- components/profile_traits/Cargo.toml | 1 - components/profile_traits/lib.rs | 3 +-- components/range/Cargo.toml | 1 - components/range/lib.rs | 3 +-- components/script_traits/Cargo.toml | 1 - components/script_traits/lib.rs | 4 +--- components/style/Cargo.toml | 5 ++--- components/style/lib.rs | 2 +- components/style_traits/Cargo.toml | 4 +--- components/style_traits/lib.rs | 2 +- components/url/Cargo.toml | 1 - components/url/lib.rs | 3 +-- components/webvr_traits/Cargo.toml | 1 - components/webvr_traits/lib.rs | 3 +-- 42 files changed, 27 insertions(+), 96 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a7aa094c145..ad3a4b6be03 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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]] diff --git a/components/bluetooth_traits/Cargo.toml b/components/bluetooth_traits/Cargo.toml index 61abad75cbd..d67faf596fa 100644 --- a/components/bluetooth_traits/Cargo.toml +++ b/components/bluetooth_traits/Cargo.toml @@ -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"} diff --git a/components/bluetooth_traits/lib.rs b/components/bluetooth_traits/lib.rs index e54d256fe0c..31e644bd863 100644 --- a/components/bluetooth_traits/lib.rs +++ b/components/bluetooth_traits/lib.rs @@ -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; diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml index 4f3bf65fc86..a6d9f792955 100644 --- a/components/canvas_traits/Cargo.toml +++ b/components/canvas_traits/Cargo.toml @@ -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"]} diff --git a/components/canvas_traits/lib.rs b/components/canvas_traits/lib.rs index 3a143001d10..8ca3249379e 100644 --- a/components/canvas_traits/lib.rs +++ b/components/canvas_traits/lib.rs @@ -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; diff --git a/components/config/Cargo.toml b/components/config/Cargo.toml index fddc4fe4fd4..2c98f114fcd 100644 --- a/components/config/Cargo.toml +++ b/components/config/Cargo.toml @@ -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" diff --git a/components/config/lib.rs b/components/config/lib.rs index 1ff26a406bc..55c33e25b02 100644 --- a/components/config/lib.rs +++ b/components/config/lib.rs @@ -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; diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml index 3fc5ce6f9a8..5953c383416 100644 --- a/components/constellation/Cargo.toml +++ b/components/constellation/Cargo.toml @@ -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"} diff --git a/components/constellation/lib.rs b/components/constellation/lib.rs index 1740a42bb51..608656bb30c 100644 --- a/components/constellation/lib.rs +++ b/components/constellation/lib.rs @@ -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; diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml index eba36fd28c1..2ce43e5eb1f 100644 --- a/components/devtools/Cargo.toml +++ b/components/devtools/Cargo.toml @@ -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" diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index 5dbab989ae2..d5a2764a710 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -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; diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml index 06708eb5df2..fe0cc20c674 100644 --- a/components/devtools_traits/Cargo.toml +++ b/components/devtools_traits/Cargo.toml @@ -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" diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs index f5b13ac855f..ee69a490916 100644 --- a/components/devtools_traits/lib.rs +++ b/components/devtools_traits/lib.rs @@ -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; diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 3d36469c392..01250b1dbbb 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -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"} diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index 3f356bb0cea..10ba03c0dbc 100644 --- a/components/gfx/lib.rs +++ b/components/gfx/lib.rs @@ -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; diff --git a/components/gfx_traits/Cargo.toml b/components/gfx_traits/Cargo.toml index ed62c5e0ca0..f9de4fc3088 100644 --- a/components/gfx_traits/Cargo.toml +++ b/components/gfx_traits/Cargo.toml @@ -14,4 +14,3 @@ heapsize = "0.4" heapsize_derive = "0.1" range = {path = "../range"} serde = "1.0" -serde_derive = "1.0" diff --git a/components/gfx_traits/lib.rs b/components/gfx_traits/lib.rs index 14f168671d7..f035df15f1b 100644 --- a/components/gfx_traits/lib.rs +++ b/components/gfx_traits/lib.rs @@ -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; diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index a474f01721c..6b1ad9d2e6d 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -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"} diff --git a/components/layout/lib.rs b/components/layout/lib.rs index ca85d83e9d1..de8f4755eeb 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -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; diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml index 593a52afc70..a63b37cfed5 100644 --- a/components/layout_thread/Cargo.toml +++ b/components/layout_thread/Cargo.toml @@ -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"} diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index e852dadad46..c09d9b40bcb 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -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"]} diff --git a/components/msg/lib.rs b/components/msg/lib.rs index 8014597a2f4..074b62a9676 100644 --- a/components/msg/lib.rs +++ b/components/msg/lib.rs @@ -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; diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index dd2452d5239..c58260367c2 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -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"} diff --git a/components/net/lib.rs b/components/net/lib.rs index f96a6fbf2c0..14df9dcc684 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -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; diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index cf446faa04e..91c00ed33dc 100644 --- a/components/net_traits/Cargo.toml +++ b/components/net_traits/Cargo.toml @@ -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"]} diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index b912918bc3a..91a112f1f6f 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -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; diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml index 9aeeb56aab2..bc7b3e7f173 100644 --- a/components/profile/Cargo.toml +++ b/components/profile/Cargo.toml @@ -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" diff --git a/components/profile/lib.rs b/components/profile/lib.rs index 6a598ad3764..6a456e1bb83 100644 --- a/components/profile/lib.rs +++ b/components/profile/lib.rs @@ -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")] diff --git a/components/profile_traits/Cargo.toml b/components/profile_traits/Cargo.toml index c0cba2383f3..67af6697aea 100644 --- a/components/profile_traits/Cargo.toml +++ b/components/profile_traits/Cargo.toml @@ -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" diff --git a/components/profile_traits/lib.rs b/components/profile_traits/lib.rs index 5a2d96bae10..35a2657ee9e 100644 --- a/components/profile_traits/lib.rs +++ b/components/profile_traits/lib.rs @@ -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; diff --git a/components/range/Cargo.toml b/components/range/Cargo.toml index 26dddf3d1e8..1b2e0681286 100644 --- a/components/range/Cargo.toml +++ b/components/range/Cargo.toml @@ -15,4 +15,3 @@ heapsize = "0.4" heapsize_derive = "0.1" num-traits = "0.1.32" serde = "1.0" -serde_derive = "1.0" diff --git a/components/range/lib.rs b/components/range/lib.rs index 109b14560b9..dcb95148550 100644 --- a/components/range/lib.rs +++ b/components/range/lib.rs @@ -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; diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index 621c536bad2..6303224ecb7 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -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"]} diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 507d074663f..44c269c61d1 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -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; diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 9a33a57da64..f0f7b28deed 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -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" diff --git a/components/style/lib.rs b/components/style/lib.rs index 192ee3f242f..2a4a65b37a4 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -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; diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml index 87cc1bb7093..84089411781 100644 --- a/components/style_traits/Cargo.toml +++ b/components/style_traits/Cargo.toml @@ -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} diff --git a/components/style_traits/lib.rs b/components/style_traits/lib.rs index ed085a12993..41a8fe224fc 100644 --- a/components/style_traits/lib.rs +++ b/components/style_traits/lib.rs @@ -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; diff --git a/components/url/Cargo.toml b/components/url/Cargo.toml index 1f3d2428449..bc5f4930649 100644 --- a/components/url/Cargo.toml +++ b/components/url/Cargo.toml @@ -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"} diff --git a/components/url/lib.rs b/components/url/lib.rs index 0df3b92fb90..98a88bb1cf6 100644 --- a/components/url/lib.rs +++ b/components/url/lib.rs @@ -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; diff --git a/components/webvr_traits/Cargo.toml b/components/webvr_traits/Cargo.toml index 126e1dadc28..f83426f1426 100644 --- a/components/webvr_traits/Cargo.toml +++ b/components/webvr_traits/Cargo.toml @@ -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" diff --git a/components/webvr_traits/lib.rs b/components/webvr_traits/lib.rs index 55c3057fcb7..5773ce1e644 100644 --- a/components/webvr_traits/lib.rs +++ b/components/webvr_traits/lib.rs @@ -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;