diff options
| author | David Lönnhager <david.l@mullvad.net> | 2024-05-03 08:18:04 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2024-05-03 08:23:11 +0200 |
| commit | b9c5501e24ca3957c994ecbc5ed5ebcd1de1cbfd (patch) | |
| tree | cae9bf9581a6fa26d95704d5aa78cb179a6c56b6 | |
| parent | 1fa443ae92f86b8c47775d60e52a75f8ccc2c3d2 (diff) | |
| download | mullvadvpn-b9c5501e24ca3957c994ecbc5ed5ebcd1de1cbfd.tar.xz mullvadvpn-b9c5501e24ca3957c994ecbc5ed5ebcd1de1cbfd.zip | |
Replace ToString impl with Display impl
| -rw-r--r-- | mullvad-types/src/version.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mullvad-types/src/version.rs b/mullvad-types/src/version.rs index 02b47b3dc3..523e995b7f 100644 --- a/mullvad-types/src/version.rs +++ b/mullvad-types/src/version.rs @@ -3,6 +3,7 @@ use jnix::IntoJava; use once_cell::sync::Lazy; use regex::Regex; use serde::{Deserialize, Serialize}; +use std::fmt::{self, Formatter}; use std::{cmp::Ordering, str::FromStr}; static STABLE_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"^(\d{4})\.(\d+)$").unwrap()); @@ -133,18 +134,18 @@ impl PartialOrd for ParsedAppVersion { } } -impl ToString for ParsedAppVersion { - fn to_string(&self) -> String { +impl fmt::Display for ParsedAppVersion { + fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { match self { - Self::Stable(year, version) => format!("{year}.{version}"), + Self::Stable(year, version) => write!(f, "{year}.{version}"), Self::Beta(year, version, beta_version) => { - format!("{year}.{version}-beta{beta_version}") + write!(f, "{year}.{version}-beta{beta_version}") } Self::Dev(year, version, beta_version, hash) => { if let Some(beta_version) = beta_version { - format!("{year}.{version}-beta{beta_version}-dev-{hash}") + write!(f, "{year}.{version}-beta{beta_version}-dev-{hash}") } else { - format!("{year}.{version}-dev-{hash}") + write!(f, "{year}.{version}-dev-{hash}") } } } |
