diff --git a/Cargo.lock b/Cargo.lock index 61249ff7f19..4a011eda276 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -281,7 +281,7 @@ dependencies = [ "azure 0.23.0 (git+https://github.com/servo/rust-azure)", "canvas_traits 0.0.1", "compositing 0.0.1", - "cssparser 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -298,7 +298,7 @@ dependencies = [ name = "canvas_traits" version = "0.0.1" dependencies = [ - "cssparser 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -561,7 +561,7 @@ dependencies = [ [[package]] name = "cssparser" -version = "0.22.0" +version = "0.23.0" 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)", @@ -1038,7 +1038,7 @@ name = "geckoservo" version = "0.0.1" dependencies = [ "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1109,7 +1109,7 @@ dependencies = [ name = "gfx_tests" version = "0.0.1" dependencies = [ - "cssparser 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", @@ -1696,7 +1696,7 @@ name = "malloc_size_of" version = "0.0.1" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)", "hashglobe 0.1.0", "mozjs 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2560,7 +2560,7 @@ dependencies = [ "caseless 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "cmake 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "cookie 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.23.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", @@ -2636,7 +2636,7 @@ dependencies = [ "app_units 0.5.6 (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.22.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "html5ever 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2717,7 +2717,7 @@ name = "selectors" version = "0.19.0" dependencies = [ "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", @@ -3133,7 +3133,7 @@ dependencies = [ "bitflags 1.0.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.2 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "encoding_rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)", "fallible 0.0.1", @@ -3192,7 +3192,7 @@ version = "0.0.1" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3214,7 +3214,7 @@ version = "0.0.1" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", "malloc_size_of_derive 0.0.1", @@ -3230,7 +3230,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.22.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)", "geckoservo 0.0.1", @@ -3811,7 +3811,7 @@ dependencies = [ "checksum core-foundation-sys 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bc9fb3d6cb663e6fd7cf1c63f9b144ee2b1e4a78595a0451dd34bff85b9a3387" "checksum core-graphics 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5dc0a78ab2ac23b6ea7b3fe5fe93b227900dc0956979735b8f68032417976dd4" "checksum core-text 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bcad23756dd1dc4b47bf6a914ace27aadb8fa68889db5837af2308d018d0467c" -"checksum cssparser 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44313341610282488e1156ad1fedebca51c54766c87a041d0287b10499c04ba1" +"checksum cssparser 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "217b0241b46d3b758271d88086d2d935b9f21aafa6112813b5f5f854b826146c" "checksum cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df" "checksum cubeb-ffi 0.0.2 (git+https://github.com/djg/cubeb-pulse-rs?branch=dev)" = "" "checksum cubeb-pulse 0.0.2 (git+https://github.com/djg/cubeb-pulse-rs?branch=dev)" = "" diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index 49298cdb71f..d92cc1f0a36 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" azure = {git = "https://github.com/servo/rust-azure"} canvas_traits = {path = "../canvas_traits"} compositing = {path = "../compositing"} -cssparser = "0.22.0" +cssparser = "0.23.0" euclid = "0.15" fnv = "1.0" gleam = "0.4" diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml index c463d551052..81ea3340cfe 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.22.0" +cssparser = "0.23.0" euclid = "0.15" ipc-channel = "0.9" lazy_static = "0.2" diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml index c1cdeeaa73b..94dd3a7848a 100644 --- a/components/malloc_size_of/Cargo.toml +++ b/components/malloc_size_of/Cargo.toml @@ -13,7 +13,7 @@ servo = ["mozjs", "string_cache", "url", "webrender_api", "xml5ever"] [dependencies] app_units = "0.5.5" -cssparser = "0.22.0" +cssparser = "0.23.0" euclid = "0.15" hashglobe = { path = "../hashglobe" } mozjs = { version = "0.1.8", features = ["promises"], optional = true } diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index ea54951da04..8bc16dd6251 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -39,7 +39,7 @@ byteorder = "1.0" canvas_traits = {path = "../canvas_traits"} caseless = "0.1.0" cookie = "0.10" -cssparser = "0.22.0" +cssparser = "0.23.0" 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 7959cf5eb6a..ef603efe222 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.5" atomic_refcell = "0.1" canvas_traits = {path = "../canvas_traits"} -cssparser = "0.22.0" +cssparser = "0.23.0" euclid = "0.15" gfx_traits = {path = "../gfx_traits"} html5ever = "0.21.0" diff --git a/components/selectors/Cargo.toml b/components/selectors/Cargo.toml index d38d39689ac..ae2ad65c3a4 100644 --- a/components/selectors/Cargo.toml +++ b/components/selectors/Cargo.toml @@ -25,7 +25,7 @@ bench = [] [dependencies] bitflags = "1.0" matches = "0.1" -cssparser = "0.22.0" +cssparser = "0.23.0" log = "0.3" fnv = "1.0" malloc_size_of = { path = "../malloc_size_of" } diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 80fd12e5fab..f57ed5fec2c 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -35,7 +35,7 @@ atomic_refcell = "0.1" bitflags = "1.0" byteorder = "1.0" cfg-if = "0.1.0" -cssparser = "0.22.0" +cssparser = "0.23.0" encoding_rs = {version = "0.7", optional = true} euclid = "0.15" fallible = { path = "../fallible" } diff --git a/components/style/error_reporting.rs b/components/style/error_reporting.rs index d989857d141..b3661846ccf 100644 --- a/components/style/error_reporting.rs +++ b/components/style/error_reporting.rs @@ -76,7 +76,6 @@ impl<'a> fmt::Display for ContextualParseError<'a> { Token::PrefixMatch => write!(f, "prefix match (^=)"), Token::SuffixMatch => write!(f, "suffix match ($=)"), Token::SubstringMatch => write!(f, "substring match (*=)"), - Token::Column => write!(f, "column (||)"), Token::CDO => write!(f, "CDO ()"), Token::Function(ref name) => write!(f, "function {}", name), diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml index 99c80c1aa58..90faa1e9ecd 100644 --- a/components/style_traits/Cargo.toml +++ b/components/style_traits/Cargo.toml @@ -15,7 +15,7 @@ gecko = [] [dependencies] app_units = "0.5" -cssparser = "0.22.0" +cssparser = "0.23.0" bitflags = "1.0" euclid = "0.15" malloc_size_of = { path = "../malloc_size_of" } diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml index 23b12ac2963..c4771cd05d1 100644 --- a/ports/geckolib/Cargo.toml +++ b/ports/geckolib/Cargo.toml @@ -15,7 +15,7 @@ gecko_debug = ["style/gecko_debug"] [dependencies] atomic_refcell = "0.1" -cssparser = "0.22.0" +cssparser = "0.23.0" 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/gfx/Cargo.toml b/tests/unit/gfx/Cargo.toml index b759f13422e..46495840ce0 100644 --- a/tests/unit/gfx/Cargo.toml +++ b/tests/unit/gfx/Cargo.toml @@ -10,7 +10,7 @@ path = "lib.rs" doctest = false [dependencies] -cssparser = "0.22.0" +cssparser = "0.23.0" gfx = {path = "../../../components/gfx"} ipc-channel = "0.9" style = {path = "../../../components/style"} diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml index bb3178dd377..05841c7383e 100644 --- a/tests/unit/style/Cargo.toml +++ b/tests/unit/style/Cargo.toml @@ -12,7 +12,7 @@ doctest = false [dependencies] byteorder = "1.0" app_units = "0.5" -cssparser = "0.22.0" +cssparser = "0.23.0" euclid = "0.15" html5ever = "0.21" parking_lot = "0.4" diff --git a/tests/unit/stylo/Cargo.toml b/tests/unit/stylo/Cargo.toml index c2611b7713c..7a42976159d 100644 --- a/tests/unit/stylo/Cargo.toml +++ b/tests/unit/stylo/Cargo.toml @@ -13,7 +13,7 @@ doctest = false [dependencies] atomic_refcell = "0.1" -cssparser = "0.22.0" +cssparser = "0.23.0" env_logger = "0.4" euclid = "0.15" geckoservo = {path = "../../../ports/geckolib"}