Return a Result, don't panic.

googlefonts · Mar 22, 2024 · 3d9ac30 · 3d9ac30
1 parent ea79928
commit 3d9ac30
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/fontir/src/error.rs b/fontir/src/error.rs
@@ -156,6 +156,8 @@ pub enum WorkError {
     },
     #[error("No source with layerName \"{0}\" exists")]
     NoSourceForName(String),
+    #[error("Source file contained a feature we don't yet support: {0}")]
+    UnsupportedFeature(String),
 }
 
 /// An async work error, hence one that must be Send

diff --git a/fontra2fontir/src/toir.rs b/fontra2fontir/src/toir.rs
@@ -24,12 +24,12 @@ pub(crate) fn to_ir_static_metadata(
         .iter()
         .map(|a| match a {
             crate::fontra::FontraAxis::Discrete(_) => {
-                // Our IR doesn't yet support discrete axes.
-                panic!("Discrete axes are not yet supported: {a:?}")
+                Err(WorkError::UnsupportedFeature(format!("discrete axis {a:?}")))
             }
-            crate::fontra::FontraAxis::Continuous(a) => a,
+            crate::fontra::FontraAxis::Continuous(a) => Ok(a),
         })
         .map(|a| {
+            let a = a?;
             let min = UserCoord::new(a.min_value as f32);
             let default = UserCoord::new(a.default_value as f32);
             let max = UserCoord::new(a.max_value as f32);