From da4182099db703d59006ca72de4cb4d54c9d7855 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 4 Feb 2023 12:42:02 +0100
Subject: Disable `std` feature for `twox-hash` to fix Wasm build

---
 wgpu/Cargo.toml  |  9 ++++++++-
 wgpu/src/text.rs | 11 ++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'wgpu')

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 1ab3d93f..0d9fb75b 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -35,9 +35,16 @@ futures = "0.3"
 bitflags = "1.2"
 once_cell = "1.0"
 rustc-hash = "1.1"
-twox-hash = "1.6"
 ouroboros = "0.15"
 
+[dependencies.twox-hash]
+version = "1.6"
+default-features = false
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies.twox-hash]
+version = "1.6.1"
+features = ["std"]
+
 [dependencies.bytemuck]
 version = "1.9"
 features = ["derive"]
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 967596f2..6c88acc3 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -10,7 +10,6 @@ use std::cell::RefCell;
 use std::collections::hash_map;
 use std::hash::{BuildHasher, Hash, Hasher};
 use std::sync::Arc;
-use twox_hash::RandomXxHashBuilder64;
 
 #[allow(missing_debug_implementations)]
 pub struct Pipeline {
@@ -311,15 +310,21 @@ fn to_family(font: Font) -> glyphon::Family<'static> {
 struct Cache<'a> {
     entries: FxHashMap<KeyHash, glyphon::Buffer<'a>>,
     recently_used: FxHashSet<KeyHash>,
-    hasher: RandomXxHashBuilder64,
+    hasher: HashBuilder,
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+type HashBuilder = twox_hash::RandomXxHashBuilder64;
+
+#[cfg(target_arch = "wasm32")]
+type HashBuilder = std::hash::BuildHasherDefault<twox_hash::XxHash64>;
+
 impl<'a> Cache<'a> {
     fn new() -> Self {
         Self {
             entries: FxHashMap::default(),
             recently_used: FxHashSet::default(),
-            hasher: RandomXxHashBuilder64::default(),
+            hasher: HashBuilder::default(),
         }
     }
 
-- 
cgit