aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-05-11 16:10:23 -0500
committerGitHub <noreply@github.com>2017-05-11 16:10:23 -0500
commitd1f2cdfb3d3db69e7c87904a08abe9672ee1bf97 (patch)
treea34079e0c9ceae7106f455adccd958fa4176e503
parentc277beab2b9c3294ea69c6088cd0dc3b1665717e (diff)
parent1b9bac7e66dd2c9063ee1a6a93b91953209c9def (diff)
downloadservo-d1f2cdfb3d3db69e7c87904a08abe9672ee1bf97.tar.gz
servo-d1f2cdfb3d3db69e7c87904a08abe9672ee1bf97.zip
Auto merge of #16815 - Manishearth:cssup, r=metajack
Bump cssparser to 0.13.3 <!-- 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/16815) <!-- Reviewable:end -->
-rw-r--r--Cargo.lock28
-rw-r--r--components/canvas/Cargo.toml2
-rw-r--r--components/canvas_traits/Cargo.toml2
-rw-r--r--components/layout/Cargo.toml2
-rw-r--r--components/msg/Cargo.toml2
-rw-r--r--components/script/Cargo.toml2
-rw-r--r--components/script_layout_interface/Cargo.toml2
-rw-r--r--components/selectors/Cargo.toml2
-rw-r--r--components/style/Cargo.toml2
-rw-r--r--components/style_traits/Cargo.toml2
-rw-r--r--ports/geckolib/Cargo.toml2
-rw-r--r--tests/unit/style/Cargo.toml2
-rw-r--r--tests/unit/style/animated_properties.rs6
-rw-r--r--tests/unit/stylo/Cargo.toml2
14 files changed, 29 insertions, 29 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 0fe30b3fc17..9811dc986c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -299,7 +299,7 @@ version = "0.0.1"
dependencies = [
"azure 0.15.0 (git+https://github.com/servo/rust-azure)",
"canvas_traits 0.0.1",
- "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -314,7 +314,7 @@ dependencies = [
name = "canvas_traits"
version = "0.0.1"
dependencies = [
- "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -528,7 +528,7 @@ dependencies = [
[[package]]
name = "cssparser"
-version = "0.13.1"
+version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -959,7 +959,7 @@ name = "geckoservo"
version = "0.0.1"
dependencies = [
"atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1365,7 +1365,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.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.11.3 (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",
@@ -1697,7 +1697,7 @@ name = "msg"
version = "0.0.1"
dependencies = [
"bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.3.9 (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.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2296,7 +2296,7 @@ dependencies = [
"caseless 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"cmake 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
"cookie 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.3 (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",
@@ -2365,7 +2365,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.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx_traits 0.0.1",
"heapsize 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2436,7 +2436,7 @@ name = "selectors"
version = "0.18.0"
dependencies = [
"bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.3 (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)",
"precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2789,7 +2789,7 @@ dependencies = [
"bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.0.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.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.3 (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.3 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2829,7 +2829,7 @@ version = "0.0.1"
dependencies = [
"app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
"html5ever 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2848,7 +2848,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.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2861,7 +2861,7 @@ name = "stylo_tests"
version = "0.0.1"
dependencies = [
"atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
"geckoservo 0.0.1",
@@ -3413,7 +3413,7 @@ 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.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b39404c5e04492194e3c69f1a10964b980f2c95c884a940f7903446779f6b027"
+"checksum cssparser 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9d2214de0e040001626d6a36020538d4b35a07cb260fcad0cf64f61fd1857e0e"
"checksum cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df"
"checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850"
"checksum dbus 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47f881971824401c27bc1ff9f641d54ac66e0f409631806fa7be8cad8e6be450"
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index e24510fec72..fc88108f531 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 = "0.13"
+cssparser = "0.13.3"
euclid = "0.11"
gleam = "0.4"
ipc-channel = "0.7"
diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml
index c8d2690f8ae..f35d7da8fe4 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 = "0.13"
+cssparser = "0.13.3"
euclid = "0.11"
heapsize = "0.3.0"
heapsize_derive = "0.1"
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index 5c48dde9fcb..f6fb8b5f9de 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 = "0.13"
+cssparser = "0.13.3"
euclid = "0.11"
fnv = "1.0"
gfx = {path = "../gfx"}
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
index 836190b1ef6..16c11ccf704 100644
--- a/components/msg/Cargo.toml
+++ b/components/msg/Cargo.toml
@@ -11,7 +11,7 @@ path = "lib.rs"
[dependencies]
bitflags = "0.7"
-cssparser = "0.13"
+cssparser = "0.13.3"
heapsize = "0.3.0"
heapsize_derive = "0.1"
serde = "0.9"
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 1266e706582..306dd2a748d 100644
--- 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.13"
+cssparser = "0.13.3"
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
index 03bb0df8436..2dff0e25259 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 = "0.13"
+cssparser = "0.13.3"
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 22ee4e526c2..20ddf3b8ad2 100644
--- a/components/selectors/Cargo.toml
+++ b/components/selectors/Cargo.toml
@@ -20,7 +20,7 @@ doctest = false
[dependencies]
bitflags = "0.7"
matches = "0.1"
-cssparser = "0.13"
+cssparser = "0.13.3"
fnv = "1.0"
precomputed-hash = "0.1"
smallvec = "0.3"
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index f82b1c0ca34..57bc8e31a97 100644
--- 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.13.1"
+cssparser = "0.13.3"
encoding = {version = "0.2", optional = true}
euclid = "0.11"
fnv = "1.0"
diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml
index f95e5f00e80..9ee5e2b8557 100644
--- a/components/style_traits/Cargo.toml
+++ b/components/style_traits/Cargo.toml
@@ -16,7 +16,7 @@ gecko = []
[dependencies]
app_units = "0.4"
-cssparser = "0.13"
+cssparser = "0.13.3"
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
index 382a1dbafa3..e9c2c8a2570 100644
--- 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.13"
+cssparser = "0.13.3"
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
index 9d9db027c6f..6eeb9817c93 100644
--- a/tests/unit/style/Cargo.toml
+++ b/tests/unit/style/Cargo.toml
@@ -15,7 +15,7 @@ testing = ["style/testing"]
[dependencies]
byteorder = "1.0"
app_units = "0.4"
-cssparser = "0.13"
+cssparser = "0.13.3"
euclid = "0.11"
html5ever = "0.16"
parking_lot = "0.3"
diff --git a/tests/unit/style/animated_properties.rs b/tests/unit/style/animated_properties.rs
index 853c2c24ae6..c9e145c6761 100644
--- a/tests/unit/style/animated_properties.rs
+++ b/tests/unit/style/animated_properties.rs
@@ -16,7 +16,7 @@ fn test_rgba_color_interepolation_preserves_transparent() {
fn test_rgba_color_interepolation_alpha() {
assert_eq!(Color::RGBA(RGBA::new(200, 0, 0, 100))
.interpolate(&Color::RGBA(RGBA::new(0, 200, 0, 200)), 0.5).unwrap(),
- Color::RGBA(RGBA::new(66, 133, 0, 150)));
+ Color::RGBA(RGBA::new(67, 133, 0, 150)));
}
#[test]
@@ -25,14 +25,14 @@ fn test_rgba_color_interepolation_out_of_range_1() {
// Unclamped cases.
assert_eq!(Color::RGBA(RGBA::from_floats(0.3, 0.0, 0.0, 0.4)).interpolate(
&Color::RGBA(RGBA::from_floats(0.0, 1.0, 0.0, 0.6)), -0.5).unwrap(),
- Color::RGBA(RGBA::new(152, 0, 0, 76)));
+ Color::RGBA(RGBA::new(154, 0, 0, 77)));
}
#[test]
fn test_rgba_color_interepolation_out_of_range_2() {
assert_eq!(Color::RGBA(RGBA::from_floats(1.0, 0.0, 0.0, 0.6)).interpolate(
&Color::RGBA(RGBA::from_floats(0.0, 0.3, 0.0, 0.4)), 1.5).unwrap(),
- Color::RGBA(RGBA::new(0, 152, 0, 76)));
+ Color::RGBA(RGBA::new(0, 154, 0, 77)));
}
#[test]
diff --git a/tests/unit/stylo/Cargo.toml b/tests/unit/stylo/Cargo.toml
index 239763a6866..6ea16ea5ddc 100644
--- 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.13"
+cssparser = "0.13.3"
env_logger = "0.4"
euclid = "0.11"
libc = "0.2"