From c6dffa015698df2c19c026ff1b024a87a44654f0 Mon Sep 17 00:00:00 2001 From: Nico Burns Date: Sun, 6 Oct 2024 13:27:50 +0100 Subject: [PATCH] Fix merge conflict of windows dependencies --- fontique/Cargo.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fontique/Cargo.toml b/fontique/Cargo.toml index 59b0f7bc..ba1a73d7 100644 --- a/fontique/Cargo.toml +++ b/fontique/Cargo.toml @@ -36,9 +36,8 @@ icu_locid = "1.5.0" hashbrown = "0.14.5" [target.'cfg(target_family="windows")'.dependencies] -dwrote = "0.11.1" -winapi = { version = "0.3.9", features = ["dwrite", "dwrite_1", "dwrite_3", "winnt", "unknwnbase", "libloaderapi", "winnls"] } -wio = "0.2.2" +windows = { version = "0.58.0", features = ["implement", "Win32_Graphics_DirectWrite"] } +windows-core = { version = "0.58" } [target.'cfg(target_vendor="apple")'.dependencies] core-text = "20.1.0"