Derive PartialEq, Eq, PartialOrd, Ord, Hash

Merges: #68
rust-ux · May 30, 2024 · 9df9b3a · 9df9b3a
2 parents ab2f367 + 81871d0
commit 9df9b3a
Showing 1 changed file with 15 additions and 32 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -25,10 +25,6 @@ use lib::core::ops::{
     ShrAssign,
 };
 
-use lib::core::hash::{Hash, Hasher};
-
-use lib::core::cmp::{Ord, Ordering, PartialOrd};
-
 use lib::core::fmt::{Binary, Display, Formatter, LowerHex, Octal, UpperHex};
 
 macro_rules! define_unsigned {
@@ -37,7 +33,7 @@ macro_rules! define_unsigned {
 
        #[$doc]
         #[allow(non_camel_case_types)]
-        #[derive(Default, Clone, Copy, Debug)]
+        #[derive(Default, Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
         pub struct $name($type);
 
         impl $name {
@@ -61,7 +57,7 @@ macro_rules! define_signed {
 
         #[$doc]
         #[allow(non_camel_case_types)]
-        #[derive(Default, Clone, Copy, Debug)]
+        #[derive(Default, Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
         pub struct $name($type);
 
         #[$doc]
@@ -159,32 +155,6 @@ macro_rules! implement_common {
             }
         }
 
-        impl PartialEq for $name {
-            fn eq(&self, other: &Self) -> bool {
-                self.0 == other.0
-            }
-        }
-
-        impl Eq for $name {}
-
-        impl PartialOrd for $name {
-            fn partial_cmp(&self, other: &$name) -> Option<Ordering> {
-                Some(self.cmp(other))
-            }
-        }
-
-        impl Ord for $name {
-            fn cmp(&self, other: &$name) -> Ordering {
-                self.0.cmp(&other.0)
-            }
-        }
-
-        impl Hash for $name {
-            fn hash<H: Hasher>(&self, h: &mut H) {
-                self.0.hash(h)
-            }
-        }
-
         // Implement formating functions
         impl Display for $name {
             fn fmt(&self, f: &mut Formatter) -> Result<(), lib::core::fmt::Error> {
@@ -983,4 +953,17 @@ mod tests {
         assert_eq!(!u7(0), u7(0x7F));
         assert_eq!(!u7(56), u7(71));
     }
+
+    #[test]
+    fn test_match() {
+        const SEVEN: u7 = u7::new(7);
+        match u7(7) {
+            SEVEN => (),
+            _ => panic!("Pattern matching failed (7 != 7?)"),
+        }
+        match u7(42) {
+            SEVEN => panic!("Pattern matching failed (7 == 42?)"),
+            _ => (),
+        }
+    }
 }