From e94de4e1bd3ec233690200b3b46193a7e307c3ca Mon Sep 17 00:00:00 2001 From: Bastien Orivel Date: Fri, 30 Nov 2018 12:28:20 +0100 Subject: [PATCH] Update syn and related dependencies --- Cargo.lock | 278 ++++++++---------- components/deny_public_fields/Cargo.toml | 4 +- components/dom_struct/Cargo.toml | 2 +- components/domobject_derive/Cargo.toml | 5 +- components/domobject_derive/lib.rs | 14 +- components/jstraceable_derive/Cargo.toml | 6 +- components/jstraceable_derive/lib.rs | 6 +- components/malloc_size_of_derive/Cargo.toml | 6 +- components/malloc_size_of_derive/lib.rs | 6 +- components/style/Cargo.toml | 2 +- components/style_derive/Cargo.toml | 9 +- components/style_derive/animate.rs | 7 +- components/style_derive/cg.rs | 32 +- .../style_derive/compute_squared_distance.rs | 5 +- components/style_derive/lib.rs | 1 + components/style_derive/parse.rs | 6 +- .../style_derive/specified_value_info.rs | 13 +- components/style_derive/to_animated_value.rs | 8 +- components/style_derive/to_animated_zero.rs | 5 +- components/style_derive/to_computed_value.rs | 8 +- components/style_derive/to_css.rs | 15 +- servo-tidy.toml | 3 - 22 files changed, 215 insertions(+), 226 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d4ed393d731..f3c6583a913 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -204,7 +204,7 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.43.2" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -216,10 +216,10 @@ dependencies = [ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "which 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -376,9 +376,9 @@ dependencies = [ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "compositing 0.0.1", - "cssparser 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", "half 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -396,7 +396,7 @@ dependencies = [ name = "canvas_traits" version = "0.0.1" dependencies = [ - "cssparser 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -759,10 +759,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cssparser" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cssparser-macros 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser-macros 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "dtoa-short 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -772,49 +772,50 @@ dependencies = [ "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cssparser-macros" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "phf_codegen 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "procedural-masquerade 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "darling" -version = "0.4.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "darling_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "darling_macro 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "darling_core 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "darling_macro 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "darling_core" -version = "0.4.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "ident_case 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "darling_macro" -version = "0.4.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "darling_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", + "darling_core 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -848,8 +849,8 @@ dependencies = [ name = "deny_public_fields" version = "0.0.1" dependencies = [ - "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "synstructure 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", + "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -934,15 +935,16 @@ name = "dom_struct" version = "0.0.1" dependencies = [ "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "domobject_derive" version = "0.0.1" dependencies = [ - "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1051,17 +1053,17 @@ name = "enum-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "enum-iterator-derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "enum-iterator-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "enum-iterator-derive" -version = "0.2.0" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1102,6 +1104,14 @@ dependencies = [ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "failure" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "fake-simd" version = "0.1.2" @@ -1132,7 +1142,7 @@ dependencies = [ [[package]] name = "fnv" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1256,7 +1266,7 @@ dependencies = [ "core-text 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwrote 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "fontsan 0.4.0 (git+https://github.com/servo/fontsan)", "freetype 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", @@ -1574,7 +1584,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1623,7 +1633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.6 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1673,15 +1683,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "html5ever" -version = "0.22.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "markup5ever 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1690,7 +1700,7 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1862,7 +1872,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1925,9 +1935,9 @@ dependencies = [ name = "jstraceable_derive" version = "0.0.1" dependencies = [ - "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "synstructure 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", + "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1964,11 +1974,11 @@ dependencies = [ "canvas_traits 0.0.1", "crossbeam-channel 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", - "html5ever 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2010,12 +2020,12 @@ dependencies = [ "crossbeam-channel 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "embedder_traits 0.0.1", "euclid 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", "histogram 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "layout 0.0.1", "layout_traits 0.0.1", @@ -2267,7 +2277,7 @@ version = "0.0.1" dependencies = [ "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)", "hashglobe 0.1.0", "hyper 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2293,9 +2303,9 @@ dependencies = [ name = "malloc_size_of_derive" version = "0.0.1" dependencies = [ - "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "synstructure 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", + "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2317,7 +2327,7 @@ dependencies = [ "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_codegen 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2503,16 +2513,16 @@ dependencies = [ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "mozjs_sys 0.61.3 (registry+https://github.com/rust-lang/crates.io-index)", + "mozjs_sys 0.61.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "mozjs_sys" -version = "0.61.3" +version = "0.61.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bindgen 0.43.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bindgen 0.44.0 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2671,13 +2681,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2958,14 +2968,6 @@ name = "precomputed-hash" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "proc-macro2" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "proc-macro2" version = "0.4.6" @@ -3030,14 +3032,6 @@ name = "quick-error" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "quote" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "quote" version = "0.6.3" @@ -3251,7 +3245,7 @@ dependencies = [ "cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", "deny_public_fields 0.0.1", "devtools_traits 0.0.1", "dom_struct 0.0.1", @@ -3260,11 +3254,11 @@ dependencies = [ "encoding_rs 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", "enum-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", "headers-core 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "headers-ext 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3335,10 +3329,10 @@ dependencies = [ "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "crossbeam-channel 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", - "html5ever 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3419,7 +3413,7 @@ name = "selectors" version = "0.20.0" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3454,7 +3448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.6 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3534,7 +3528,7 @@ dependencies = [ [[package]] name = "servo-media" version = "0.1.0" -source = "git+https://github.com/servo/media#3b347d7b0431c58611e2bd7b22d34062b64cda26" +source = "git+https://github.com/servo/media#f90235b16d9eb956ad9dba2dbca53e8f25e8b451" dependencies = [ "servo-media-audio 0.1.0 (git+https://github.com/servo/media)", "servo-media-gstreamer 0.1.0 (git+https://github.com/servo/media)", @@ -3544,7 +3538,7 @@ dependencies = [ [[package]] name = "servo-media-audio" version = "0.1.0" -source = "git+https://github.com/servo/media#3b347d7b0431c58611e2bd7b22d34062b64cda26" +source = "git+https://github.com/servo/media#f90235b16d9eb956ad9dba2dbca53e8f25e8b451" dependencies = [ "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3561,7 +3555,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer" version = "0.1.0" -source = "git+https://github.com/servo/media#3b347d7b0431c58611e2bd7b22d34062b64cda26" +source = "git+https://github.com/servo/media#f90235b16d9eb956ad9dba2dbca53e8f25e8b451" dependencies = [ "byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3579,7 +3573,7 @@ dependencies = [ [[package]] name = "servo-media-player" version = "0.1.0" -source = "git+https://github.com/servo/media#3b347d7b0431c58611e2bd7b22d34062b64cda26" +source = "git+https://github.com/servo/media#f90235b16d9eb956ad9dba2dbca53e8f25e8b451" dependencies = [ "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3628,7 +3622,7 @@ name = "servo_atoms" version = "0.0.1" dependencies = [ "string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_codegen 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3666,10 +3660,11 @@ dependencies = [ [[package]] name = "servo_media_derive" version = "0.1.0" -source = "git+https://github.com/servo/media#3b347d7b0431c58611e2bd7b22d34062b64cda26" +source = "git+https://github.com/servo/media#f90235b16d9eb956ad9dba2dbca53e8f25e8b451" dependencies = [ - "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3817,19 +3812,19 @@ dependencies = [ "phf_shared 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)", "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_codegen 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_codegen" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "phf_generator 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3850,18 +3845,18 @@ dependencies = [ "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "bindgen 0.43.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bindgen 0.44.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding_rs 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)", "fallible 0.0.1", "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "hashglobe 0.1.0", - "html5ever 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3870,7 +3865,7 @@ dependencies = [ "malloc_size_of_derive 0.0.1", "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "num-derive 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "num-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "num-integer 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3905,10 +3900,11 @@ dependencies = [ name = "style_derive" version = "0.0.1" dependencies = [ - "darling 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "synstructure 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "darling 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", + "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3917,9 +3913,9 @@ version = "0.0.1" dependencies = [ "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.20.0", @@ -3940,7 +3936,7 @@ version = "0.0.1" dependencies = [ "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", "malloc_size_of_derive 0.0.1", @@ -3959,27 +3955,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "syn" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "syn" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "syn" -version = "0.15.6" +version = "0.15.22" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3989,12 +3965,12 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.8.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4083,7 +4059,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num-derive 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "num-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4640,9 +4616,10 @@ dependencies = [ [[package]] name = "which" -version = "1.0.3" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4849,7 +4826,7 @@ dependencies = [ "checksum base64 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "85415d2594767338a74a30c1d370b2f3262ec1b4ed2d7bba5b3faf4de40467d9" "checksum binary-space-partition 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88ceb0d16c4fd0e42876e298d7d3ce3780dd9ebdcbe4199816a32c77e08597ff" "checksum bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bda13183df33055cbb84b847becce220d392df502ebe7a4a78d7021771ed94d0" -"checksum bindgen 0.43.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d52d263eacd15d26cbcf215d254b410bd58212aaa2d3c453a04b2d3b3adcf41" +"checksum bindgen 0.44.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d8de1946c252145e09ed00ea90a8685fce15b8f94bb4dc1a0daaf2a9b375be61" "checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789" "checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" "checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab" @@ -4897,11 +4874,11 @@ dependencies = [ "checksum crossbeam-epoch 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c90f1474584f38e270b5b613e898c8c328aa4f3dea85e0a27ac2e642f009416" "checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9" "checksum crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "677d453a17e8bd2b913fa38e8b9cf04bcdbb5be790aa294f2389661d72036015" -"checksum cssparser 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)" = "730363a45c4e248d4f21d3e5c1156d1a9cdec0855056c0d9539e814bc59865c3" -"checksum cssparser-macros 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f3a5383ae18dbfdeb569ed62019f5bddb2a95cd2d3833313c475a0d014777805" -"checksum darling 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2a78af487e4eb8f4421a1770687b328af6bb4494ca93435210678c6eea875c11" -"checksum darling_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b315f49c7b6db3708bca6e6913c194581a44ec619b7a39e131d4dd63733a3698" -"checksum darling_macro 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eb69a38fdeaeaf3db712e1df170de67ee9dfc24fb88ca3e9d21e703ec25a4d8e" +"checksum cssparser 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa4c7e7b72ef04e94e80cec7a4bd795fc2a67a9ce627bc684cf95dd89711d972" +"checksum cssparser-macros 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b16e382d9b983fdb9ac6a36b37fdeb84ce3ea81f749febfee3463cfa7f24275e" +"checksum darling 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f000e7b03a0083a30e1f10b1428a530849c21e72b338fa76869b5dbc4b045bf" +"checksum darling_core 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "86bc5ce438f4b703755d12f59bbf0a16c642766d4534e922db47569dbdd0b998" +"checksum darling_macro 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9973050ba46be2a2935a7b316147f41a808ac604b8f0fef6eba77fd47a89daeb" "checksum dbus 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3d975a175aa2dced1a6cd410b89a1bf23918f301eab2b6f7c5e608291b757639" "checksum deflate 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ebb02aaf4b775afc96684b8402510a338086974e38570a1f65bea8c202eb77a7" "checksum device 0.0.1 (git+https://github.com/servo/devices)" = "" @@ -4920,15 +4897,16 @@ dependencies = [ "checksum energymon-default-sys 0.3.0 (git+https://github.com/energymon/energymon-sys.git)" = "" "checksum energymon-sys 0.3.0 (git+https://github.com/energymon/energymon-sys.git)" = "" "checksum enum-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85012092e543e198a02f3ac3d587798253e8ec374bc9c3d7da5319cf579ea4c6" -"checksum enum-iterator-derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "719423964c7a03e4ce4c67115d6e44a5b2dd9b51789a575dfbad68b490b0f0a0" +"checksum enum-iterator-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "293ee6af5f9349c2594a7c867b7c89347fb939415508e6367a19bd246ffc08d8" "checksum env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "afb070faf94c85d17d50ca44f6ad076bce18ae92f0037d350947240a36e9d42e" "checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02" "checksum euclid 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)" = "600657e7e5c03bfbccdc68721bc3b5abcb761553973387124eae9c9e4f02c210" "checksum expat-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" +"checksum failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6dd377bcc1b1b7ce911967e3ec24fa19c3224394ec05b54aa7b083d498341ac7" "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" "checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" "checksum flate2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fac2277e84e5e858483756647a9d0aa8d9a2b7cba517fd84325a0aaa69a0909" -"checksum fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc484842f1e2884faf56f529f960cc12ad8c71ce96cc7abba0a067c98fee344" +"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" "checksum fontsan 0.4.0 (git+https://github.com/servo/fontsan)" = "" "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" "checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" @@ -4975,7 +4953,7 @@ dependencies = [ "checksum heartbeats-simple-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e1a408c0011427cc0e0049f7861c70377819aedfc006e8c901b1c70fd98fb1a4" "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" "checksum histogram 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1bdcec4094c1ca961b685384ea7af76af5718230b3f34657d1a71fd2dcf4cc9d" -"checksum html5ever 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b04478cf718862650a0bf66acaf8f2f8c906fbc703f35c916c1f4211b069a364" +"checksum html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c213fa6a618dc1da552f54f85cba74b05d8e883c92ec4e89067736938084c26e" "checksum http 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "24f58e8c2d8e886055c3ead7b28793e1455270b5fb39650984c224bc538ba581" "checksum httparse 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7b6288d7db100340ca12873fd4d08ad1b8f206a9457798dfb17c018a33fee540" "checksum humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e" @@ -5036,7 +5014,7 @@ dependencies = [ "checksum mitochondria 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9de3eca27871df31c33b807f834b94ef7d000956f57aa25c5aed9c5f0aae8f6f" "checksum mozangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "45a8a18a41cfab0fde25cc2f43ea89064d211a0fbb33225b8ff93ab20406e0e7" "checksum mozjs 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d1db0edead699324dd1768f74054a5a759de36a8ce92b15e8b179ec2549d19e" -"checksum mozjs_sys 0.61.3 (registry+https://github.com/rust-lang/crates.io-index)" = "aab461a68a8476f01e17407a92ac425d21ce8d455d46c3684f226de3cf6e3ceb" +"checksum mozjs_sys 0.61.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fc31fdefb0d0459dc2c6ed82f49e43dc848f975380bda84852649fdb97eb6689" "checksum msdos_time 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aad9dfe950c057b1bfe9c1f2aa51583a8468ef2a5baba2ebbe06d775efeb7729" "checksum muldiv 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "451a9a05d2a32c566c897835e0ea95cf79ed2fdfe957924045a1721a36c9980f" "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" @@ -5044,7 +5022,7 @@ dependencies = [ "checksum nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37e713a259ff641624b6cb20e3b12b2952313ba36b6823c0f16e6cfd9e5de17" "checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2" "checksum nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a" -"checksum num-derive 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d2c31b75c36a993d30c7a13d70513cb93f02acafdd5b7ba250f9b0e18615de7" +"checksum num-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8af1847c907c2f04d7bfd572fb25bbb4385c637fe5be163cf2f8c5d778fe1e7d" "checksum num-integer 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac0ea58d64a89d9d6b7688031b3be9358d6c919badcf7fbb0527ccfd891ee45" "checksum num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "af3fdbbc3291a5464dc57b03860ec37ca6bf915ed6ee385e7c6c052c422b2124" "checksum num-rational 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e96f040177bb3da242b5b1ecf3f54b5d5af3efbbfb18608977a5d2767b22f10" @@ -5077,11 +5055,9 @@ dependencies = [ "checksum png 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f54b9600d584d3b8a739e1662a595fab051329eff43f20e7d8cc22872962145b" "checksum podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd" "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -"checksum proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "77997c53ae6edd6d187fec07ec41b207063b5ee6f33680e9fa86d405cdd313d4" "checksum proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "effdb53b25cdad54f8f48843d67398f7ef2e14f12c1b4cb4effc549a6462a4d6" "checksum procedural-masquerade 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9a1574a51c3fd37b26d2c0032b649d08a7d51d4cca9c41bbc5bf7118fa4509d0" "checksum quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eda5fe9b71976e62bc81b781206aaa076401769b2143379d3eb2118388babac4" -"checksum quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7b0ff51282f28dc1b53fd154298feaa2e77c5ea0dba68e1fd8b03b72fbe13d2a" "checksum quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e44651a0dc4cdd99f71c83b561e221f714912d11af1a4dff0631f923d53af035" "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1" "checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5" @@ -5133,14 +5109,12 @@ dependencies = [ "checksum stb_truetype 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "48fa7d3136d8645909de1f7c7eb5416cc43057a75ace08fc39ae736bc9da8af1" "checksum string 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00caf261d6f90f588f8450b8e1230fa0d5be49ee6140fdfbcb55335aff350970" "checksum string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25d70109977172b127fe834e5449e5ab1740b9ba49fa18a2020f509174f25423" -"checksum string_cache_codegen 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "35293b05cf1494e8ddd042a7df6756bf18d07f42d234f32e71dce8a7aabb0191" +"checksum string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1eea1eee654ef80933142157fdad9dd8bc43cf7c74e999e369263496f04ff4da" "checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc" "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694" "checksum swapper 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e454d048db5527d000bfddb77bd072bbf3a1e2ae785f16d9bd116e07c2ab45eb" -"checksum syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "91b52877572087400e83d24b9178488541e3d535259e04ff17a63df1e5ceff59" -"checksum syn 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c67da57e61ebc7b7b6fff56bb34440ca3a83db037320b0507af4c10368deda7d" -"checksum syn 0.15.6 (registry+https://github.com/rust-lang/crates.io-index)" = "854b08a640fc8f54728fb95321e3ec485b365a97fe47609797c671addd1dde69" -"checksum synstructure 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "98cad891cd238c98e1f0aec9f7c0f620aa696e4e5f7daba56ac67b5e86a6b049" +"checksum syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)" = "ae8b29eb5210bc5cf63ed6149cbf9adfc82ac0be023d8735c176ee74a2db4da7" +"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" "checksum tempfile 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47776f63b85777d984a50ce49d6b9e58826b6a3766a449fc95bc66cd5663c15b" "checksum tendril 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9de21546595a0873061940d994bbbc5c35f024ae4fd61ec5c5b159115684f508" "checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" @@ -5202,7 +5176,7 @@ dependencies = [ "checksum webdriver 0.38.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57600e820ab8ac3fcfed782edfb5ac1b530f5980d9c17030d13fd367e9734681" "checksum webrender 0.57.2 (git+https://github.com/servo/webrender)" = "" "checksum webrender_api 0.57.2 (git+https://github.com/servo/webrender)" = "" -"checksum which 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4be6cfa54dab45266e98b5d7be2f8ce959ddd49abd141a05d52dce4b07f803bb" +"checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" diff --git a/components/deny_public_fields/Cargo.toml b/components/deny_public_fields/Cargo.toml index bc396ee720a..48fd07402c2 100644 --- a/components/deny_public_fields/Cargo.toml +++ b/components/deny_public_fields/Cargo.toml @@ -11,5 +11,5 @@ path = "lib.rs" proc-macro = true [dependencies] -syn = "0.13.1" -synstructure = "0.8" +syn = "0.15" +synstructure = "0.10" diff --git a/components/dom_struct/Cargo.toml b/components/dom_struct/Cargo.toml index 319d01c39af..3af3c6127c9 100644 --- a/components/dom_struct/Cargo.toml +++ b/components/dom_struct/Cargo.toml @@ -7,7 +7,7 @@ version = "0.0.1" [dependencies] quote = "0.6.3" -syn = { version = "0.14.2", features = ["full"] } +syn = { version = "0.15", features = ["full"] } [lib] path = "lib.rs" diff --git a/components/domobject_derive/Cargo.toml b/components/domobject_derive/Cargo.toml index 0ab7212cafe..84a8783818f 100644 --- a/components/domobject_derive/Cargo.toml +++ b/components/domobject_derive/Cargo.toml @@ -11,5 +11,6 @@ path = "lib.rs" proc-macro = true [dependencies] -syn = "0.13.1" -quote = "0.5.1" +proc-macro2 = "0.4" +syn = "0.15" +quote = "0.6" diff --git a/components/domobject_derive/lib.rs b/components/domobject_derive/lib.rs index ed98e095f3c..1b082fc9e54 100644 --- a/components/domobject_derive/lib.rs +++ b/components/domobject_derive/lib.rs @@ -10,13 +10,16 @@ extern crate quote; #[macro_use] extern crate syn; +use proc_macro2; +use quote::TokenStreamExt; + #[proc_macro_derive(DomObject)] pub fn expand_token_stream(input: proc_macro::TokenStream) -> proc_macro::TokenStream { let input = syn::parse(input).unwrap(); expand_dom_object(input).into() } -fn expand_dom_object(input: syn::DeriveInput) -> quote::Tokens { +fn expand_dom_object(input: syn::DeriveInput) -> proc_macro2::TokenStream { let fields = if let syn::Data::Struct(syn::DataStruct { ref fields, .. }) = input.data { fields.iter().collect::>() } else { @@ -62,8 +65,8 @@ fn expand_dom_object(input: syn::DeriveInput) -> quote::Tokens { } }; - let mut params = quote::Tokens::new(); - params.append_separated(input.generics.type_params().map(|param| param.ident), ", "); + let mut params = proc_macro2::TokenStream::new(); + params.append_separated(input.generics.type_params().map(|param| ¶m.ident), ", "); // For each field in the struct, we implement ShouldNotImplDomObject for a // pair of all the type parameters of the DomObject and and the field type. @@ -87,7 +90,10 @@ fn expand_dom_object(input: syn::DeriveInput) -> quote::Tokens { impl #impl_generics ShouldNotImplDomObject for ((#params), __T) #where_clause {} }); - let dummy_const = syn::Ident::from(format!("_IMPL_DOMOBJECT_FOR_{}", name)); + let dummy_const = syn::Ident::new( + &format!("_IMPL_DOMOBJECT_FOR_{}", name), + proc_macro2::Span::call_site(), + ); let tokens = quote! { #[allow(non_upper_case_globals)] const #dummy_const: () = { #items }; diff --git a/components/jstraceable_derive/Cargo.toml b/components/jstraceable_derive/Cargo.toml index ecd035d1c09..33513b43df5 100644 --- a/components/jstraceable_derive/Cargo.toml +++ b/components/jstraceable_derive/Cargo.toml @@ -11,6 +11,6 @@ path = "lib.rs" proc-macro = true [dependencies] -quote = "0.5.1" -syn = "0.13.1" -synstructure = "0.8" +proc-macro2 = "0.4" +syn = "0.15" +synstructure = "0.10" diff --git a/components/jstraceable_derive/lib.rs b/components/jstraceable_derive/lib.rs index 471e9a29bf4..1a3e3faa966 100644 --- a/components/jstraceable_derive/lib.rs +++ b/components/jstraceable_derive/lib.rs @@ -9,15 +9,15 @@ extern crate synstructure; decl_derive!([JSTraceable] => js_traceable_derive); -fn js_traceable_derive(s: synstructure::Structure) -> quote::Tokens { +fn js_traceable_derive(s: synstructure::Structure) -> proc_macro2::TokenStream { let match_body = s.each(|binding| Some(quote!(#binding.trace(tracer);))); let ast = s.ast(); - let name = ast.ident; + let name = &ast.ident; let (impl_generics, ty_generics, where_clause) = ast.generics.split_for_impl(); let mut where_clause = where_clause.unwrap_or(&parse_quote!(where)).clone(); for param in ast.generics.type_params() { - let ident = param.ident; + let ident = ¶m.ident; where_clause .predicates .push(parse_quote!(#ident: crate::dom::bindings::trace::JSTraceable)) diff --git a/components/malloc_size_of_derive/Cargo.toml b/components/malloc_size_of_derive/Cargo.toml index 02bd4c3fc41..4cfc2ee1235 100644 --- a/components/malloc_size_of_derive/Cargo.toml +++ b/components/malloc_size_of_derive/Cargo.toml @@ -10,6 +10,6 @@ path = "lib.rs" proc-macro = true [dependencies] -quote = "0.5.1" -syn = { version = "0.13.1", features = ["full"] } -synstructure = "0.8" +proc-macro2 = "0.4" +syn = { version = "0.15", features = ["full"] } +synstructure = "0.10" diff --git a/components/malloc_size_of_derive/lib.rs b/components/malloc_size_of_derive/lib.rs index dc0d34af88f..0838f6cfb7f 100644 --- a/components/malloc_size_of_derive/lib.rs +++ b/components/malloc_size_of_derive/lib.rs @@ -10,7 +10,7 @@ //! A crate for deriving the MallocSizeOf trait. -extern crate quote; +extern crate proc_macro2; #[macro_use] extern crate syn; #[macro_use] @@ -19,7 +19,7 @@ extern crate synstructure; #[cfg(not(test))] decl_derive!([MallocSizeOf, attributes(ignore_malloc_size_of)] => malloc_size_of_derive); -fn malloc_size_of_derive(s: synstructure::Structure) -> quote::Tokens { +fn malloc_size_of_derive(s: synstructure::Structure) -> proc_macro2::TokenStream { let match_body = s.each(|binding| { let ignore = binding .ast() @@ -61,7 +61,7 @@ fn malloc_size_of_derive(s: synstructure::Structure) -> quote::Tokens { let (impl_generics, ty_generics, where_clause) = ast.generics.split_for_impl(); let mut where_clause = where_clause.unwrap_or(&parse_quote!(where)).clone(); for param in ast.generics.type_params() { - let ident = param.ident; + let ident = ¶m.ident; where_clause .predicates .push(parse_quote!(#ident: ::malloc_size_of::MallocSizeOf)); diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index e1e65c895ae..1dc2489d3c9 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -77,7 +77,7 @@ void = "1.0.2" [build-dependencies] lazy_static = "1" log = "0.4" -bindgen = { version = "0.43", optional = true, default-features = false } +bindgen = { version = "0.44", optional = true, default-features = false } regex = {version = "1.0", optional = true} walkdir = "2.1.4" toml = {version = "0.4.5", optional = true, default-features = false} diff --git a/components/style_derive/Cargo.toml b/components/style_derive/Cargo.toml index 072a674d4dc..13bd8854948 100644 --- a/components/style_derive/Cargo.toml +++ b/components/style_derive/Cargo.toml @@ -10,7 +10,8 @@ path = "lib.rs" proc-macro = true [dependencies] -darling = "0.4" -quote = "0.5.1" -syn = { version = "0.13.1", features = ["visit"] } -synstructure = "0.8" +darling = "0.8" +proc-macro2 = "0.4" +quote = "0.6" +syn = { version = "0.15", features = ["visit"] } +synstructure = "0.10" diff --git a/components/style_derive/animate.rs b/components/style_derive/animate.rs index e74dab53c23..905b0ad0e1f 100644 --- a/components/style_derive/animate.rs +++ b/components/style_derive/animate.rs @@ -4,11 +4,12 @@ use crate::cg; use darling::util::IdentList; -use quote::Tokens; +use proc_macro2::TokenStream; +use quote::TokenStreamExt; use syn::{DeriveInput, Path}; use synstructure::{Structure, VariantInfo}; -pub fn derive(mut input: DeriveInput) -> Tokens { +pub fn derive(mut input: DeriveInput) -> TokenStream { let animation_input_attrs = cg::parse_input_attrs::(&input); let no_bound = animation_input_attrs.no_bound.unwrap_or_default(); let mut where_clause = input.generics.where_clause.take(); @@ -67,7 +68,7 @@ pub fn derive(mut input: DeriveInput) -> Tokens { } } -fn derive_variant_arm(variant: &VariantInfo) -> Result { +fn derive_variant_arm(variant: &VariantInfo) -> Result { let variant_attrs = cg::parse_variant_attrs_from_ast::(&variant.ast()); if variant_attrs.error { return Err(()); diff --git a/components/style_derive/cg.rs b/components/style_derive/cg.rs index 87ffb1ec25f..46f4be2bc30 100644 --- a/components/style_derive/cg.rs +++ b/components/style_derive/cg.rs @@ -3,7 +3,8 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use darling::{FromDeriveInput, FromField, FromVariant}; -use quote::Tokens; +use proc_macro2::{Span, TokenStream}; +use quote::TokenStreamExt; use syn::{self, AngleBracketedGenericArguments, Binding, DeriveInput, Field}; use syn::{GenericArgument, GenericParam, Ident, Path}; use syn::{PathArguments, PathSegment, QSelf, Type, TypeArray}; @@ -18,9 +19,9 @@ pub fn add_predicate(where_clause: &mut Option, pred: WherePre .push(pred); } -pub fn fmap_match(input: &DeriveInput, bind_style: BindStyle, mut f: F) -> Tokens +pub fn fmap_match(input: &DeriveInput, bind_style: BindStyle, mut f: F) -> TokenStream where - F: FnMut(BindingInfo) -> Tokens, + F: FnMut(BindingInfo) -> TokenStream, { let mut s = synstructure::Structure::new(input); s.variants_mut().iter_mut().for_each(|v| { @@ -52,7 +53,7 @@ pub fn fmap_trait_output(input: &DeriveInput, trait_path: &Path, trait_output: I GenericArgument::Lifetime(data.lifetime.clone()) }, &GenericParam::Type(ref data) => { - let ident = data.ident; + let ident = &data.ident; GenericArgument::Type(parse_quote!(<#ident as #trait_path>::#trait_output)) }, ref arg => panic!("arguments {:?} cannot be mapped yet", arg), @@ -96,7 +97,7 @@ where ref path, }) => { if let Some(ident) = path_to_ident(path) { - if params.iter().any(|param| param.ident == ident) { + if params.iter().any(|ref param| ¶m.ident == ident) { return f(ident); } } @@ -209,7 +210,7 @@ where A: FromVariant, { let v = Variant { - ident: *variant.ident, + ident: variant.ident.clone(), attrs: variant.attrs.to_vec(), fields: variant.fields.clone(), discriminant: variant.discriminant.clone(), @@ -227,20 +228,23 @@ where } } -pub fn ref_pattern<'a>(variant: &'a VariantInfo, prefix: &str) -> (Tokens, Vec>) { +pub fn ref_pattern<'a>( + variant: &'a VariantInfo, + prefix: &str, +) -> (TokenStream, Vec>) { let mut v = variant.clone(); v.bind_with(|_| BindStyle::Ref); - v.bindings_mut() - .iter_mut() - .for_each(|b| b.binding = Ident::from(format!("{}_{}", b.binding, prefix))); + v.bindings_mut().iter_mut().for_each(|b| { + b.binding = Ident::new(&format!("{}_{}", b.binding, prefix), Span::call_site()) + }); (v.pat(), v.bindings().iter().cloned().collect()) } -pub fn value<'a>(variant: &'a VariantInfo, prefix: &str) -> (Tokens, Vec>) { +pub fn value<'a>(variant: &'a VariantInfo, prefix: &str) -> (TokenStream, Vec>) { let mut v = variant.clone(); - v.bindings_mut() - .iter_mut() - .for_each(|b| b.binding = Ident::from(format!("{}_{}", b.binding, prefix))); + v.bindings_mut().iter_mut().for_each(|b| { + b.binding = Ident::new(&format!("{}_{}", b.binding, prefix), Span::call_site()) + }); v.bind_with(|_| BindStyle::Move); (v.pat(), v.bindings().iter().cloned().collect()) } diff --git a/components/style_derive/compute_squared_distance.rs b/components/style_derive/compute_squared_distance.rs index 58c12b72855..d8cf2f6dd18 100644 --- a/components/style_derive/compute_squared_distance.rs +++ b/components/style_derive/compute_squared_distance.rs @@ -4,11 +4,12 @@ use crate::animate::{AnimationFieldAttrs, AnimationInputAttrs, AnimationVariantAttrs}; use crate::cg; -use quote::Tokens; +use proc_macro2::TokenStream; +use quote::TokenStreamExt; use syn::{DeriveInput, Path}; use synstructure; -pub fn derive(mut input: DeriveInput) -> Tokens { +pub fn derive(mut input: DeriveInput) -> TokenStream { let animation_input_attrs = cg::parse_input_attrs::(&input); let no_bound = animation_input_attrs.no_bound.unwrap_or_default(); let mut where_clause = input.generics.where_clause.take(); diff --git a/components/style_derive/lib.rs b/components/style_derive/lib.rs index abf3a42bc08..8631f2a33ea 100644 --- a/components/style_derive/lib.rs +++ b/components/style_derive/lib.rs @@ -7,6 +7,7 @@ #[macro_use] extern crate darling; extern crate proc_macro; +extern crate proc_macro2; #[macro_use] extern crate quote; #[macro_use] diff --git a/components/style_derive/parse.rs b/components/style_derive/parse.rs index 83c2e96737c..9042b12d988 100644 --- a/components/style_derive/parse.rs +++ b/components/style_derive/parse.rs @@ -4,7 +4,7 @@ use crate::cg; use crate::to_css::CssVariantAttrs; -use quote::Tokens; +use proc_macro2::TokenStream; use syn::{DeriveInput, Path}; use synstructure; @@ -15,7 +15,7 @@ pub struct ParseVariantAttrs { pub condition: Option, } -pub fn derive(input: DeriveInput) -> Tokens { +pub fn derive(input: DeriveInput) -> TokenStream { let name = &input.ident; let s = synstructure::Structure::new(&input); @@ -36,7 +36,7 @@ pub fn derive(input: DeriveInput) -> Tokens { let identifier = cg::to_css_identifier( &css_variant_attrs .keyword - .unwrap_or(variant.ast().ident.as_ref().into()), + .unwrap_or(variant.ast().ident.to_string()), ); let ident = &variant.ast().ident; diff --git a/components/style_derive/specified_value_info.rs b/components/style_derive/specified_value_info.rs index 9b1c5abbb11..a031fe83d06 100644 --- a/components/style_derive/specified_value_info.rs +++ b/components/style_derive/specified_value_info.rs @@ -5,16 +5,17 @@ use crate::cg; use crate::parse::ParseVariantAttrs; use crate::to_css::{CssFieldAttrs, CssInputAttrs, CssVariantAttrs}; -use quote::Tokens; +use proc_macro2::TokenStream; +use quote::TokenStreamExt; use syn::{Data, DeriveInput, Fields, Ident, Type}; -pub fn derive(mut input: DeriveInput) -> Tokens { +pub fn derive(mut input: DeriveInput) -> TokenStream { let css_attrs = cg::parse_input_attrs::(&input); let mut types = vec![]; let mut values = vec![]; - let input_ident = input.ident; - let input_name = || cg::to_css_identifier(input_ident.as_ref()); + let input_ident = &input.ident; + let input_name = || cg::to_css_identifier(&input_ident.to_string()); if let Some(function) = css_attrs.function { values.push(function.explicit().unwrap_or_else(input_name)); // If the whole value is wrapped in a function, value types of @@ -49,7 +50,7 @@ pub fn derive(mut input: DeriveInput) -> Tokens { } } let ident = &v.ident; - let variant_name = || cg::to_css_identifier(ident.as_ref()); + let variant_name = || cg::to_css_identifier(&ident.to_string()); if info_attrs.starts_with_keyword { values.push(variant_name()); continue; @@ -152,7 +153,7 @@ fn derive_struct_fields<'a>( .ident .as_ref() .expect("only named field should use represents_keyword"); - values.push(cg::to_css_identifier(ident.as_ref())); + values.push(cg::to_css_identifier(&ident.to_string())); return None; } if let Some(if_empty) = css_attrs.if_empty { diff --git a/components/style_derive/to_animated_value.rs b/components/style_derive/to_animated_value.rs index a6da5bfbc37..b53cf9c3d41 100644 --- a/components/style_derive/to_animated_value.rs +++ b/components/style_derive/to_animated_value.rs @@ -3,11 +3,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use crate::cg; -use quote; -use syn::DeriveInput; +use proc_macro2::{Span, TokenStream}; +use syn::{DeriveInput, Ident}; use synstructure::BindStyle; -pub fn derive(mut input: DeriveInput) -> quote::Tokens { +pub fn derive(mut input: DeriveInput) -> TokenStream { let mut where_clause = input.generics.where_clause.take(); for param in input.generics.type_params() { cg::add_predicate( @@ -33,7 +33,7 @@ pub fn derive(mut input: DeriveInput) -> quote::Tokens { let animated_value_type = cg::fmap_trait_output( &input, &parse_quote!(crate::values::animated::ToAnimatedValue), - "AnimatedValue".into(), + Ident::new("AnimatedValue", Span::call_site()), ); quote! { diff --git a/components/style_derive/to_animated_zero.rs b/components/style_derive/to_animated_zero.rs index 6e1cef9d469..b177c24ae87 100644 --- a/components/style_derive/to_animated_zero.rs +++ b/components/style_derive/to_animated_zero.rs @@ -4,11 +4,12 @@ use crate::animate::{AnimationFieldAttrs, AnimationInputAttrs, AnimationVariantAttrs}; use crate::cg; -use quote; +use proc_macro2::TokenStream; +use quote::TokenStreamExt; use syn; use synstructure; -pub fn derive(mut input: syn::DeriveInput) -> quote::Tokens { +pub fn derive(mut input: syn::DeriveInput) -> TokenStream { let animation_input_attrs = cg::parse_input_attrs::(&input); let no_bound = animation_input_attrs.no_bound.unwrap_or_default(); let mut where_clause = input.generics.where_clause.take(); diff --git a/components/style_derive/to_computed_value.rs b/components/style_derive/to_computed_value.rs index 3f074ec3b6a..68261740502 100644 --- a/components/style_derive/to_computed_value.rs +++ b/components/style_derive/to_computed_value.rs @@ -3,11 +3,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use crate::cg; -use quote::Tokens; -use syn::DeriveInput; +use proc_macro2::{Span, TokenStream}; +use syn::{DeriveInput, Ident}; use synstructure::BindStyle; -pub fn derive(mut input: DeriveInput) -> Tokens { +pub fn derive(mut input: DeriveInput) -> TokenStream { let mut where_clause = input.generics.where_clause.take(); let (to_body, from_body) = { let params = input.generics.type_params().collect::>(); @@ -79,7 +79,7 @@ pub fn derive(mut input: DeriveInput) -> Tokens { let computed_value_type = cg::fmap_trait_output( &input, &parse_quote!(crate::values::computed::ToComputedValue), - "ComputedValue".into(), + Ident::new("ComputedValue", Span::call_site()), ); quote! { diff --git a/components/style_derive/to_css.rs b/components/style_derive/to_css.rs index 8c838b57f1d..4eabdcb8357 100644 --- a/components/style_derive/to_css.rs +++ b/components/style_derive/to_css.rs @@ -4,11 +4,12 @@ use crate::cg; use darling::util::Override; -use quote::{ToTokens, Tokens}; +use proc_macro2::TokenStream; +use quote::{ToTokens, TokenStreamExt}; use syn::{self, Data, Path, WhereClause}; use synstructure::{BindingInfo, Structure, VariantInfo}; -pub fn derive(mut input: syn::DeriveInput) -> Tokens { +pub fn derive(mut input: syn::DeriveInput) -> TokenStream { let mut where_clause = input.generics.where_clause.take(); for param in input.generics.type_params() { cg::add_predicate(&mut where_clause, parse_quote!(#param: style_traits::ToCss)); @@ -66,9 +67,9 @@ pub fn derive(mut input: syn::DeriveInput) -> Tokens { impls } -fn derive_variant_arm(variant: &VariantInfo, generics: &mut Option) -> Tokens { +fn derive_variant_arm(variant: &VariantInfo, generics: &mut Option) -> TokenStream { let bindings = variant.bindings(); - let identifier = cg::to_css_identifier(variant.ast().ident.as_ref()); + let identifier = cg::to_css_identifier(&variant.ast().ident.to_string()); let ast = variant.ast(); let variant_attrs = cg::parse_variant_attrs_from_ast::(&ast); let separator = if variant_attrs.comma { ", " } else { " " }; @@ -118,7 +119,7 @@ fn derive_variant_fields_expr( bindings: &[BindingInfo], where_clause: &mut Option, separator: &str, -) -> Tokens { +) -> TokenStream { let mut iter = bindings .iter() .filter_map(|binding| { @@ -166,7 +167,7 @@ fn derive_single_field_expr( field: &BindingInfo, attrs: CssFieldAttrs, where_clause: &mut Option, -) -> Tokens { +) -> TokenStream { let mut expr = if attrs.iterable { if let Some(if_empty) = attrs.if_empty { return quote! { @@ -193,7 +194,7 @@ fn derive_single_field_expr( .ident .as_ref() .expect("Unnamed field with represents_keyword?"); - let ident = cg::to_css_identifier(ident.as_ref()); + let ident = cg::to_css_identifier(&ident.to_string()); quote! { if *#field { writer.raw_item(#ident)?; diff --git a/servo-tidy.toml b/servo-tidy.toml index 9f2170276d1..2b16573ac5d 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -37,10 +37,7 @@ packages = [ "crossbeam-epoch", "crossbeam-utils", "log", - "proc-macro2", - "quote", "rand", - "syn", "unicase", "winapi", ]