Update fontations, use re-exported font_types

Cargo.toml

@@ -12,9 +12,8 @@ members = [
 default-members = ["diffenator3-cli", "diff3proof"]
 
 [workspace.dependencies]
-read-fonts = { version = "0.21.0", features = ["serde"] }
-font-types = "0.7.0"
-skrifa = "0.21.0"
+read-fonts = { version = "0.23.0", features = ["serde"] }
+skrifa = "0.24.0"
 indexmap = "1.9.3"
 serde_json = { version = "1.0.96", features = ["preserve_order"] }
 serde = { version = "*", features = ["derive"] }

diffenator3-lib/Cargo.toml

@@ -17,7 +17,6 @@ html = ["dep:tera", "dep:homedir", "dep:walkdir"]
 
 [dependencies]
 read-fonts = { workspace = true }
-font-types = { workspace = true }
 skrifa = { workspace = true }
 indexmap = { workspace = true }
 serde_json = { workspace = true }

diffenator3-lib/src/dfont.rs

@@ -1,11 +1,10 @@
 use crate::setting::parse_location;
-use font_types::NameId;
-use read_fonts::{FontRef, ReadError, TableProvider};
-use skrifa::instance::Location;
-use skrifa::setting::VariationSetting;
-use skrifa::MetadataProvider;
-use std::borrow::Cow;
-use std::collections::{HashMap, HashSet};
+use read_fonts::{types::NameId, FontRef, ReadError, TableProvider};
+use skrifa::{instance::Location, setting::VariationSetting, MetadataProvider};
+use std::{
+    borrow::Cow,
+    collections::{HashMap, HashSet},
+};
 use ttj::monkeypatching::DenormalizeLocation;
 use ucd::Codepoint;
 

ttj/Cargo.toml

@@ -6,7 +6,6 @@ edition = "2021"
 [dependencies]
 skrifa = { workspace = true }
 read-fonts = { workspace = true }
-font-types = { workspace = true }
 serde_json = { workspace = true }
 clap = "*"
 indexmap = { workspace = true }

ttj/src/context.rs

@@ -1,5 +1,4 @@
-use font_types::F2Dot14;
-use read_fonts::{ReadError, TableProvider};
+use read_fonts::{types::F2Dot14, ReadError, TableProvider};
 use skrifa::FontRef;
 
 use crate::monkeypatching::DenormalizeLocation;