mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Update cssparser for https://github.com/servo/rust-cssparser/pull/123
This commit is contained in:
parent
bcd4d166ac
commit
288ef97055
18 changed files with 66 additions and 73 deletions
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"}
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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" }
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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(()),
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue