summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2025-02-11 09:08:16 +0100
committerDavid Lönnhager <david.l@mullvad.net>2025-02-11 09:08:16 +0100
commitab3bd2bcfa26832e014efa7c84bae4c01221a00a (patch)
tree5d9124dbc16d64dc5460f249393e47c7e98073a1
parent98552d4f420ec124b268d3f2147bcd058f60d3c6 (diff)
parent39092c71ef36b9e2b3bcdf7628043a7ea6b3ef75 (diff)
downloadmullvadvpn-ab3bd2bcfa26832e014efa7c84bae4c01221a00a.tar.xz
mullvadvpn-ab3bd2bcfa26832e014efa7c84bae4c01221a00a.zip
Merge branch 'fix-version-display'
-rw-r--r--mullvad-version/src/lib.rs11
1 files changed, 10 insertions, 1 deletions
diff --git a/mullvad-version/src/lib.rs b/mullvad-version/src/lib.rs
index ce493ea1d7..cb9ecde750 100644
--- a/mullvad-version/src/lib.rs
+++ b/mullvad-version/src/lib.rs
@@ -10,6 +10,7 @@ pub const VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/product-versio
#[derive(Debug, Clone, PartialEq)]
pub struct Version {
+ /// The last two digits of the version's year
pub year: String,
pub incremental: String,
/// A version can have an optional pre-stable type, e.g. alpha or beta. If `pre_stable`
@@ -59,7 +60,7 @@ impl Display for Version {
dev,
} = &self;
- write!(f, "{year}.{incremental}")?;
+ write!(f, "20{year}.{incremental}")?;
match pre_stable {
Some(PreStableType::Alpha(version)) => write!(f, "-alpha{version}")?,
@@ -227,4 +228,12 @@ mod tests {
fn test_panics_on_dev_without_commit_hash() {
Version::parse("2021.1-dev");
}
+
+ #[test]
+ fn test_version_display() {
+ let version = "2024.8-beta1-dev-e5483d";
+ let parsed = Version::parse(version);
+
+ assert_eq!(format!("{parsed}"), version);
+ }
}