From 6df597b0b8a30a550abd7c179b306604bdbc5967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 18 Aug 2017 10:09:09 +0200
Subject: [PATCH] style: Use Au::abs.

---
 components/style/values/computed/length.rs | 5 +----
 components/style/values/specified/calc.rs  | 6 +++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/components/style/values/computed/length.rs b/components/style/values/computed/length.rs
index 813c873264e..038d19c1889 100644
--- 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
index 151d8054143..005036d4f32 100644
--- 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);