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

Untry style

Browse source
This commit is contained in:
Simon Sapin 2017-06-18 12:40:03 +02:00
parent 4c5f7bfaa3
commit a5bb55790f
45 changed files with 518 additions and 527 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/style/values/specified/calc.rs
View file

@ -94,7 +94,7 @@ impl ToCss for CalcLengthOrPercentage {
macro_rules! first_value_check {
() => {
if !first_value {
try!(dest.write_str(" + "));
dest.write_str(" + ")?;
} else {
first_value = false;
}
@ -106,14 +106,14 @@ impl ToCss for CalcLengthOrPercentage {
$(
if let Some(val) = self.$val {
first_value_check!();
try!(val.to_css(dest));
try!(dest.write_str(stringify!($val)));
val.to_css(dest)?;
dest.write_str(stringify!($val))?;
}
)*
};
}
try!(dest.write_str("calc("));
dest.write_str("calc(")?;
serialize!(ch, em, ex, rem, vh, vmax, vmin, vw);
@ -124,7 +124,7 @@ impl ToCss for CalcLengthOrPercentage {
if let Some(val) = self.absolute {
first_value_check!();
try!(val.to_css(dest));
val.to_css(dest)?;
}
if let Some(val) = self.percentage {
@ -149,7 +149,7 @@ impl CalcNode {
expected_unit: CalcUnit)
-> Result<Self, ParseError<'i>>
{
match (try!(input.next()), expected_unit) {
match (input.next()?, expected_unit) {
(Token::Number { value, .. }, _) => Ok(CalcNode::Number(value)),
(Token::Dimension { value, ref unit, .. }, CalcUnit::Length) |
(Token::Dimension { value, ref unit, .. }, CalcUnit::LengthOrPercentage) => {