diff --git a/rbx-dom b/rbx-dom index a98c70c8..47b61af5 160000 --- a/rbx-dom +++ b/rbx-dom @@ -1 +1 @@ -Subproject commit a98c70c8752071b59b852d2f7e55376b1bbd2370 +Subproject commit 47b61af5aa94f6b26aac64ad94edd4b5d1b8e6ba diff --git a/src/syncback/hash/variant.rs b/src/syncback/hash/variant.rs index 3457beac..4d5285a5 100644 --- a/src/syncback/hash/variant.rs +++ b/src/syncback/hash/variant.rs @@ -96,12 +96,6 @@ pub fn hash_variant(hasher: &mut Hasher, value: &Variant) { n_hash!(hasher, f.weight as u16); n_hash!(hasher, f.style as u8); hash!(hasher, f.family.as_bytes()); - if let Some(cache) = &f.cached_face_id { - hash!(hasher, &[0x01]); - hash!(hasher, cache.as_bytes()); - } else { - hash!(hasher, &[0x00]); - } } Variant::Int32(n) => n_hash!(hasher, n), Variant::Int64(n) => n_hash!(hasher, n), diff --git a/src/variant_eq.rs b/src/variant_eq.rs index d6e6f852..5d47931d 100644 --- a/src/variant_eq.rs +++ b/src/variant_eq.rs @@ -102,10 +102,7 @@ pub fn variant_eq(variant_a: &Variant, variant_b: &Variant) -> bool { (Variant::Float32(a), Variant::Float32(b)) => fuzzy_eq_f32(*a, *b), (Variant::Float64(a), Variant::Float64(b)) => fuzzy_eq_f64(*a, *b), (Variant::Font(a), Variant::Font(b)) => { - a.weight == b.weight - && a.style == b.style - && a.family == b.family - && a.cached_face_id == b.cached_face_id + a.weight == b.weight && a.style == b.style && a.family == b.family } (Variant::Int32(a), Variant::Int32(b)) => a == b, (Variant::Int64(a), Variant::Int64(b)) => a == b, @@ -329,10 +326,7 @@ pub fn variant_eq_disk(variant_a: &Variant, variant_b: &Variant) -> bool { (Variant::Float32(a), Variant::Float32(b)) => disk_eq_f32(*a, *b), (Variant::Float64(a), Variant::Float64(b)) => disk_eq_f64(*a, *b), (Variant::Font(a), Variant::Font(b)) => { - a.weight == b.weight - && a.style == b.style - && a.family == b.family - && a.cached_face_id == b.cached_face_id + a.weight == b.weight && a.style == b.style && a.family == b.family } (Variant::Int32(a), Variant::Int32(b)) => a == b, (Variant::Int64(a), Variant::Int64(b)) => a == b,