okay

Author: molpopgen

src/sys/flags.rs

@@ -3,6 +3,7 @@ use crate::RawFlags;
 
 use super::bindings::tsk_flags_t;
 
+use std::ops::BitOr;
 use std::ops::BitXorAssign;
 
 macro_rules! make_constant_self {
@@ -38,7 +39,7 @@ macro_rules! flag_builder_api {
     ($(#[$attr:meta])* => $name: ident, $flag: ident) => {
         $(#[$attr])*
         pub fn $name(self) -> Self {
-            Self(self.0 | Self::$flag)
+            self | Self::$flag
         }
     };
 }
@@ -72,11 +73,26 @@ macro_rules! contains {
 
 macro_rules! impl_bit_ops {
     ($type: ty) => {
-        impl std::ops::BitXorAssign for $type {
+        impl BitXorAssign for $type {
             fn bitxor_assign(&mut self, rhs: Self) {
                 self.0 ^= rhs.0
             }
         }
+
+        impl BitOr for $type {
+            type Output = Self;
+            fn bitor(self, rhs: Self) -> Self::Output {
+                Self(self.0 | rhs.0)
+            }
+        }
+    };
+}
+
+macro_rules! flags_api {
+    ($type: ty) => {
+        impl_flags!($type);
+        impl_from_for_flag_types!($type);
+        impl_bit_ops!($type);
     };
 }
 
@@ -749,8 +765,6 @@ 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
@@ -770,25 +784,17 @@ impl IndividualFlags {
     contains!();
 }
 
-impl_flags!(SimplificationOptions);
-impl_flags!(TableClearOptions);
-impl_flags!(TableEqualityOptions);
-impl_flags!(TreeSequenceFlags);
-impl_flags!(TableSortOptions);
-impl_flags!(TreeFlags);
-impl_flags!(IndividualTableSortOptions);
-impl_flags!(TableIntegrityCheckFlags);
-impl_flags!(TableOutputOptions);
-
-impl_from_for_flag_types!(SimplificationOptions);
-impl_from_for_flag_types!(TableClearOptions);
-impl_from_for_flag_types!(TableEqualityOptions);
-impl_from_for_flag_types!(TreeSequenceFlags);
-impl_from_for_flag_types!(TableSortOptions);
-impl_from_for_flag_types!(TreeFlags);
-impl_from_for_flag_types!(IndividualTableSortOptions);
-impl_from_for_flag_types!(TableIntegrityCheckFlags);
-impl_from_for_flag_types!(TableOutputOptions);
+flags_api!(SimplificationOptions);
+flags_api!(TableClearOptions);
+flags_api!(TableEqualityOptions);
+flags_api!(TreeSequenceFlags);
+flags_api!(TableSortOptions);
+flags_api!(TreeFlags);
+flags_api!(IndividualTableSortOptions);
+flags_api!(TableIntegrityCheckFlags);
+flags_api!(TableOutputOptions);
+
+impl_bit_ops!(NodeFlags);
 
 impl From<RawFlags> for IndividualFlags {
     fn from(flags: RawFlags) -> Self {