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

Clean up some stray lines

Browse source
This commit is contained in:
David Zbarsky 2015-08-15 09:13:40 -04:00
parent 53e8f7d823
commit 5ac205b3e5
1 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
components/style/values.rs
View file

@ -428,8 +428,7 @@ pub mod specified {
products.push(try!(Calc::parse_product(input))); products.push(try!(Calc::parse_product(input)));
loop { loop {
let next = input.next(); match input.next() {
match next {
Ok(Token::Delim('+')) => { Ok(Token::Delim('+')) => {
products.push(try!(Calc::parse_product(input))); products.push(try!(Calc::parse_product(input)));
} }
@ -452,8 +451,7 @@ pub mod specified {
loop { loop {
let position = input.position(); let position = input.position();
let next = input.next(); match input.next() {
match next {
Ok(Token::Delim('*')) => { Ok(Token::Delim('*')) => {
values.push(try!(Calc::parse_value(input))); values.push(try!(Calc::parse_value(input)));
} }
@ -478,8 +476,7 @@ pub mod specified {
} }
fn parse_value(input: &mut Parser) -> Result<CalcValueNode, ()> { fn parse_value(input: &mut Parser) -> Result<CalcValueNode, ()> {
let next = input.next(); match input.next() {
match next {
Ok(Token::Number(ref value)) => Ok(CalcValueNode::Number(value.value)), Ok(Token::Number(ref value)) => Ok(CalcValueNode::Number(value.value)),
Ok(Token::Dimension(ref value, ref unit)) => Ok(Token::Dimension(ref value, ref unit)) =>
Length::parse_dimension(value.value, unit).map(CalcValueNode::Length), Length::parse_dimension(value.value, unit).map(CalcValueNode::Length),
@ -503,7 +500,7 @@ pub mod specified {
fn simplify_sum_to_number(node: &CalcSumNode) -> Option<CSSFloat> { fn simplify_sum_to_number(node: &CalcSumNode) -> Option<CSSFloat> {
let mut sum = 0.; let mut sum = 0.;
for product in &node.products { for ref product in &node.products {
match Calc::simplify_product_to_number(product) { match Calc::simplify_product_to_number(product) {
Some(number) => sum += number, Some(number) => sum += number,
_ => return None _ => return None
@ -514,7 +511,7 @@ pub mod specified {
fn simplify_product_to_number(node: &CalcProductNode) -> Option<CSSFloat> { fn simplify_product_to_number(node: &CalcProductNode) -> Option<CSSFloat> {
let mut product = 1.; let mut product = 1.;
for value in &node.values { for ref value in &node.values {
match Calc::simplify_value_to_number(value) { match Calc::simplify_value_to_number(value) {
Some(number) => product *= number, Some(number) => product *= number,
_ => return None _ => return None
@ -539,22 +536,21 @@ pub mod specified {
} }
} }
fn simplify_product(node: CalcProductNode) -> Result<SimplifiedValueNode, ()> { fn simplify_product(node: &CalcProductNode) -> Result<SimplifiedValueNode, ()> {
let mut multiplier = 1.; let mut multiplier = 1.;
let mut node_with_unit = None; let mut node_with_unit = None;
for node in node.values { for node in &node.values {
match Calc::simplify_value_to_number(&node) { match Calc::simplify_value_to_number(&node) {
Some(number) => multiplier *= number, Some(number) => multiplier *= number,
_ if node_with_unit.is_none() => { _ if node_with_unit.is_none() => {
node_with_unit = Some(match node { node_with_unit = Some(match node {
CalcValueNode::Sum(box ref sum) => &CalcValueNode::Sum(box ref sum) =>
try!(Calc::simplify_products_in_sum(sum)), try!(Calc::simplify_products_in_sum(sum)),
CalcValueNode::Length(l) => SimplifiedValueNode::Length(l), &CalcValueNode::Length(l) => SimplifiedValueNode::Length(l),
CalcValueNode::Percentage(p) => SimplifiedValueNode::Percentage(p), &CalcValueNode::Percentage(p) => SimplifiedValueNode::Percentage(p),
_ => unreachable!("Numbers should have been handled by simplify_value_to_nubmer") _ => unreachable!("Numbers should have been handled by simplify_value_to_nubmer")
}) })
}, },
//_ if node_with_unit.is_none() => node_with_unit = Some(node),
_ => return Err(()), _ => return Err(()),
} }
} }
@ -569,7 +565,7 @@ pub mod specified {
let ast = try!(Calc::parse_sum(input)); let ast = try!(Calc::parse_sum(input));
let mut simplified = Vec::new(); let mut simplified = Vec::new();
for node in ast.products { for ref node in ast.products {
match try!(Calc::simplify_product(node)) { match try!(Calc::simplify_product(node)) {
SimplifiedValueNode::Sum(sum) => simplified.push_all(&sum.values), SimplifiedValueNode::Sum(sum) => simplified.push_all(&sum.values),
value => simplified.push(value), value => simplified.push(value),