diff --git a/Cargo.lock b/Cargo.lock index f4f120a..e315839 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "ab_glyph" @@ -493,7 +493,6 @@ dependencies = [ "ab_glyph_rasterizer", "brotli", "cfg-if", - "font-types", "homedir", "image", "indexmap 1.9.3", @@ -658,9 +657,9 @@ dependencies = [ [[package]] name = "font-types" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cdb0bc47d40fdd11177c271c1bb3704b4230e7a945891d3cc184244c74d64b2" +checksum = "dda6e36206148f69fc6ecb1bb6c0dedd7ee469f3db1d0dc2045beea28430ca43" dependencies = [ "bytemuck", "serde", @@ -1409,9 +1408,9 @@ dependencies = [ [[package]] name = "read-fonts" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baa1d3f6c6449e4299e17814855468617c2924753ce4f0601b16cba9f8e7bd8" +checksum = "3959894fa0c1ac6d60843ea815c07ab1269a8ed4f248b696aa02cb5cc58b07de" dependencies = [ "bytemuck", "font-types", @@ -1573,9 +1572,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "skrifa" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a49b2de0351f3b8c6dc852c83be4b5a0095e607a29c5731597c0204ed5ec78e" +checksum = "d50ccbf1172148fe84460b0fe35bfa693c4957886d83f35af843e5741d01f2c3" dependencies = [ "bytemuck", "read-fonts", @@ -1713,7 +1712,6 @@ name = "ttj" version = "0.1.0" dependencies = [ "clap", - "font-types", "indexmap 1.9.3", "read-fonts", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index a767fa2..fb4b372 100644 --- a/Cargo.toml +++ b/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"] } diff --git a/diffenator3-lib/Cargo.toml b/diffenator3-lib/Cargo.toml index 0abcad5..c4ace61 100644 --- a/diffenator3-lib/Cargo.toml +++ b/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 } diff --git a/diffenator3-lib/src/dfont.rs b/diffenator3-lib/src/dfont.rs index 9b5df0e..9687e32 100644 --- a/diffenator3-lib/src/dfont.rs +++ b/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; diff --git a/ttj/Cargo.toml b/ttj/Cargo.toml index 6dffb1f..660823d 100644 --- a/ttj/Cargo.toml +++ b/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 } diff --git a/ttj/src/context.rs b/ttj/src/context.rs index 84d255f..0a1c504 100644 --- a/ttj/src/context.rs +++ b/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;