diff --git a/Cargo.lock b/Cargo.lock index c50a4773f98..de85b0e14b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -275,7 +275,7 @@ version = "0.0.1" dependencies = [ "azure 0.14.0 (git+https://github.com/servo/rust-azure)", "canvas_traits 0.0.1", - "cssparser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -290,7 +290,7 @@ dependencies = [ name = "canvas_traits" version = "0.0.1" dependencies = [ - "cssparser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -516,26 +516,28 @@ dependencies = [ [[package]] name = "cssparser" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cssparser-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser-macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cssparser-macros" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)", + "procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -585,7 +587,7 @@ dependencies = [ name = "deny_public_fields" version = "0.0.1" dependencies = [ - "syn 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -645,15 +647,15 @@ dependencies = [ name = "dom_struct" version = "0.0.1" dependencies = [ - "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "domobject_derive" version = "0.0.1" dependencies = [ - "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -931,7 +933,7 @@ version = "0.0.1" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1109,8 +1111,8 @@ name = "heapsize_derive" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1153,9 +1155,9 @@ dependencies = [ "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1310,8 +1312,8 @@ dependencies = [ name = "jstraceable_derive" version = "0.0.1" dependencies = [ - "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1342,7 +1344,7 @@ dependencies = [ "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", - "cssparser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", @@ -1655,7 +1657,7 @@ name = "msg" version = "0.0.1" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2046,6 +2048,11 @@ dependencies = [ "num-iter 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "procedural-masquerade" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "profile" version = "0.0.1" @@ -2110,7 +2117,7 @@ dependencies = [ [[package]] name = "quote" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2234,8 +2241,7 @@ dependencies = [ "caseless 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "cmake 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.12.0 (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", @@ -2305,7 +2311,7 @@ dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", - "cssparser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2374,8 +2380,7 @@ name = "selectors" version = "0.18.0" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2395,7 +2400,7 @@ name = "serde_codegen" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "serde_codegen_internals 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", "syntex 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2415,7 +2420,7 @@ name = "serde_codegen_internals" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "syn 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2423,9 +2428,9 @@ name = "serde_derive" version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "serde_codegen_internals 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2730,8 +2735,7 @@ dependencies = [ "bindgen 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2749,7 +2753,6 @@ dependencies = [ "owning_ref 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "pdqsort 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.18.0", @@ -2770,10 +2773,9 @@ name = "style_tests" version = "0.0.1" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever-atoms 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "owning_ref 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2791,8 +2793,7 @@ name = "style_traits" version = "0.0.1" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2806,7 +2807,7 @@ version = "0.0.1" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "geckoservo 0.0.1", @@ -2827,16 +2828,16 @@ name = "syn" version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "syn" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "synom 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2854,8 +2855,8 @@ name = "synstructure" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3392,8 +3393,8 @@ dependencies = [ "checksum core-foundation-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "41115a6aa5d3e1e5ef98148373f25971d1fad53818553f216495f9e67e90a624" "checksum core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ead017dcf77f503dc991f6b52de6084eeea60a94b0a652baa9bf88654a28e83f" "checksum core-text 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e9719616a10f717628e074744f8c55df7b450f7a34d29c196d14f4498aad05d" -"checksum cssparser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d8352ccd22c5ebab558d179e32f6d3dd26eed30252f8420d636bfae5052eb50e" -"checksum cssparser-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a85e1452f40a50777c8424fa7fcaa7dd7074c7bc5419014fbffe7ea3d750dee8" +"checksum cssparser 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "112b0e846ce6b441564c908a2e74d98a2c6f2cbe838b0f32d037d5bfb9e982ca" +"checksum cssparser-macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f0415de0bdbce823c0db204e00a62c8240fa2d3e04cd13ff7c6396e4446b95" "checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850" "checksum dbus 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "94d266a872aaf68b50d02083c429a3686935ab6ab54824290509cdc422673eaf" "checksum debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9a032eac705ca39214d169f83e3d3da290af06d8d1d344d1baad2fd002dca4b3" @@ -3513,9 +3514,10 @@ dependencies = [ "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903" "checksum pnacl-build-helper 1.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "61c9231d31aea845007443d62fcbb58bb6949ab9c18081ee1e09920e0cf1118b" "checksum png 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3cb773e9a557edb568ce9935cf783e3cdcabe06a9449d41b3e5506d88e582c82" +"checksum procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9f566249236c6ca4340f7ca78968271f0ed2b0f234007a61b66f9ecd0af09260" "checksum quasi 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dcbf815446dc6a0afbc72d88f9a8aa71b608d10b168e09437c80c0fd6fd410c9" "checksum quasi_codegen 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b06172e92ab0099427609854ffb1512c377be5fc4beaf572ae5d5a01b8359596" -"checksum quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "08de3f12e670f83f61e450443cbae34496a35b665691fd8e99b24ec662f75865" +"checksum quote 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7375cf7ad34a92e8fd18dd9c42f58b9a11def59ab48bec955bf359a788335592" "checksum rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "022e0636ec2519ddae48154b028864bdce4eaf7d35226ab8e65c611be97b189d" "checksum rayon 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50c575b58c2b109e2fbc181820cbe177474f35610ff9e357dc75f6bac854ffbf" "checksum redox_syscall 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "8dd35cc9a8bdec562c757e3d43c1526b5c6d2653e23e2315065bc25556550753" @@ -3557,7 +3559,7 @@ dependencies = [ "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 syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)" = "58fd09df59565db3399efbba34ba8a2fec1307511ebd245d0061ff9d42691673" -"checksum syn 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0e28da8d02d75d1e58b89258e0741128f0b0d8a8309fb5c627be0fbd37a76c67" +"checksum syn 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)" = "37c279fb816210c9bb28b2c292664581e7b87b4561e86b94df462664d8620bb8" "checksum synom 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8fece1853fb872b0acdc3ff88f37c474018e125ef81cd4cb8c0ca515746b62ed" "checksum synstructure 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ccc9780bf1aa601943988c2876ab22413c01ad1739689aa6af18d0aa0b3f38b" "checksum syntex 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb3f52553a966675982404dc34028291b347e0c9a9c0b0b34f2da6be8a0443f8" diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index 9c374c1c68f..5a5c6e54f58 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -12,7 +12,7 @@ path = "lib.rs" [dependencies] azure = {git = "https://github.com/servo/rust-azure"} canvas_traits = {path = "../canvas_traits"} -cssparser = {version = "0.11", features = ["heapsize", "serde"]} +cssparser = "0.12" euclid = "0.11" gleam = "0.2.8" ipc-channel = "0.7" diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml index 6c539762587..ff6248dedb9 100644 --- a/components/canvas_traits/Cargo.toml +++ b/components/canvas_traits/Cargo.toml @@ -10,7 +10,7 @@ name = "canvas_traits" path = "lib.rs" [dependencies] -cssparser = {version = "0.11", features = ["heapsize", "serde"]} +cssparser = "0.12" euclid = "0.11" heapsize = "0.3.0" heapsize_derive = "0.1" diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 6139aff4c58..7b58136107b 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -14,7 +14,7 @@ app_units = "0.4" atomic_refcell = "0.1" bitflags = "0.7" canvas_traits = {path = "../canvas_traits"} -cssparser = {version = "0.11", features = ["heapsize", "serde"]} +cssparser = "0.12" euclid = "0.11" fnv = "1.0" gfx = {path = "../gfx"} diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index 55ea4d911ad..884c78a828f 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -11,7 +11,7 @@ path = "lib.rs" [dependencies] bitflags = "0.7" -cssparser = {version = "0.11", features = ["heapsize", "serde"]} +cssparser = "0.12" heapsize = "0.3.0" heapsize_derive = "0.1" serde = "0.9" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index bc2e981f88e..74910cddda6 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -34,8 +34,7 @@ byteorder = "1.0" canvas_traits = {path = "../canvas_traits"} caseless = "0.1.0" cookie = "0.2.5" -cssparser = {version = "0.11", features = ["heapsize", "serde"]} -cssparser-macros = "0.1.0" +cssparser = "0.12" deny_public_fields = {path = "../deny_public_fields"} devtools_traits = {path = "../devtools_traits"} dom_struct = {path = "../dom_struct"} diff --git a/components/script/lib.rs b/components/script/lib.rs index 93bcdd14b35..1b3f9af3540 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -37,7 +37,6 @@ extern crate caseless; extern crate cookie as cookie_rs; extern crate core; #[macro_use] extern crate cssparser; -#[macro_use] extern crate cssparser_macros; #[macro_use] extern crate deny_public_fields; extern crate devtools_traits; extern crate dom_struct; diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml index 5f7b61d5938..f39146882c7 100644 --- a/components/script_layout_interface/Cargo.toml +++ b/components/script_layout_interface/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" app_units = "0.4" atomic_refcell = "0.1" canvas_traits = {path = "../canvas_traits"} -cssparser = {version = "0.11", features = ["heapsize", "serde"]} +cssparser = "0.12" euclid = "0.11" gfx_traits = {path = "../gfx_traits"} heapsize = "0.3.0" diff --git a/components/selectors/Cargo.toml b/components/selectors/Cargo.toml index f51cdaa91a7..b342e79fa82 100644 --- a/components/selectors/Cargo.toml +++ b/components/selectors/Cargo.toml @@ -18,6 +18,5 @@ path = "lib.rs" [dependencies] bitflags = "0.7" matches = "0.1" -cssparser = "0.11" -cssparser-macros = "0.1.0" +cssparser = "0.12" fnv = "1.0" diff --git a/components/selectors/lib.rs b/components/selectors/lib.rs index 4d853744bc5..247902074b9 100644 --- a/components/selectors/lib.rs +++ b/components/selectors/lib.rs @@ -4,7 +4,6 @@ #[macro_use] extern crate bitflags; #[macro_use] extern crate cssparser; -#[macro_use] extern crate cssparser_macros; #[macro_use] extern crate matches; extern crate fnv; diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 6dd79ceb77a..d6792900c2c 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -26,8 +26,7 @@ app_units = "0.4" atomic_refcell = "0.1" bitflags = "0.7" cfg-if = "0.1.0" -cssparser = "0.11" -cssparser-macros = "0.1.0" +cssparser = "0.12" encoding = "0.2" euclid = "0.11" fnv = "1.0" @@ -43,7 +42,6 @@ num-traits = "0.1.32" ordered-float = "0.4" owning_ref = "0.2.2" parking_lot = "0.3.3" -phf = "0.7.20" pdqsort = "0.1.0" rayon = "0.6" selectors = { path = "../selectors" } diff --git a/components/style/lib.rs b/components/style/lib.rs index 968f720093d..b681e5d1804 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -43,7 +43,6 @@ extern crate atomic_refcell; extern crate bitflags; #[cfg(feature = "gecko")] #[macro_use] #[no_link] extern crate cfg_if; #[macro_use] extern crate cssparser; -#[macro_use] extern crate cssparser_macros; extern crate encoding; extern crate euclid; extern crate fnv; @@ -65,7 +64,6 @@ extern crate ordered_float; extern crate owning_ref; extern crate parking_lot; extern crate pdqsort; -extern crate phf; extern crate rayon; extern crate selectors; #[cfg(feature = "servo")] #[macro_use] extern crate serde_derive; diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index bec5065a3d5..d582debeba2 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -698,17 +698,17 @@ impl PropertyId { Shorthand(ShorthandId), } ascii_case_insensitive_phf_map! { - StaticIds: Map = { + static_id -> StaticId = { % for (kind, properties) in [("Longhand", data.longhands), ("Shorthand", data.shorthands)]: % for property in properties: % for name in [property.name] + property.alias: - "${name}" => "StaticId::${kind}(${kind}Id::${property.camel_case})", + "${name}" => StaticId::${kind}(${kind}Id::${property.camel_case}), % endfor % endfor % endfor } } - match StaticIds::get(&property_name) { + match static_id(&property_name) { Some(&StaticId::Longhand(id)) => Ok(PropertyId::Longhand(id)), Some(&StaticId::Shorthand(id)) => Ok(PropertyId::Shorthand(id)), None => Err(()), diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml index e333e464505..7c5a4f4dd2f 100644 --- a/components/style_traits/Cargo.toml +++ b/components/style_traits/Cargo.toml @@ -15,8 +15,7 @@ servo = ["heapsize", "heapsize_derive", "serde", "serde_derive", [dependencies] app_units = "0.4" -cssparser = "0.11" -cssparser-macros = "0.1.0" +cssparser = "0.12" euclid = "0.11" heapsize = {version = "0.3.0", optional = true} heapsize_derive = {version = "0.1", optional = true} diff --git a/components/style_traits/lib.rs b/components/style_traits/lib.rs index 88537b504c4..95cd0b3e3dd 100644 --- a/components/style_traits/lib.rs +++ b/components/style_traits/lib.rs @@ -15,7 +15,6 @@ extern crate app_units; #[macro_use] extern crate cssparser; -#[macro_use] extern crate cssparser_macros; extern crate euclid; #[cfg(feature = "servo")] extern crate heapsize; #[cfg(feature = "servo")] #[macro_use] extern crate heapsize_derive; diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml index dd8c8b55d41..829aa98a270 100644 --- a/ports/geckolib/Cargo.toml +++ b/ports/geckolib/Cargo.toml @@ -15,7 +15,7 @@ bindgen = ["style/use_bindgen"] [dependencies] app_units = "0.4" atomic_refcell = "0.1" -cssparser = "0.11" +cssparser = "0.12" env_logger = {version = "0.4", default-features = false} # disable `regex` to reduce code size euclid = "0.11" lazy_static = "0.2" diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml index eeb7ff58442..98838676937 100644 --- a/tests/unit/style/Cargo.toml +++ b/tests/unit/style/Cargo.toml @@ -14,10 +14,9 @@ testing = ["style/testing"] [dependencies] app_units = "0.4" -cssparser = {version = "0.11", features = ["heapsize"]} +cssparser = "0.12" euclid = "0.11" html5ever-atoms = "0.2" -matches = "0.1" owning_ref = "0.2.2" parking_lot = "0.3" rayon = "0.6" diff --git a/tests/unit/style/lib.rs b/tests/unit/style/lib.rs index e9b0133538f..184ff4e1579 100644 --- a/tests/unit/style/lib.rs +++ b/tests/unit/style/lib.rs @@ -9,7 +9,6 @@ extern crate app_units; extern crate cssparser; extern crate euclid; #[macro_use] extern crate html5ever_atoms; -#[macro_use] extern crate matches; extern crate owning_ref; extern crate parking_lot; extern crate rayon; diff --git a/tests/unit/style/str.rs b/tests/unit/style/str.rs index 9625fea72a4..dafbd8fb7da 100644 --- a/tests/unit/style/str.rs +++ b/tests/unit/style/str.rs @@ -2,7 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use std::borrow::Cow; use style::str::{split_html_space_chars, str_join}; #[test] diff --git a/tests/unit/stylo/Cargo.toml b/tests/unit/stylo/Cargo.toml index 2127bf479cf..ef4e4669924 100644 --- a/tests/unit/stylo/Cargo.toml +++ b/tests/unit/stylo/Cargo.toml @@ -14,7 +14,7 @@ doctest = false [dependencies] app_units = "0.4" atomic_refcell = "0.1" -cssparser = "0.11" +cssparser = "0.12" env_logger = "0.4" euclid = "0.11" lazy_static = "0.2"