Auto merge of #15735 - servo:cssparserup, r=emilio

Update cssparser to 0.11

<!-- Please describe your changes on the following line: -->

<s>Depends on https://github.com/servo/rust-cssparser/pull/122.</s>

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15735)
<!-- Reviewable:end -->

Author: bors-servo

Cargo.lock

@@ -12,7 +12,7 @@ path = "lib.rs"
 [dependencies]
 azure = {git = "https://github.com/servo/rust-azure"}
 canvas_traits = {path = "../canvas_traits"}
-cssparser = {version = "0.10", features = ["heapsize", "serde"]}
+cssparser = {version = "0.11", features = ["heapsize", "serde"]}
 euclid = "0.11"
 gleam = "0.2.8"
 ipc-channel = "0.7"

components/canvas/Cargo.toml

@@ -10,7 +10,7 @@ name = "canvas_traits"
 path = "lib.rs"
 
 [dependencies]
-cssparser = {version = "0.10", features = ["heapsize", "serde"]}
+cssparser = {version = "0.11", features = ["heapsize", "serde"]}
 euclid = "0.11"
 heapsize = "0.3.0"
 heapsize_derive = "0.1"

components/canvas_traits/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.10", features = ["heapsize", "serde"]}
+cssparser = {version = "0.11", features = ["heapsize", "serde"]}
 euclid = "0.11"
 fnv = "1.0"
 gfx = {path = "../gfx"}

components/layout/Cargo.toml

@@ -11,7 +11,7 @@ path = "lib.rs"
 
 [dependencies]
 bitflags = "0.7"
-cssparser = {version = "0.10", features = ["heapsize", "serde"]}
+cssparser = {version = "0.11", features = ["heapsize", "serde"]}
 heapsize = "0.3.0"
 heapsize_derive = "0.1"
 serde = "0.9"

components/msg/Cargo.toml

@@ -34,7 +34,8 @@ byteorder = "1.0"
 canvas_traits = {path = "../canvas_traits"}
 caseless = "0.1.0"
 cookie = "0.2.5"
-cssparser = {version = "0.10", features = ["heapsize", "serde"]}
+cssparser = {version = "0.11", features = ["heapsize", "serde"]}
+cssparser-macros = "0.1.0"
 deny_public_fields = {path = "../deny_public_fields"}
 devtools_traits = {path = "../devtools_traits"}
 dom_struct = {path = "../dom_struct"}

components/script/Cargo.toml

