Move conversion into font module

Signed-off-by: Nico Burns <[email protected]>

Author: nicoburns

fontique/src/font.rs

@@ -4,6 +4,7 @@
 //! Model for a font.
 
 use crate::CharmapIndex;
+use crate::matching::FontMatchingInfo;
 
 use super::attributes::{FontStyle, FontWeight, FontWidth};
 use super::source::{SourceInfo, SourceKind};
@@ -27,6 +28,17 @@ pub struct FontInfo {
     charmap_index: CharmapIndex,
 }
 
+impl Into<FontMatchingInfo> for &FontInfo {
+    fn into(self) -> FontMatchingInfo {
+        FontMatchingInfo {
+            width: (self.width().ratio() * 100.0) as i32,
+            style: self.style(),
+            weight: self.weight().value(),
+            has_slnt: self.has_slant_axis(),
+        }
+    }
+}
+
 impl FontInfo {
     /// Creates a new font object from the given source and index.
     pub fn from_source(source: SourceInfo, index: u32) -> Option<Self> {

fontique/src/matching.rs

@@ -6,18 +6,17 @@
 use core::ops::Deref;
 
 use super::attributes::{DEFAULT_OBLIQUE_ANGLE, FontStyle, FontWeight, FontWidth};
-use super::font::FontInfo;
 use core::cmp::Ordering;
 use smallvec::SmallVec;
 
 // Public API
 
 #[derive(Copy, Clone)]
 pub struct FontMatchingInfo {
-    width: i32,
-    style: FontStyle,
-    weight: f32,
-    has_slnt: bool,
+    pub width: i32,
+    pub style: FontStyle,
+    pub weight: f32,
+    pub has_slnt: bool,
 }
 
 pub fn match_font(
@@ -33,17 +32,6 @@ pub fn match_font(
 
 // Private implementation details
 
-impl From<&FontInfo> for FontMatchingInfo {
-    fn from(info: &FontInfo) -> Self {
-        Self {
-            width: (info.width().ratio() * 100.0) as i32,
-            style: info.style(),
-            weight: info.weight().value(),
-            has_slnt: info.has_slant_axis(),
-        }
-    }
-}
-
 #[derive(Copy, Clone)]
 struct CandidateFont {
     index: usize,