feat: impl PartialOrd for newtypes to reference (#725)

* update some other impls in terms of Ord

Author: molpopgen

src/sys/macros.rs

@@ -124,13 +124,37 @@ macro_rules! impl_id_traits {
 
         impl PartialOrd<super::bindings::tsk_id_t> for $idtype {
             fn partial_cmp(&self, other: &super::bindings::tsk_id_t) -> Option<std::cmp::Ordering> {
-                self.0.partial_cmp(other)
+                Some(self.0.cmp(other))
             }
         }
 
         impl PartialOrd<$idtype> for super::bindings::tsk_id_t {
             fn partial_cmp(&self, other: &$idtype) -> Option<std::cmp::Ordering> {
-                self.partial_cmp(&other.0)
+                Some(self.cmp(&other.0))
+            }
+        }
+
+        impl PartialEq<&$idtype> for $idtype {
+            fn eq(&self, other: &&$idtype) -> bool {
+                self.0 == other.0
+            }
+        }
+
+        impl PartialEq<$idtype> for &$idtype {
+            fn eq(&self, other: &$idtype) -> bool {
+                self.0 == other.0
+            }
+        }
+
+        impl PartialOrd<&$idtype> for $idtype {
+            fn partial_cmp(&self, other: &&$idtype) -> Option<std::cmp::Ordering> {
+                Some(self.0.cmp(&other.0))
+            }
+        }
+
+        impl PartialOrd<$idtype> for &$idtype {
+            fn partial_cmp(&self, other: &$idtype) -> Option<std::cmp::Ordering> {
+                Some(self.0.cmp(&other.0))
             }
         }
 

src/sys/newtypes.rs

@@ -243,3 +243,20 @@ fn test_try_from_reference() {
     let y = NodeId::from(2);
     assert_eq!(2, usize::try_from(&y).unwrap());
 }
+
+#[test]
+fn test_eq_to_self_ref() {
+    let x = NodeId::from(1);
+    let rx = &x;
+    assert_eq!(x, rx);
+    assert_eq!(rx, x);
+}
+
+#[test]
+fn test_ord_to_self_ref() {
+    let x = NodeId::from(1);
+    let y = NodeId::from(2);
+    let ry = &y;
+    assert!(x < ry);
+    assert!(ry > x);
+}

tests/book_trees.rs

@@ -86,7 +86,7 @@ fn initialize_from_table_collection() {
                 // The children function returns another iterator
                 let _siblings = tree
                     .children(parent)
-                    .filter(|child| child != &node)
+                    .filter(|child| child != node)
                     .collect::<Vec<_>>();
             }
         }