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

Update to cssparser 0.13 servo/rust-cssparser#140  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16589)
servo · Apr 24, 2017 · e3e10ad · e3e10ad
2 parents 8efa680 + 11cef13
commit e3e10ad
Show file tree

Hide file tree

Showing 53 changed files with 42 additions and 180 deletions.
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 = "0.12.1"
+cssparser = "0.13"
 euclid = "0.11"
 gleam = "0.4"
 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 = "0.12.1"
+cssparser = "0.13"
 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 = "0.12.1"
+cssparser = "0.13"
 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 = "0.12.1"
+cssparser = "0.13"
 heapsize = "0.3.0"
 heapsize_derive = "0.1"
 serde = "0.9"

diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
@@ -35,7 +35,7 @@ byteorder = "1.0"
 canvas_traits = {path = "../canvas_traits"}
 caseless = "0.1.0"
 cookie = "0.6"
-cssparser = "0.12.1"
+cssparser = "0.13"
 deny_public_fields = {path = "../deny_public_fields"}
 devtools_traits = {path = "../devtools_traits"}
 dom_struct = {path = "../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 = "0.12.1"
+cssparser = "0.13"
 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,7 +18,7 @@ path = "lib.rs"
 [dependencies]
 bitflags = "0.7"
 matches = "0.1"
-cssparser = "0.12.1"
+cssparser = "0.13"
 fnv = "1.0"
 precomputed-hash = "0.1"
 smallvec = "0.3"
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
@@ -29,7 +29,7 @@ bitflags = "0.7"
 bit-vec = "0.4.3"
 byteorder = "1.0"
 cfg-if = "0.1.0"
-cssparser = "0.12.1"
+cssparser = "0.13.1"
 encoding = {version = "0.2", optional = true}
 euclid = "0.11"
 fnv = "1.0"

diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
@@ -841,7 +841,7 @@ impl PropertyId {
 
         // FIXME(https://github.com/rust-lang/rust/issues/33156): remove this enum and use PropertyId
         // when stable Rust allows destructors in statics.
-        enum StaticId {
+        pub enum StaticId {
             Longhand(LonghandId),
             Shorthand(ShorthandId),
         }

diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml
@@ -15,7 +15,7 @@ servo = ["heapsize", "heapsize_derive", "serde", "serde_derive",
 
 [dependencies]
 app_units = "0.4"
-cssparser = "0.12.1"
+cssparser = "0.13"
 euclid = "0.11"
 heapsize = {version = "0.3.0", optional = true}
 heapsize_derive = {version = "0.1", optional = true}

diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml
@@ -16,7 +16,7 @@ gecko_debug = ["style/gecko_debug"]
 
 [dependencies]
 atomic_refcell = "0.1"
-cssparser = "0.12.1"
+cssparser = "0.13"
 env_logger = {version = "0.4", default-features = false} # disable `regex` to reduce code size
 libc = "0.2"
 log = {version = "0.3.5", features = ["release_max_level_info"]}

diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml
@@ -14,7 +14,7 @@ testing = ["style/testing"]
 
 [dependencies]
 app_units = "0.4"
-cssparser = "0.12.1"
+cssparser = "0.13"
 euclid = "0.11"
 html5ever-atoms = "0.3"
 parking_lot = "0.3"

diff --git a/tests/unit/stylo/Cargo.toml b/tests/unit/stylo/Cargo.toml
@@ -16,7 +16,7 @@ testing = ["style/testing"]
 
 [dependencies]
 atomic_refcell = "0.1"
-cssparser = "0.12.1"
+cssparser = "0.13"
 env_logger = "0.4"
 euclid = "0.11"
 libc = "0.2"

diff --git a/...-1_dev/html/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.htm.ini b/...-1_dev/html/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.htm.ini
@@ -2,4 +2,3 @@
   type: reftest
   expected:
     if os == "linux": FAIL
-
diff --git a/tests/wpt/metadata-css/css-color-3_dev/html4/t424-hsl-parsing-f.htm.ini b/tests/wpt/metadata-css/css-color-3_dev/html4/t424-hsl-parsing-f.htm.ini
@@ -0,0 +1,3 @@
+[t424-hsl-parsing-f.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-color-3_dev/html4/t425-hsla-parsing-f.htm.ini b/tests/wpt/metadata-css/css-color-3_dev/html4/t425-hsla-parsing-f.htm.ini
@@ -0,0 +1,3 @@
+[t425-hsla-parsing-f.htm]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini
@@ -2,4 +2,3 @@
   type: reftest
   expected:
     if os == "linux": FAIL
-
diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-019.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-019.htm.ini
@@ -2,4 +2,3 @@
   type: reftest
   expected:
     if os == "linux": FAIL
-
diff --git a/tests/wpt/metadata-css/selectors-3_dev/html/css3-selectors-lang-014.htm.ini b/tests/wpt/metadata-css/selectors-3_dev/html/css3-selectors-lang-014.htm.ini
@@ -1,4 +1,5 @@
 [css3-selectors-lang-014.htm]
   type: testharness
   [A :lang value with language and region subtags will NOT match a lang attribute value with language, script and region subtags.]
-    expected: FAIL
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-css/selectors-3_dev/xhtml1/css3-selectors-lang-014.xht.ini b/tests/wpt/metadata-css/selectors-3_dev/xhtml1/css3-selectors-lang-014.xht.ini
@@ -2,3 +2,4 @@
   type: testharness
   [A :lang value with language and region subtags will NOT match a lang attribute value with language, script and region subtags.]
     expected: FAIL
+
diff --git a/tests/wpt/metadata-css/selectors-3_dev/xhtml1print/css3-selectors-lang-014.xht.ini b/tests/wpt/metadata-css/selectors-3_dev/xhtml1print/css3-selectors-lang-014.xht.ini
@@ -2,3 +2,4 @@
   type: testharness
   [A :lang value with language and region subtags will NOT match a lang attribute value with language, script and region subtags.]
     expected: FAIL
+
diff --git a/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html.ini b/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html.ini
diff --git a/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html.ini b/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html.ini
diff --git a/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html.ini b/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html.ini
diff --git a/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html.ini b/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html.ini
diff --git a/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html.ini b/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html.ini
diff --git a/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html.ini b/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html.ini
diff --git a/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html.ini b/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html.ini
diff --git a/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html.ini b/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html.ini
diff --git a/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html.ini b/...t/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html.ini
diff --git a/.../metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html.ini b/.../metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html.ini
diff --git a/.../metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html.ini b/.../metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html.ini
diff --git a/.../metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html.ini b/.../metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html.ini
diff --git a/.../metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html.ini b/.../metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html.ini
diff --git a/.../metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html.ini b/.../metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html.ini
diff --git a/.../metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html.ini b/.../metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html.ini
diff --git a/.../metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html.ini b/.../metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html.ini