summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJoakim Hulthe <joakim.hulthe@mullvad.net>2025-06-13 16:29:55 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-07-11 13:27:04 +0200
commite56876808283f2e39c9d880ae592624ad1c20bf0 (patch)
tree49d32ebc33c299d33342ebf377e75ec55d3485dc
parent4ee5c4cca8b30118d22cd747cb478d4c54c33680 (diff)
downloadmullvadvpn-e56876808283f2e39c9d880ae592624ad1c20bf0.tar.xz
mullvadvpn-e56876808283f2e39c9d880ae592624ad1c20bf0.zip
Make non-dev version equal to themselves
-rw-r--r--mullvad-version/src/lib.rs12
1 files changed, 11 insertions, 1 deletions
diff --git a/mullvad-version/src/lib.rs b/mullvad-version/src/lib.rs
index f52df40188..99e80e4920 100644
--- a/mullvad-version/src/lib.rs
+++ b/mullvad-version/src/lib.rs
@@ -65,7 +65,8 @@ impl PartialOrd for Version {
let dev_ordering = match (self.is_dev(), other.is_dev()) {
(true, false) => Some(Ordering::Greater),
(false, true) => Some(Ordering::Less),
- (_, _) => None,
+ (false, false) => Some(Ordering::Equal),
+ (true, true) => None,
};
let release_ordering = self
@@ -237,6 +238,15 @@ mod tests {
}
#[test]
+ fn test_version_ordering_and_equality() {
+ let v = parse("2021.3");
+
+ // A version is equal to itself
+ assert_eq!(v, v);
+ assert_eq!(v.partial_cmp(&v), Some(Ordering::Equal));
+ }
+
+ #[test]
fn test_version_ordering_and_equality_dev() {
let v1 = parse("2021.3-dev-abc");
let v2 = parse("2021.3-dev-def");