aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <emilio@crisal.io>2019-12-16 14:23:24 +0100
committerEmilio Cobos Álvarez <emilio@crisal.io>2019-12-16 14:23:56 +0100
commit7513bc293e0e515dd4e9e56b8ede32b68b8c8186 (patch)
tree5194a054252cb073630b4ca7e1f105418790654c
parentf7c5df5703ad15cb7e107bb503222c5223387676 (diff)
downloadservo-7513bc293e0e515dd4e9e56b8ede32b68b8c8186.tar.gz
servo-7513bc293e0e515dd4e9e56b8ede32b68b8c8186.zip
Cherry-pick some parts of the cssparser update.
-rw-r--r--components/style/gecko/pseudo_element_definition.mako.rs8
-rw-r--r--components/style/gecko/selector_parser.rs2
-rw-r--r--components/style/values/specified/align.rs6
3 files changed, 8 insertions, 8 deletions
diff --git a/components/style/gecko/pseudo_element_definition.mako.rs b/components/style/gecko/pseudo_element_definition.mako.rs
index d8d80d60165..f4a6671bd39 100644
--- a/components/style/gecko/pseudo_element_definition.mako.rs
+++ b/components/style/gecko/pseudo_element_definition.mako.rs
@@ -193,18 +193,18 @@ impl PseudoElement {
% for pseudo in SIMPLE_PSEUDOS:
"${pseudo.value[1:]}" => {
return Some(${pseudo_element_variant(pseudo)})
- }
+ },
% endfor
// Alias some legacy prefixed pseudos to their standardized name at parse time:
"-moz-selection" => {
return Some(PseudoElement::Selection);
- }
+ },
"-moz-placeholder" => {
return Some(PseudoElement::Placeholder);
- }
+ },
"-moz-list-bullet" | "-moz-list-number" => {
return Some(PseudoElement::Marker);
- }
+ },
_ => {
if starts_with_ignore_ascii_case(name, "-moz-tree-") {
return PseudoElement::tree_pseudo_element(name, Box::new([]))
diff --git a/components/style/gecko/selector_parser.rs b/components/style/gecko/selector_parser.rs
index 18878213244..9f5b49c5c13 100644
--- a/components/style/gecko/selector_parser.rs
+++ b/components/style/gecko/selector_parser.rs
@@ -396,7 +396,7 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
parser,
)?.into()
)
- }
+ },
_ => return Err(parser.new_custom_error(
SelectorParseErrorKind::UnsupportedPseudoClassOrElement(name.clone())
))
diff --git a/components/style/values/specified/align.rs b/components/style/values/specified/align.rs
index 7c2ecda19a4..0dc1e422515 100644
--- a/components/style/values/specified/align.rs
+++ b/components/style/values/specified/align.rs
@@ -691,11 +691,11 @@ fn parse_baseline<'i, 't>(input: &mut Parser<'i, 't>) -> Result<AlignFlags, Pars
"first" => {
input.expect_ident_matching("baseline")?;
Ok(AlignFlags::BASELINE)
- }
+ },
"last" => {
input.expect_ident_matching("baseline")?;
Ok(AlignFlags::LAST_BASELINE)
- }
+ },
}
}
@@ -794,7 +794,7 @@ fn parse_legacy<'i, 't>(input: &mut Parser<'i, 't>) -> Result<AlignFlags, ParseE
.unwrap_or(AlignFlags::empty());
return Ok(AlignFlags::LEGACY | flags)
- }
+ },
"left" => AlignFlags::LEFT,
"right" => AlignFlags::RIGHT,
"center" => AlignFlags::CENTER,