Remove deref polymorphism

src/hb/face.rs

@@ -25,36 +25,6 @@ pub struct hb_font_t<'a> {
     pub(crate) gpos: Option<PositioningTable<'a>>,
 }
 
-impl<'a> AsRef<ttf_parser::Face<'a>> for hb_font_t<'a> {
-    #[inline]
-    fn as_ref(&self) -> &ttf_parser::Face<'a> {
-        &self.ttfp_face
-    }
-}
-
-impl<'a> AsMut<ttf_parser::Face<'a>> for hb_font_t<'a> {
-    #[inline]
-    fn as_mut(&mut self) -> &mut ttf_parser::Face<'a> {
-        &mut self.ttfp_face
-    }
-}
-
-impl<'a> core::ops::Deref for hb_font_t<'a> {
-    type Target = ttf_parser::Face<'a>;
-
-    #[inline]
-    fn deref(&self) -> &Self::Target {
-        &self.ttfp_face
-    }
-}
-
-impl<'a> core::ops::DerefMut for hb_font_t<'a> {
-    #[inline]
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.ttfp_face
-    }
-}
-
 impl<'a> hb_font_t<'a> {
     /// Creates a new `Face` from data.
     ///
@@ -121,10 +91,14 @@ impl<'a> hb_font_t<'a> {
         self.points_per_em = ptem;
     }
 
+    pub(crate) fn tables(&self) -> &ttf_parser::FaceTables<'a> {
+        self.ttfp_face.tables()
+    }
+
     /// Sets font variations.
     pub fn set_variations(&mut self, variations: &[Variation]) {
         for variation in variations {
-            self.set_variation(variation.tag, variation.value);
+            self.ttfp_face.set_variation(variation.tag, variation.value);
         }
         self.font.set_coords(self.ttfp_face.variation_coordinates());
     }
@@ -257,7 +231,7 @@ impl<'a> hb_font_t<'a> {
                 return false;
             }
 
-            if let Some(clip_box) = colr.clip_box(glyph, self.variation_coordinates()) {
+            if let Some(clip_box) = colr.clip_box(glyph, self.ttfp_face.variation_coordinates()) {
                 // Floor
                 glyph_extents.x_bearing = (clip_box.x_min).round() as i32;
                 glyph_extents.y_bearing = (clip_box.y_max).round() as i32;
@@ -272,7 +246,7 @@ impl<'a> hb_font_t<'a> {
                     glyph,
                     0,
                     &mut extents_data,
-                    self.variation_coordinates(),
+                    self.ttfp_face.variation_coordinates(),
                     RgbaColor::new(0, 0, 0, 0),
                 )
                 .is_some();