cool

Author: molpopgen

src/sys/flags.rs

@@ -3,6 +3,22 @@ use crate::RawFlags;
 
 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! impl_from_for_flag_types {
     ($flagstype: ty) => {
         impl From<$crate::RawFlags> for $flagstype {
@@ -61,6 +77,12 @@ macro_rules! contains {
     };
 }
 
+impl std::ops::BitXorAssign for NodeFlags {
+    fn bitxor_assign(&mut self, rhs: Self) {
+        self.0 ^= rhs.0
+    }
+}
+
 /// Control the behavior of table simplification.
 ///
 /// Inclusion of values sets an option to `true`.
@@ -120,7 +142,8 @@ impl SimplificationOptions {
     ///  to root, but only if they are associated with an individual
     ///  in the individuals table.
     ///  Cannot be specified at the same time as `KEEP_UNARY`.
-    pub const KEEP_UNARY_IN_INDIVIDUALS: RawFlags = ll_bindings::TSK_SIMPLIFY_KEEP_UNARY_IN_INDIVIDUALS;
+    pub const KEEP_UNARY_IN_INDIVIDUALS: RawFlags =
+        ll_bindings::TSK_SIMPLIFY_KEEP_UNARY_IN_INDIVIDUALS;
 
     flag_builder_api!(
     /// Update to set [`KEEP_INPUT_ROOTS`](crate::SimplificationOptions::KEEP_INPUT_ROOTS).
@@ -657,9 +680,9 @@ pub struct NodeFlags(tsk_flags_t);
 
 impl NodeFlags {
     /// Default (empty)
-    pub const NONE: tsk_flags_t = 0;
+    pub const NONE: Self = Self(0);
     /// Node is a sample
-    pub const IS_SAMPLE: tsk_flags_t = ll_bindings::TSK_NODE_IS_SAMPLE;
+    pub const IS_SAMPLE: Self = Self(ll_bindings::TSK_NODE_IS_SAMPLE);
 
     /// Create a new flags instance with `IS_SAMPLE` set.
     pub fn new_sample() -> Self {
@@ -673,7 +696,7 @@ impl NodeFlags {
     /// This function is called `mark_sample` to not conflict
     /// with [`NodeFlags::is_sample`], which predates it.
     pub fn mark_sample(self) -> Self {
-        Self(self.0 | Self::IS_SAMPLE)
+        Self(self.0 | Self::IS_SAMPLE.0)
     }
 
     /// We do not enforce valid flags in the library.
@@ -693,8 +716,8 @@ impl NodeFlags {
     all!();
     contains!();
 
-    pub fn toggle(&mut self, bit: tsk_flags_t) {
-        self.0 ^= bit
+    pub fn toggle<I: Into<Self>>(&mut self, bit: I) {
+        self.bitxor_assign(bit.into());
     }
 
     pub fn remove<I>(&mut self, bit: I)