This works, but is still ugly (very verbose)

Author: felipesanches

fontspector-checkapi/src/font.rs

@@ -1,7 +1,7 @@
 use crate::{constants::RIBBI_STYLE_NAMES, filetype::FileTypeConvert, FileType, Testable};
 use read_fonts::{
     tables::cmap::Cmap,
-    tables::gdef::ClassDef,
+    tables::gdef::Gdef,
     tables::os2::SelectionFlags,
     TableProvider,
 };
@@ -89,16 +89,16 @@ impl TestFont {
         Ok(os2.fs_selection())
     }
 
-    pub fn get_gdef_glyph_class_def(&self) -> Result<ClassDef, Box<dyn Error>> {
-        let gdef = self.font().gdef()?;
-        Ok(gdef.glyph_class_def().unwrap()?)
-    }
-
     pub fn get_cmap(&self) -> Result<Cmap, Box<dyn Error>> {
         let cmap = self.font().cmap()?;
         Ok(cmap)
     }
 
+    pub fn get_gdef(&self) -> Result<Gdef, Box<dyn Error>> {
+        let gdef = self.font().gdef()?;
+        Ok(gdef)
+    }
+
     pub fn get_name_entry_strings(&self, name_id: StringId) -> LocalizedStrings {
         self.font().localized_strings(name_id)
     }

profile-universal/src/checks/arabic_spacing_symbols.rs

@@ -20,22 +20,48 @@ const ARABIC_SPACING_SYMBOLS: [u16; 17] = [
     0xFBC2,  // Wasla Above
 ];
 
-fn arabic_spacing_symbols(t: &Testable) -> StatusList {
+fn arabic_spacing_symbols(t: &Testable) -> CheckFnResult {
     let mut problems: Vec<Status> = vec![];
-    let f = TTF.from_testable(t).expect("Not a TTF file");
-    let cmap = f.get_cmap().unwrap();
-    let class_def = f.get_gdef_glyph_class_def().unwrap();
+    let f = TTF.from_testable(t).ok_or("Not a TTF file")?;
+    let cmap = match f.get_cmap() {
+        Err(_) => {
+            problems.push(Status::fail("Font lacks a cmap table"));
+            return return_result(problems);
+        },
+        Ok(c) => c
+    };
+
+    let gdef = match f.get_gdef() {
+        Err(_) => {
+            problems.push(Status::fail("Font lacks a gdef table"));
+            return return_result(problems);
+        },
+        Ok(g) => g
+    };
+
+    let class_def = match gdef.glyph_class_def() {
+        None => return return_result(problems),
+        Some(d) => d
+    };
+
+    let class_def = match class_def {
+        Err(e) => {
+            problems.push(Status::error(&format!("Some classDef error: {}", e)));
+            return return_result(problems);
+        },
+        Ok(d) => d
+    };
 
     for codepoint in ARABIC_SPACING_SYMBOLS {
         let gid = cmap.map_codepoint(codepoint);
-        if gid.is_some() && class_def.get(gid.unwrap()) == 3 {
+        if gid.is_some() && class_def.get(gid.ok_or("Failed to read gid")?) == 3 {
             problems.push(Status::fail(&format!(
                 "U+{:04X} is defined in GDEF as a mark (class 3).", codepoint)));
         }
     }
 
     if problems.is_empty() {
-        Status::just_one_pass()
+        Ok(Status::just_one_pass())
     } else {
         return_result(problems)
     }