summaryrefslogtreecommitdiffstats
path: root/src/modules/scala.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/scala.rs')
-rw-r--r--src/modules/scala.rs14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/modules/scala.rs b/src/modules/scala.rs
index 16290aeee..b88d56846 100644
--- a/src/modules/scala.rs
+++ b/src/modules/scala.rs
@@ -2,6 +2,7 @@ use crate::configs::scala::ScalaConfig;
use crate::formatter::StringFormatter;
use super::{Context, Module, RootModuleConfig};
+use crate::formatter::VersionFormatter;
pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
let mut module = context.new_module("scala");
@@ -31,7 +32,12 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
.map(|variable| match variable {
"version" => {
let scala_version = get_scala_version(context)?;
- Some(Ok(scala_version))
+ VersionFormatter::format_module_version(
+ module.get_name(),
+ &scala_version,
+ config.version_format,
+ )
+ .map(Ok)
}
_ => None,
})
@@ -67,7 +73,7 @@ fn parse_scala_version(scala_version: &str) -> Option<String> {
// take "2.13.5"
.nth(3)?;
- Some(format!("v{}", &version))
+ Some(version.to_string())
}
#[cfg(test)]
@@ -82,7 +88,7 @@ mod tests {
fn test_parse_scala_version() {
let scala_2_13 =
"Scala compiler version 2.13.5 -- Copyright 2002-2020, LAMP/EPFL and Lightbend, Inc.";
- assert_eq!(parse_scala_version(scala_2_13), Some("v2.13.5".to_string()));
+ assert_eq!(parse_scala_version(scala_2_13), Some("2.13.5".to_string()));
}
#[test]
@@ -90,7 +96,7 @@ mod tests {
let dotty_version = "Scala compiler version 3.0.0-RC1 -- Copyright 2002-2021, LAMP/EPFL";
assert_eq!(
parse_scala_version(dotty_version),
- Some("v3.0.0-RC1".to_string())
+ Some("3.0.0-RC1".to_string())
);
}