@@ -115,7 +115,7 @@ impl CSSKeyframesRuleMethods for CSSKeyframesRule {
         // https://github.com/w3c/csswg-drafts/issues/801
         // Setting this property to a CSS-wide keyword or `none` will
         // throw a Syntax Error.
-        match_ignore_ascii_case! { value,
+        match_ignore_ascii_case! { &value,
             "initial" => return Err(Error::Syntax),
             "inherit" => return Err(Error::Syntax),
             "unset" => return Err(Error::Syntax),

components/script/dom/csskeyframesrule.rs

@@ -36,10 +36,9 @@ extern crate canvas_traits;
 extern crate caseless;
 extern crate cookie as cookie_rs;
 extern crate core;
-#[macro_use]
-extern crate cssparser;
-#[macro_use]
-extern crate deny_public_fields;
+#[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;
 #[macro_use]

components/script/lib.rs

@@ -13,7 +13,7 @@ path = "lib.rs"
 app_units = "0.4"
 atomic_refcell = "0.1"
 canvas_traits = {path = "../canvas_traits"}
-cssparser = {version = "0.10", features = ["heapsize", "serde"]}
+cssparser = {version = "0.11", features = ["heapsize", "serde"]}
 euclid = "0.11"
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.3.0"

components/script_layout_interface/Cargo.toml

@@ -18,5 +18,6 @@ path = "lib.rs"
 [dependencies]
 bitflags = "0.7"
 matches = "0.1"
-cssparser = "0.10"
+cssparser = "0.11"
+cssparser-macros = "0.1.0"
 fnv = "1.0"

components/selectors/Cargo.toml

@@ -4,6 +4,7 @@
 
 #[macro_use] extern crate bitflags;
 #[macro_use] extern crate cssparser;
+#[macro_use] extern crate cssparser_macros;
 #[macro_use] extern crate matches;
 extern crate fnv;
 

components/selectors/lib.rs

@@ -26,7 +26,8 @@ app_units = "0.4"
 atomic_refcell = "0.1"
 bitflags = "0.7"
 cfg-if = "0.1.0"
-cssparser = "0.10"
+cssparser = "0.11"
+cssparser-macros = "0.1.0"
 encoding = "0.2"
 euclid = "0.11"
 fnv = "1.0"
@@ -62,6 +63,5 @@ kernel32-sys = "0.2"
 [build-dependencies]
 lazy_static = "0.2"
 bindgen = { version = "0.22", optional = true }
-phf_codegen = "0.7.20"
 regex = {version = "0.2", optional = true}
 walkdir = "1.0"

components/style/Cargo.toml

@@ -10,11 +10,8 @@ extern crate bindgen;
 #[cfg(feature = "bindgen")]
 extern crate regex;
 extern crate walkdir;
-extern crate phf_codegen;
 
 use std::env;
-use std::fs::File;
-use std::io::{BufWriter, BufReader, BufRead, Write};
 use std::path::Path;
 use std::process::{Command, exit};
 use walkdir::WalkDir;
@@ -78,23 +75,6 @@ fn generate_properties() {
     if !status.success() {
         exit(1)
     }
-
-    let path = Path::new(&env::var("OUT_DIR").unwrap()).join("static_ids.rs");
-    let static_ids = Path::new(&env::var("OUT_DIR").unwrap()).join("static_ids.txt");
-    let mut file = BufWriter::new(File::create(&path).unwrap());
-    let static_ids = BufReader::new(File::open(&static_ids).unwrap());
-
-    write!(&mut file, "static STATIC_IDS: ::phf::Map<&'static str, StaticId> = ").unwrap();
-    let mut map = phf_codegen::Map::new();
-    for result in static_ids.lines() {
-        let line = result.unwrap();
-        let mut split = line.split('\t');
-        let key = split.next().unwrap().to_owned();
-        let value = split.next().unwrap();
-        map.entry(key, value);
-    }
-    map.build(&mut file).unwrap();
-    write!(&mut file, ";\n").unwrap();
 }
 
 fn main() {

components/style/build.rs

@@ -165,7 +165,7 @@ impl Resolution {
             _ => return Err(()),
         };
 
-        Ok(match_ignore_ascii_case! { unit,
+        Ok(match_ignore_ascii_case! { &unit,
             "dpi" => Resolution::Dpi(value),
             "dppx" => Resolution::Dppx(value),
             "dpcm" => Resolution::Dpcm(value),

components/style/gecko/media_queries.rs

@@ -42,8 +42,8 @@ extern crate atomic_refcell;
 #[macro_use]
 extern crate bitflags;
 #[cfg(feature = "gecko")] #[macro_use] #[no_link] extern crate cfg_if;
-#[macro_use]
-extern crate cssparser;
+#[macro_use] extern crate cssparser;
+#[macro_use] extern crate cssparser_macros;
 extern crate encoding;
 extern crate euclid;
 extern crate fnv;

components/style/lib.rs

@@ -33,7 +33,6 @@ def main():
     rust = render(template, product=product, data=properties, __file__=template)
     if output == "style-crate":
         write(os.environ["OUT_DIR"], "properties.rs", rust)
-        write(os.environ["OUT_DIR"], "static_ids.txt", static_ids(properties))
         if product == "gecko":
             template = os.path.join(BASE, "gecko.mako.rs")
             rust = render(template, data=properties)
@@ -72,19 +71,6 @@ def write(directory, filename, content):
     open(os.path.join(directory, filename), "wb").write(content)
 
 
-def static_id_generator(properties):
-    for kind, props in [("Longhand", properties.longhands),
-                        ("Shorthand", properties.shorthands)]:
-        for p in props:
-            yield "%s\tStaticId::%s(%sId::%s)" % (p.name, kind, kind, p.camel_case)
-            for alias in p.alias:
-                yield "%s\tStaticId::%s(%sId::%s)" % (alias, kind, kind, p.camel_case)
-
-
-def static_ids(properties):
-    return '\n'.join(static_id_generator(properties))
-
-
 def write_html(properties):
     properties = dict(
         (p.name, {

components/style/properties/build.py

@@ -69,7 +69,7 @@ impl TransitionProperty {
 
     /// Parse a transition-property value.
     pub fn parse(input: &mut Parser) -> Result<Self, ()> {
-        match_ignore_ascii_case! { try!(input.expect_ident()),
+        match_ignore_ascii_case! { &try!(input.expect_ident()),
             "all" => Ok(TransitionProperty::All),
             % for prop in data.longhands:
                 % if prop.animatable: