Merge pull request #758 from googlefonts/deduplicate_glyphname

remove the GlyphName defined in fea-rs, and use the one in fontdrasil

fea-rs/src/common.rs

@@ -2,7 +2,7 @@
 
 use std::fmt::{Display, Formatter};
 
-use smol_str::SmolStr;
+use fontdrasil::types::GlyphName;
 pub use write_fonts::types::GlyphId;
 
 mod glyph_class;
@@ -15,9 +15,6 @@ pub use glyph_map::GlyphMap;
 
 use crate::compile::Anchor;
 
-/// A glyph name
-pub type GlyphName = SmolStr;
-
 /// A glyph or glyph class.
 ///
 /// Various places in the FEA spec accept either a single glyph or a glyph class.

fea-rs/src/common/glyph_map.rs

@@ -1,6 +1,7 @@
 use write_fonts::tables::post::Post;
 
-use super::{GlyphId, GlyphIdent, GlyphName};
+use super::{GlyphId, GlyphIdent};
+use fontdrasil::types::GlyphName;
 use std::{
     borrow::Cow,
     collections::{BTreeMap, HashMap},
@@ -134,7 +135,9 @@ impl FromIterator<GlyphIdent> for GlyphMap {
 }
 
 mod sealed {
-    use super::{super::GlyphIdent, GlyphName};
+    use super::super::GlyphIdent;
+    use fontdrasil::types::GlyphName;
+    use smol_str::SmolStr;
 
     /// Something that is either a Cid or a glyph name.
     ///
@@ -158,9 +161,15 @@ mod sealed {
         }
     }
 
+    impl AsGlyphIdent for SmolStr {
+        fn named(&self) -> Option<&str> {
+            Some(self.as_str())
+        }
+    }
+
     impl AsGlyphIdent for GlyphName {
         fn named(&self) -> Option<&str> {
-            Some(self)
+            Some(self.as_str())
         }
     }
 
@@ -173,7 +182,7 @@ mod sealed {
     impl AsGlyphIdent for GlyphIdent {
         fn named(&self) -> Option<&str> {
             if let GlyphIdent::Name(name) = self {
-                Some(name)
+                Some(name.as_str())
             } else {
                 None
             }

fea-rs/src/compile.rs

@@ -1,9 +1,9 @@
 //! Compiling OpenType Layout tables
 
+use crate::{parse::ParseTree, DiagnosticSet, GlyphMap};
+use fontdrasil::types::GlyphName;
 use write_fonts::types::GlyphId;
 
-use crate::{parse::ParseTree, DiagnosticSet, GlyphMap, GlyphName};
-
 use self::{
     compile_ctx::CompilationCtx,
     error::{FontGlyphOrderError, GlyphOrderError},

fea-rs/src/lib.rs

@@ -15,7 +15,7 @@ pub mod util;
 #[cfg(test)]
 mod tests;
 
-pub use common::{GlyphIdent, GlyphMap, GlyphName, GlyphSet};
+pub use common::{GlyphIdent, GlyphMap, GlyphSet};
 pub use compile::{Compiler, Opts};
 pub use diagnostic::{Diagnostic, DiagnosticSet, Level};
 pub use parse::{ParseTree, TokenSet};

fea-rs/src/parse/grammar/glyph.rs

@@ -207,7 +207,8 @@ mod tests {
     use super::*;
     use crate::parse::FileId;
     use crate::token_tree::AstSink;
-    use crate::{GlyphMap, GlyphName};
+    use crate::GlyphMap;
+    use fontdrasil::types::GlyphName;
 
     #[test]
     fn name_like() {

fea-rs/src/tests/compile.rs

@@ -5,8 +5,9 @@ use std::path::{Path, PathBuf};
 use crate::{
     compile::{error::CompilerError, Compiler, MockVariationInfo, NopFeatureProvider, Opts},
     util::ttx::{self as test_utils, Report, TestCase, TestResult},
-    GlyphMap, GlyphName,
+    GlyphMap,
 };
+use fontdrasil::types::GlyphName;
 
 static ROOT_TEST_DIR: &str = "./test-data/compile-tests";
 static GOOD_DIR: &str = "good";

fontbe/src/features.rs

@@ -453,7 +453,7 @@ impl Work<Context, AnyWorkId, Error> for FeatureParsingWork {
         let features = context.ir.features.get();
         let glyph_order = context.ir.glyph_order.get();
         let static_metadata = context.ir.static_metadata.get();
-        let glyph_map = glyph_order.iter().map(|g| g.clone().into_inner()).collect();
+        let glyph_map = glyph_order.iter().cloned().collect();
 
         let result = self.parse(&features, &glyph_map);
 

fontbe/src/features/kern.rs

@@ -369,7 +369,7 @@ impl Work<Context, AnyWorkId, Error> for KerningGatherWork {
         let arc_fragments = context.kern_fragments.all();
         let ast = context.fea_ast.get();
         let glyph_order = context.ir.glyph_order.get();
-        let glyph_map = glyph_order.iter().map(|g| g.clone().into_inner()).collect();
+        let glyph_map = glyph_order.iter().cloned().collect();
         let mut fragments: Vec<_> = arc_fragments
             .iter()
             .map(|(_, fragment)| fragment.as_ref())

fontbe/src/features/marks.rs

@@ -197,11 +197,7 @@ impl Work<Context, AnyWorkId, Error> for MarkWork {
         let groups = create_mark_to_base_groups(&anchors, &glyph_order);
 
         let mut all_marks = FeaRsMarks {
-            glyphmap: glyph_order
-                .iter()
-                .cloned()
-                .map(GlyphName::into_inner)
-                .collect(),
+            glyphmap: glyph_order.iter().cloned().collect(),
             ..Default::default()
         };