aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-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.toml3
-rw-r--r--components/script/lib.rs1
-rw-r--r--components/script_layout_interface/Cargo.toml2
-rw-r--r--components/selectors/Cargo.toml3
-rw-r--r--components/selectors/lib.rs1
-rw-r--r--components/style/Cargo.toml4
-rw-r--r--components/style/lib.rs2
-rw-r--r--components/style/properties/properties.mako.rs6
-rw-r--r--components/style_traits/Cargo.toml3
-rw-r--r--components/style_traits/lib.rs1
14 files changed, 12 insertions, 22 deletions
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index 9c374c1c68f..5a5c6e54f58 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 = {version = "0.11", features = ["heapsize", "serde"]}
+cssparser = "0.12"
euclid = "0.11"
gleam = "0.2.8"
ipc-channel = "0.7"
diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml
index 6c539762587..ff6248dedb9 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 = {version = "0.11", features = ["heapsize", "serde"]}
+cssparser = "0.12"
euclid = "0.11"
heapsize = "0.3.0"
heapsize_derive = "0.1"
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index 6139aff4c58..7b58136107b 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 = {version = "0.11", features = ["heapsize", "serde"]}
+cssparser = "0.12"
euclid = "0.11"
fnv = "1.0"
gfx = {path = "../gfx"}
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
index 55ea4d911ad..884c78a828f 100644
--- a/components/msg/Cargo.toml
+++ b/components/msg/Cargo.toml
@@ -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"
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index bc2e981f88e..74910cddda6 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -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"}
diff --git a/components/script/lib.rs b/components/script/lib.rs
index 93bcdd14b35..1b3f9af3540 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -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;
diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml
index 5f7b61d5938..f39146882c7 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 = {version = "0.11", features = ["heapsize", "serde"]}
+cssparser = "0.12"
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 f51cdaa91a7..b342e79fa82 100644
--- a/components/selectors/Cargo.toml
+++ b/components/selectors/Cargo.toml
@@ -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"
diff --git a/components/selectors/lib.rs b/components/selectors/lib.rs
index 4d853744bc5..247902074b9 100644
--- a/components/selectors/lib.rs
+++ b/components/selectors/lib.rs
@@ -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;
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index 6dd79ceb77a..d6792900c2c 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -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" }
diff --git a/components/style/lib.rs b/components/style/lib.rs
index 968f720093d..b681e5d1804 100644
--- a/components/style/lib.rs
+++ b/components/style/lib.rs
@@ -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;
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index bec5065a3d5..d582debeba2 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -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(()),
diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml
index e333e464505..7c5a4f4dd2f 100644
--- a/components/style_traits/Cargo.toml
+++ b/components/style_traits/Cargo.toml
@@ -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}
diff --git a/components/style_traits/lib.rs b/components/style_traits/lib.rs
index 88537b504c4..95cd0b3e3dd 100644
--- a/components/style_traits/lib.rs
+++ b/components/style_traits/lib.rs
@@ -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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 12:51:06 +0000