From e5370ce97a9afbb41b48f2e65d937108428a22ff Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Mon, 7 Oct 2024 21:03:03 +0700
Subject: [PATCH] Update to current `swash` 0.1.19 (#124)

This lets everything use the same version of the Fontations
dependencies.
---
 Cargo.lock                 | 51 ++++++++------------------------------
 Cargo.toml                 |  2 +-
 fontique/src/attributes.rs |  4 +++
 3 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 242cf4b3..d3cc456f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -715,15 +715,6 @@ dependencies = [
  "spin",
 ]
 
-[[package]]
-name = "font-types"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60"
-dependencies = [
- "bytemuck",
-]
-
 [[package]]
 name = "font-types"
 version = "0.7.2"
@@ -759,7 +750,7 @@ dependencies = [
  "objc2-foundation",
  "peniko",
  "roxmltree",
- "skrifa 0.22.3",
+ "skrifa",
  "smallvec",
  "unicode-script",
  "windows 0.58.0",
@@ -1815,7 +1806,7 @@ version = "0.1.0"
 dependencies = [
  "fontique",
  "peniko",
- "skrifa 0.22.3",
+ "skrifa",
  "swash",
 ]
 
@@ -2103,16 +2094,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "read-fonts"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd"
-dependencies = [
- "bytemuck",
- "font-types 0.6.0",
-]
-
 [[package]]
 name = "read-fonts"
 version = "0.22.3"
@@ -2121,7 +2102,7 @@ checksum = "fb94d9ac780fdcf9b6b252253f7d8f221379b84bd3573131139b383df69f85e1"
 dependencies = [
  "bytemuck",
  "core_maths",
- "font-types 0.7.2",
+ "font-types",
 ]
 
 [[package]]
@@ -2266,16 +2247,6 @@ dependencies = [
  "quote",
 ]
 
-[[package]]
-name = "skrifa"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23"
-dependencies = [
- "bytemuck",
- "read-fonts 0.20.0",
-]
-
 [[package]]
 name = "skrifa"
 version = "0.22.3"
@@ -2284,7 +2255,7 @@ checksum = "8e1c44ad1f6c5bdd4eefed8326711b7dbda9ea45dfd36068c427d332aa382cbe"
 dependencies = [
  "bytemuck",
  "core_maths",
- "read-fonts 0.22.3",
+ "read-fonts",
 ]
 
 [[package]]
@@ -2389,11 +2360,11 @@ checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca"
 
 [[package]]
 name = "swash"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac"
+checksum = "cbd59f3f359ddd2c95af4758c18270eddd9c730dde98598023cdabff472c2ca2"
 dependencies = [
- "skrifa 0.20.0",
+ "skrifa",
  "yazi",
  "zeno",
 ]
@@ -2405,7 +2376,7 @@ dependencies = [
  "image",
  "parley",
  "peniko",
- "skrifa 0.22.3",
+ "skrifa",
  "swash",
 ]
 
@@ -2533,7 +2504,7 @@ version = "0.1.0"
 dependencies = [
  "parley",
  "peniko",
- "skrifa 0.22.3",
+ "skrifa",
  "tiny-skia",
 ]
 
@@ -2656,7 +2627,7 @@ dependencies = [
  "peniko",
  "png",
  "raw-window-handle",
- "skrifa 0.22.3",
+ "skrifa",
  "static_assertions",
  "thiserror",
  "vello_encoding",
@@ -2686,7 +2657,7 @@ dependencies = [
  "bytemuck",
  "guillotiere",
  "peniko",
- "skrifa 0.22.3",
+ "skrifa",
  "smallvec",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 9681a67d..0ea661be 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,4 +27,4 @@ fontique = { version = "0.1.0", default-features = false, path = "fontique" }
 parley = { version = "0.1.0", default-features = false, path = "parley" }
 peniko = { version = "0.2.0", default-features = false }
 skrifa = { version = "0.22.3", default-features = false }
-swash = { version = "0.1.18", default-features = false }
+swash = { version = "0.1.19", default-features = false }
diff --git a/fontique/src/attributes.rs b/fontique/src/attributes.rs
index 5ed84e87..9ab3820d 100644
--- a/fontique/src/attributes.rs
+++ b/fontique/src/attributes.rs
@@ -3,7 +3,11 @@
 
 //! Properties for specifying font weight, stretch and style.
 
+// This is unused due to an issue in CI and the fact that our
+// no_std support doesn't really work correctly yet.
+// See https://github.com/linebender/parley/issues/86
 #[cfg(not(feature = "std"))]
+#[allow(unused_imports)]
 use core_maths::*;
 
 use core::fmt;