Derive `Cast` for enums

2 files changed, 6 insertions, 54 deletions

diff --git a/src/font/mod.rs b/src/font/mod.rs
index 94ec170e..bfb790bb 100644
--- a/src/font/mod.rs
+++ b/src/font/mod.rs
@@ -12,7 +12,7 @@ use std::sync::Arc;
 
 use ttf_parser::GlyphId;
 
-use crate::eval::{cast_from_value, cast_to_value, Value};
+use crate::eval::Cast;
 use crate::geom::Em;
 use crate::util::Buffer;
 
@@ -231,12 +231,9 @@ pub struct LineMetrics {
 }
 
 /// Identifies a vertical metric of a font.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum VerticalFontMetric {
-    /// The typographic ascender.
-    ///
-    /// Corresponds to the typographic ascender from the `OS/2` table if present
-    /// and falls back to the ascender from the `hhea` table otherwise.
+    /// The font's ascender, which typically exceeds the height of all glyphs.
     Ascender,
     /// The approximate height of uppercase letters.
     CapHeight,
@@ -244,33 +241,6 @@ pub enum VerticalFontMetric {
     XHeight,
     /// The baseline on which the letters rest.
     Baseline,
-    /// The typographic descender.
-    ///
-    /// Corresponds to the typographic descender from the `OS/2` table if
-    /// present and falls back to the descender from the `hhea` table otherwise.
-    Descender,
-}
-
-cast_from_value! {
-    VerticalFontMetric,
-    /// The font's ascender, which typically exceeds the height of all glyphs.
-    "ascender" => Self::Ascender,
-    /// The approximate height of uppercase letters.
-    "cap-height" => Self::CapHeight,
-    /// The approximate height of non-ascending lowercase letters.
-    "x-height" => Self::XHeight,
-    /// The baseline on which the letters rest.
-    "baseline" => Self::Baseline,
     /// The font's ascender, which typically exceeds the depth of all glyphs.
-    "descender" => Self::Descender,
-}
-
-cast_to_value! {
-    v: VerticalFontMetric => Value::from(match v {
-        VerticalFontMetric::Ascender => "ascender",
-        VerticalFontMetric::CapHeight => "cap-height",
-        VerticalFontMetric::XHeight => "x-height",
-        VerticalFontMetric::Baseline => "baseline" ,
-        VerticalFontMetric::Descender => "descender",
-    })
+    Descender,
 }
diff --git a/src/font/variant.rs b/src/font/variant.rs
index 4eda80ad..9391aae1 100644
--- a/src/font/variant.rs
+++ b/src/font/variant.rs
@@ -2,7 +2,7 @@ use std::fmt::{self, Debug, Formatter};
 
 use serde::{Deserialize, Serialize};
 
-use crate::eval::{cast_from_value, cast_to_value, Value};
+use crate::eval::{cast_from_value, cast_to_value, Cast, Value};
 use crate::geom::Ratio;
 
 /// Properties that distinguish a font from other fonts in the same family.
@@ -32,7 +32,7 @@ impl Debug for FontVariant {
 
 /// The style of a font.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Cast)]
 #[serde(rename_all = "kebab-case")]
 pub enum FontStyle {
     /// The default, typically upright style.
@@ -62,24 +62,6 @@ impl Default for FontStyle {
     }
 }
 
-cast_from_value! {
-    FontStyle,
-    /// The default, typically upright style.
-    "normal" => Self::Normal,
-    /// A cursive style with custom letterform.
-    "italic" => Self::Italic,
-    /// Just a slanted version of the normal style.
-    "oblique" => Self::Oblique,
-}
-
-cast_to_value! {
-    v: FontStyle => Value::from(match v {
-        FontStyle::Normal => "normal",
-        FontStyle::Italic => "italic",
-        FontStyle::Oblique => "oblique",
-    })
-}
-
 /// The weight of a font.
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[derive(Serialize, Deserialize)]