graph: Move boilerplate `impl`s to a new `impl_type` macro

src/graph.rs

@@ -34,47 +34,51 @@ pub enum Weight {
     Bend(BendWeight),
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+macro_rules! impl_type {
-pub struct DotWeight {
+    ($weight_struct_name:ident, $weight_variant_name:ident, $index_struct_name:ident) => {
-    pub net: i64,
+        impl Retag for $weight_struct_name {
-    pub circle: Circle,
-}
-
-impl Retag for DotWeight {
             fn retag(&self, index: NodeIndex<usize>) -> Index {
-        Index::Dot(DotIndex {
+                Index::$weight_variant_name($index_struct_name {
                     node_index: index,
                     marker: PhantomData,
                 })
             }
         }
 
-impl GetNet for DotWeight {
+        impl GetNet for $weight_struct_name {
             fn net(&self) -> i64 {
                 self.net
             }
         }
 
+        pub type $index_struct_name = GenericIndex<$weight_struct_name>;
+
+        impl MakePrimitive for $index_struct_name {
+            fn primitive<'a>(
+                &self,
+                graph: &'a StableDiGraph<Weight, Label, usize>,
+            ) -> Primitive<'a> {
+                Primitive::$weight_variant_name(GenericPrimitive::new(*self, graph))
+            }
+        }
+    };
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct DotWeight {
+    pub net: i64,
+    pub circle: Circle,
+}
+
+impl_type!(DotWeight, Dot, DotIndex);
+
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub struct SegWeight {
     pub net: i64,
     pub width: f64,
 }
 
-impl Retag for SegWeight {
+impl_type!(SegWeight, Seg, SegIndex);
-    fn retag(&self, index: NodeIndex<usize>) -> Index {
-        Index::Seg(SegIndex {
-            node_index: index,
-            marker: PhantomData,
-        })
-    }
-}
-
-impl GetNet for SegWeight {
-    fn net(&self) -> i64 {
-        self.net
-    }
-}
 
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub struct BendWeight {
@@ -82,20 +86,7 @@ pub struct BendWeight {
     pub cw: bool,
 }
 
-impl Retag for BendWeight {
+impl_type!(BendWeight, Bend, BendIndex);
-    fn retag(&self, index: NodeIndex<usize>) -> Index {
-        Index::Bend(BendIndex {
-            node_index: index,
-            marker: PhantomData,
-        })
-    }
-}
-
-impl GetNet for BendWeight {
-    fn net(&self) -> i64 {
-        self.net
-    }
-}
 
 #[derive(Debug, EnumAsInner, Clone, Copy, PartialEq)]
 pub enum Label {
@@ -142,27 +133,3 @@ impl<W> GetNodeIndex for GenericIndex<W> {
         self.node_index
     }
 }
-
-pub type DotIndex = GenericIndex<DotWeight>;
-
-impl MakePrimitive for DotIndex {
-    fn primitive<'a>(&self, graph: &'a StableDiGraph<Weight, Label, usize>) -> Primitive<'a> {
-        Primitive::Dot(GenericPrimitive::new(*self, graph))
-    }
-}
-
-pub type SegIndex = GenericIndex<SegWeight>;
-
-impl MakePrimitive for SegIndex {
-    fn primitive<'a>(&self, graph: &'a StableDiGraph<Weight, Label, usize>) -> Primitive<'a> {
-        Primitive::Seg(GenericPrimitive::new(*self, graph))
-    }
-}
-
-pub type BendIndex = GenericIndex<BendWeight>;
-
-impl MakePrimitive for BendIndex {
-    fn primitive<'a>(&self, graph: &'a StableDiGraph<Weight, Label, usize>) -> Primitive<'a> {
-        Primitive::Bend(GenericPrimitive::new(*self, graph))
-    }
-}

src/primitive.rs

@@ -22,15 +22,7 @@ pub trait GetConnectable: GetNet + GetGraph {
         let this = self.net();
         let other = index.primitive(self.graph()).net();
 
-        if this == other {
+        (this == other) || this == -1 || other == -1
-            true
-        } else if this == -1 || other == -1 {
-            true
-        } else if this == -2 || other == -2 {
-            false
-        } else {
-            this == other
-        }
     }
 }