Move value tests + smarter number formatting 🔢

3 files changed, 25 insertions, 12 deletions

diff --git a/src/geom/angle.rs b/src/geom/angle.rs
index 47541cb8..07471a02 100644
--- a/src/geom/angle.rs
+++ b/src/geom/angle.rs
@@ -56,7 +56,16 @@ impl Angle {
 
 impl Display for Angle {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        write!(f, "{}{}", self.to_deg(), AngularUnit::Deg)
+        // Format with the unit that yields the shortest output, preferring
+        // degrees when tied.
+        let mut buf = ryu::Buffer::new();
+        let unit = [AngularUnit::Deg, AngularUnit::Rad]
+            .iter()
+            .copied()
+            .min_by_key(|&unit| buf.format(self.to_unit(unit)).len())
+            .unwrap();
+
+        write!(f, "{}{}", buf.format(self.to_unit(unit)), unit)
     }
 }
 
diff --git a/src/geom/length.rs b/src/geom/length.rs
index bfb1d668..00803e13 100644
--- a/src/geom/length.rs
+++ b/src/geom/length.rs
@@ -99,13 +99,16 @@ impl Length {
 
 impl Display for Length {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        // Format small lengths as points and large ones as centimeters.
-        let (val, unit) = if self.to_pt().abs() < 25.0 {
-            (self.to_pt(), LengthUnit::Pt)
-        } else {
-            (self.to_cm(), LengthUnit::Cm)
-        };
-        write!(f, "{}{}", (val * 100.0).round() / 100.0, unit)
+        // Format with the unit that yields the shortest output, preferring
+        // larger units when tied.
+        let mut buf = ryu::Buffer::new();
+        let unit = [LengthUnit::Cm, LengthUnit::Mm, LengthUnit::Pt]
+            .iter()
+            .copied()
+            .min_by_key(|&unit| buf.format(self.to_unit(unit)).len())
+            .unwrap();
+
+        write!(f, "{}{}", buf.format(self.to_unit(unit)), unit)
     }
 }
 
@@ -229,8 +232,9 @@ mod tests {
 
     #[test]
     fn test_length_formatting() {
-        assert_eq!(Length::pt(-28.34).to_string(), "-1cm".to_string());
-        assert_eq!(Length::pt(23.0).to_string(), "23pt".to_string());
-        assert_eq!(Length::cm(12.728).to_string(), "12.73cm".to_string());
+        assert_eq!(Length::pt(23.0).to_string(), "23.0pt");
+        assert_eq!(Length::pt(-28.3465).to_string(), "-1.0cm");
+        assert_eq!(Length::cm(12.728).to_string(), "12.728cm");
+        assert_eq!(Length::cm(4.5).to_string(), "4.5cm");
     }
 }
diff --git a/src/geom/relative.rs b/src/geom/relative.rs
index d39ead3a..e91ea672 100644
--- a/src/geom/relative.rs
+++ b/src/geom/relative.rs
@@ -37,7 +37,7 @@ impl Relative {
 
 impl Display for Relative {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        write!(f, "{}%", (self.0 * 10000.0).round() / 100.0)
+        write!(f, "{}%", ryu::Buffer::new().format(100.0 * self.0))
     }
 }