summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThomas O'Donnell <andytom@users.noreply.github.com>2019-11-20 15:16:07 +0100
committerMatan Kushner <hello@matchai.me>2019-11-20 09:16:07 -0500
commit45d977aa39641f51d8eb3ddb3fa751556eb1b9af (patch)
tree327780a64ec44494e38edb0b22e581e65ccddd91 /src
parent6a45e561fc18529fb67436922adc2653eb5b3237 (diff)
fix: Remove duplicated "v" in package versions (#648)
Diffstat (limited to 'src')
-rw-r--r--src/modules/package.rs17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/modules/package.rs b/src/modules/package.rs
index 2a2580f1e..9a5394d54 100644
--- a/src/modules/package.rs
+++ b/src/modules/package.rs
@@ -72,7 +72,12 @@ fn get_package_version() -> Option<String> {
}
fn format_version(version: &str) -> String {
- format!("v{}", version.replace('"', "").trim())
+ let cleaned = version.replace('"', "").trim().to_string();
+ if cleaned.starts_with('v') {
+ cleaned
+ } else {
+ format!("v{}", cleaned)
+ }
}
#[cfg(test)]
@@ -82,6 +87,16 @@ mod tests {
#[test]
fn test_format_version() {
assert_eq!(format_version("0.1.0"), "v0.1.0");
+ assert_eq!(format_version(" 0.1.0 "), "v0.1.0");
+ assert_eq!(format_version("0.1.0 "), "v0.1.0");
+ assert_eq!(format_version(" 0.1.0"), "v0.1.0");
+ assert_eq!(format_version("\"0.1.0\""), "v0.1.0");
+
+ assert_eq!(format_version("v0.1.0"), "v0.1.0");
+ assert_eq!(format_version(" v0.1.0 "), "v0.1.0");
+ assert_eq!(format_version(" v0.1.0"), "v0.1.0");
+ assert_eq!(format_version("v0.1.0 "), "v0.1.0");
+ assert_eq!(format_version("\"v0.1.0\""), "v0.1.0");
}
#[test]