servo · bors-servo · Feb 28, 2017 · Feb 28, 2017 · Feb 28, 2017
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -698,17 +698,17 @@ impl PropertyId {
             Shorthand(ShorthandId),
         }
         ascii_case_insensitive_phf_map! {
-            StaticIds: Map<StaticId> = {
+            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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"