Auto merge of #19136 - emilio:allow-quirks-box, r=SimonSapin

style: respect allow_quirks for boxed properties.

This will unblock #19119

<!-- 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/19136)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-11-07 07:29:15 -06:00 committed by GitHub
commit 254c659250

View file

@ -402,22 +402,30 @@
% endif % endif
} }
% if not property.derived_from: % if not property.derived_from:
pub fn parse_specified<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) pub fn parse_specified<'i, 't>(
context: &ParserContext,
input: &mut Parser<'i, 't>,
% if property.boxed: % if property.boxed:
-> Result<Box<SpecifiedValue>, ParseError<'i>> { ) -> Result<Box<SpecifiedValue>, ParseError<'i>> {
parse(context, input).map(|result| Box::new(result))
% else: % else:
-> Result<SpecifiedValue, ParseError<'i>> { ) -> Result<SpecifiedValue, ParseError<'i>> {
% endif
% if property.allow_quirks: % if property.allow_quirks:
parse_quirky(context, input, specified::AllowQuirks::Yes) parse_quirky(context, input, specified::AllowQuirks::Yes)
% else: % else:
parse(context, input) parse(context, input)
% endif % endif
% if property.boxed:
.map(Box::new)
% endif % endif
} }
pub fn parse_declared<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>)
-> Result<PropertyDeclaration, ParseError<'i>> { pub fn parse_declared<'i, 't>(
parse_specified(context, input).map(PropertyDeclaration::${property.camel_case}) context: &ParserContext,
input: &mut Parser<'i, 't>,
) -> Result<PropertyDeclaration, ParseError<'i>> {
parse_specified(context, input)
.map(PropertyDeclaration::${property.camel_case})
} }
% endif % endif
} }