Simplify GlyphInfo.var2 access.

harfbuzz · Sep 9, 2023 · 5b78158 · 5b78158
1 parent 11d0c1e
commit 5b78158
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/src/complex/arabic.rs b/src/complex/arabic.rs
@@ -145,13 +145,11 @@ pub enum JoiningType {
 
 impl GlyphInfo {
     fn arabic_shaping_action(&self) -> u8 {
-        let v: &[u8; 4] = bytemuck::cast_ref(&self.var2);
-        v[2]
+        self.complex_var_u8_auxiliary()
     }
 
     fn set_arabic_shaping_action(&mut self, action: u8) {
-        let v: &mut [u8; 4] = bytemuck::cast_mut(&mut self.var2);
-        v[2] = action;
+        self.set_complex_var_u8_auxiliary(action)
     }
 }
 

diff --git a/src/complex/hangul.rs b/src/complex/hangul.rs
@@ -38,13 +38,11 @@ const TJMO: u8 = 3;
 
 impl GlyphInfo {
     fn hangul_shaping_feature(&self) -> u8 {
-        let v: &[u8; 4] = bytemuck::cast_ref(&self.var2);
-        v[2]
+        self.complex_var_u8_auxiliary()
     }
 
     fn set_hangul_shaping_feature(&mut self, feature: u8) {
-        let v: &mut [u8; 4] = bytemuck::cast_mut(&mut self.var2);
-        v[2] = feature;
+        self.set_complex_var_u8_auxiliary(feature)
     }
 }
 

diff --git a/src/shape.rs b/src/shape.rs
@@ -383,8 +383,7 @@ fn insert_dotted_circle(buffer: &mut Buffer, face: &Face) {
             glyph_id: 0x25CC,
             mask: buffer.cur(0).mask,
             cluster: buffer.cur(0).cluster,
-            var1: 0,
-            var2: 0,
+            ..GlyphInfo::default()
         };
 
         info.init_unicode_props(&mut buffer.scratch_flags);