Implement PartialEq and PartialOrd between SemVer and Rapid versioning

src/version/mod.rs

@@ -1,9 +1,7 @@
-use std::cmp::Ordering;
-
 use {
     chrono::{offset::Utc, DateTime},
     serde::{Deserialize, Serialize},
-    std::{error::Error, fmt, str::FromStr},
+    std::{cmp::Ordering, error::Error, fmt, str::FromStr},
 };
 
 mod gitrev;
@@ -86,7 +84,10 @@ impl From<SemVer> for Version {
 
 impl From<Rapid> for Version {
     fn from(value: Rapid) -> Self {
-        Self::Rapid { major: value.major, minor: value.minor }
+        Self::Rapid {
+            major: value.major,
+            minor: value.minor,
+        }
     }
 }
 
@@ -111,27 +112,20 @@ impl PartialOrd for Version {
         match (self, other) {
             (Self::Number(s), Self::Number(o)) => s.partial_cmp(o),
             (
+                Self::SemVer {
+                    major,
+                    minor,
+                    patch,
+                },
                 Self::SemVer {
                     major: a,
                     minor: b,
                     patch: c,
                 },
-                Self::SemVer {
+            ) => (major, minor, patch).partial_cmp(&(a, b, c)),
-                    major: d,
+            (Self::Rapid { major, minor }, Self::Rapid { major: a, minor: b }) => {
-                    minor: e,
+                (major, minor).partial_cmp(&(a, b))
-                    patch: f,
+            }
-                },
-            ) => (a, b, c).partial_cmp(&(d, e, f)),
-            (
-                Self::Rapid {
-                    major: a,
-                    minor: b,
-                },
-                Self::Rapid {
-                    major: c,
-                    minor: d,
-                },
-            ) => (a, b).partial_cmp(&(c, d)),
             (
                 Self::Git {
                     hash: _a,
@@ -142,6 +136,11 @@ impl PartialOrd for Version {
                     datetime: d,
                 },
             ) => b.partial_cmp(&d),
+            (
+                Self::SemVer { major, minor, patch },
+                Self::Rapid { major: a, minor: b },
+            ) => SemVer { major: *major, minor: *minor, patch: *patch }
+                .partial_cmp(&Rapid { major: *a, minor: *b }),
             _ => None,
         }
     }
@@ -195,8 +194,8 @@ impl PartialOrd<Rapid> for SemVer {
                 Some(Ordering::Equal) => match self.patch {
                     0 => Some(Ordering::Equal),
                     _ => Some(Ordering::Greater),
-                }
+                },
-            }
+            },
         }
     }
 }

src/version/rapid.rs

@@ -62,10 +62,7 @@ impl FromStr for Rapid {
             2 => {
                 let major = split.first().unwrap().parse::<u32>()?;
                 let minor = split.get(1).unwrap().parse::<u32>()?;
-                Ok(Self {
+                Ok(Self { major, minor })
-                    major,
-                    minor,
-                })
             }
             _ => Err(ParseRapidError),
         }