Switch to N64 type alias

2 files changed, 10 insertions, 10 deletions

diff --git a/src/geom/length.rs b/src/geom/length.rs
index 2439000c..e9ba0853 100644
--- a/src/geom/length.rs
+++ b/src/geom/length.rs
@@ -1,4 +1,4 @@
-use decorum::NotNan;
+use decorum::N64;
 use serde::{Deserialize, Serialize};
 
 use super::*;
@@ -9,13 +9,13 @@ use super::*;
 #[serde(transparent)]
 pub struct Length {
     /// The length in raw units.
-    raw: NotNan<f64>,
+    raw: N64,
 }
 
 impl Length {
     /// The zero length.
     pub fn zero() -> Self {
-        Self { raw: 0.0.into() }
+        Self { raw: N64::from(0.0) }
     }
 
     /// Create a length from a number of points.
@@ -40,7 +40,7 @@ impl Length {
 
     /// Create a length from a number of raw units.
     pub fn raw(raw: f64) -> Self {
-        Self { raw: raw.into() }
+        Self { raw: N64::from(raw) }
     }
 
     /// Convert this to a number of points.
@@ -70,7 +70,7 @@ impl Length {
 
     /// Create a length from a value in a unit.
     pub fn with_unit(val: f64, unit: LengthUnit) -> Self {
-        Self { raw: (val * unit.raw_scale()).into() }
+        Self { raw: N64::from(val * unit.raw_scale()) }
     }
 
     /// Get the value of this length in unit.
diff --git a/src/geom/relative.rs b/src/geom/relative.rs
index 86759bbe..9f8aea55 100644
--- a/src/geom/relative.rs
+++ b/src/geom/relative.rs
@@ -1,4 +1,4 @@
-use decorum::NotNan;
+use decorum::N64;
 
 use super::*;
 
@@ -7,22 +7,22 @@ use super::*;
 /// _Note_: `50%` is represented as `0.5` here, but stored as `50.0` in the
 /// corresponding [literal](crate::syntax::Expr::Percent).
 #[derive(Default, Copy, Clone, PartialEq, PartialOrd, Hash)]
-pub struct Relative(NotNan<f64>);
+pub struct Relative(N64);
 
 impl Relative {
     /// A ratio of `0%` represented as `0.0`.
     pub fn zero() -> Self {
-        Self(0.0.into())
+        Self(N64::from(0.0))
     }
 
     /// A ratio of `100%` represented as `1.0`.
     pub fn one() -> Self {
-        Self(1.0.into())
+        Self(N64::from(1.0))
     }
 
     /// Create a new relative value.
     pub fn new(ratio: f64) -> Self {
-        Self(ratio.into())
+        Self(N64::from(ratio))
     }
 
     /// Get the underlying ratio.