realizing a pattern

Author: molpopgen

src/sys/flags.rs

@@ -5,17 +5,9 @@ use super::bindings::tsk_flags_t;
 
 use std::ops::BitXorAssign;
 
-trait TstkitFlags {
-    fn raw(&self) -> RawFlags;
-    fn raw_mut(&mut self) -> &mut RawFlags;
-}
-
-impl TstkitFlags for NodeFlags {
-    fn raw(&self) -> RawFlags {
-        self.0
-    }
-    fn raw_mut(&mut self) -> &mut RawFlags {
-        &mut self.0
+macro_rules! make_constant_self {
+    ($name: ident, $constant: ident) => {
+        pub const $name: Self = Self(ll_bindings::$constant);
     }
 }
 
@@ -77,10 +69,14 @@ macro_rules! contains {
     };
 }
 
-impl std::ops::BitXorAssign for NodeFlags {
-    fn bitxor_assign(&mut self, rhs: Self) {
-        self.0 ^= rhs.0
-    }
+macro_rules! impl_bit_ops {
+    ($type: ty) => {
+        impl std::ops::BitXorAssign for $type {
+            fn bitxor_assign(&mut self, rhs: Self) {
+                self.0 ^= rhs.0
+            }
+        }
+    };
 }
 
 /// Control the behavior of table simplification.
@@ -682,7 +678,7 @@ impl NodeFlags {
     /// Default (empty)
     pub const NONE: Self = Self(0);
     /// Node is a sample
-    pub const IS_SAMPLE: Self = Self(ll_bindings::TSK_NODE_IS_SAMPLE);
+    make_constant_self!(IS_SAMPLE, TSK_NODE_IS_SAMPLE);
 
     /// Create a new flags instance with `IS_SAMPLE` set.
     pub fn new_sample() -> Self {
@@ -734,6 +730,8 @@ impl From<tsk_flags_t> for NodeFlags {
     }
 }
 
+impl_bit_ops!(NodeFlags);
+
 #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[repr(transparent)]
 /// Individual flags