style: Use Au::abs.

servo · Aug 18, 2017 · c3fc8ef · c3fc8ef
1 parent cf18d84
commit c3fc8ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/components/style/values/computed/length.rs b/components/style/values/computed/length.rs
@@ -206,11 +206,8 @@ impl ToCss for CalcLengthOrPercentage {
         percentage.to_css(dest)?;
 
         dest.write_str(if length < Zero::zero() { " - " } else { " + " })?;
+        length.abs().to_css(dest)?;
 
-        // FIXME(emilio): Au::abs would be nice.
-        let length = if length < Zero::zero() { -length } else { length };
-
-        length.to_css(dest)?;
         dest.write_str(")")
     }
 }

diff --git a/components/style/values/specified/calc.rs b/components/style/values/specified/calc.rs
@@ -91,6 +91,8 @@ impl HasViewportPercentage for CalcLengthOrPercentage {
 
 impl ToCss for CalcLengthOrPercentage {
     /// https://drafts.csswg.org/css-values/#calc-serialize
+    ///
+    /// FIXME(emilio): Should this simplify away zeros?
     #[allow(unused_assignments)]
     fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
         use num_traits::Zero;
@@ -143,9 +145,7 @@ impl ToCss for CalcLengthOrPercentage {
 
         if let Some(val) = self.absolute {
             first_value_check!(val);
-            // FIXME(emilio): Au::abs() would be nice.
-            let abs = if val < Zero::zero() { -val } else { val };
-            abs.to_css(dest)?;
+            val.abs().to_css(dest)?;
         }
 
         serialize!(rem, vh, vmax, vmin, vw);