Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-08 06:55:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to rustc 1.39.0-nightly (f7af19c27 2019-08-15)

Browse source
This commit is contained in:
Simon Sapin 2019-08-16 13:53:01 +02:00
parent 8672ab5447
commit 98e4a53b72
8 changed files with 64 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/style/stylesheets/viewport_rule.rs
View file

@ -291,15 +291,18 @@ impl<'a, 'b, 'i> DeclarationParser<'i> for ViewportRuleParser<'a, 'b> {
) -> Result<Vec<ViewportDescriptorDeclaration>, ParseError<'i>> {
macro_rules! declaration {
($declaration:ident($parse:expr)) => {
declaration!($declaration(value: try!($parse(input)),
important: input.try(parse_important).is_ok()))
declaration!($declaration {
value: $parse(input)?,
important: input.try(parse_important).is_ok(),
})
};
($declaration:ident(value: $value:expr, important: $important:expr)) => {
($declaration:ident { value: $value:expr, important: $important:expr, }) => {
ViewportDescriptorDeclaration::new(
self.context.stylesheet_origin,
ViewportDescriptor::$declaration($value),
$important)
}
$important,
)
};
}
macro_rules! ok {
@ -311,8 +314,14 @@ impl<'a, 'b, 'i> DeclarationParser<'i> for ViewportRuleParser<'a, 'b> {
let important = input.try(parse_important).is_ok();
Ok(vec![
declaration!($min(value: shorthand.0, important: important)),
declaration!($max(value: shorthand.1, important: important)),
declaration!($min {
value: shorthand.0,
important: important,
}),
declaration!($max {
value: shorthand.1,
important: important,
}),
])
}};
}