diff options
Diffstat (limited to 'src/modules/elm.rs')
-rw-r--r-- | src/modules/elm.rs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/modules/elm.rs b/src/modules/elm.rs index a7da023be..b4773c467 100644 --- a/src/modules/elm.rs +++ b/src/modules/elm.rs @@ -24,9 +24,6 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> { return None; } - let elm_version = utils::exec_cmd("elm", &["--version"])?.stdout; - let module_version = Some(format!("v{}", elm_version.trim()))?; - let mut module = context.new_module("elm"); let config: ElmConfig = ElmConfig::try_load(module.config); @@ -41,7 +38,11 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> { _ => None, }) .map(|variable| match variable { - "version" => Some(Ok(&module_version)), + "version" => { + let elm_version = utils::exec_cmd("elm", &["--version"])?.stdout; + let module_version = Some(format!("v{}", elm_version.trim()))?; + Some(Ok(module_version)) + } _ => None, }) .parse(None) @@ -79,7 +80,7 @@ mod tests { let dir = tempfile::tempdir()?; File::create(dir.path().join("elm.json"))?.sync_all()?; let actual = ModuleRenderer::new("elm").path(dir.path()).collect(); - let expected = Some(format!("via {} ", Color::Cyan.bold().paint("🌳 v0.19.1"))); + let expected = Some(format!("via {}", Color::Cyan.bold().paint("🌳 v0.19.1 "))); assert_eq!(expected, actual); dir.close() } @@ -89,7 +90,7 @@ mod tests { let dir = tempfile::tempdir()?; File::create(dir.path().join("elm-package.json"))?.sync_all()?; let actual = ModuleRenderer::new("elm").path(dir.path()).collect(); - let expected = Some(format!("via {} ", Color::Cyan.bold().paint("🌳 v0.19.1"))); + let expected = Some(format!("via {}", Color::Cyan.bold().paint("🌳 v0.19.1 "))); assert_eq!(expected, actual); dir.close() } @@ -99,7 +100,7 @@ mod tests { let dir = tempfile::tempdir()?; File::create(dir.path().join(".elm-version"))?.sync_all()?; let actual = ModuleRenderer::new("elm").path(dir.path()).collect(); - let expected = Some(format!("via {} ", Color::Cyan.bold().paint("🌳 v0.19.1"))); + let expected = Some(format!("via {}", Color::Cyan.bold().paint("🌳 v0.19.1 "))); assert_eq!(expected, actual); dir.close() } @@ -110,7 +111,7 @@ mod tests { let elmstuff = dir.path().join("elm-stuff"); fs::create_dir_all(&elmstuff)?; let actual = ModuleRenderer::new("elm").path(dir.path()).collect(); - let expected = Some(format!("via {} ", Color::Cyan.bold().paint("🌳 v0.19.1"))); + let expected = Some(format!("via {}", Color::Cyan.bold().paint("🌳 v0.19.1 "))); assert_eq!(expected, actual); dir.close() } @@ -120,7 +121,7 @@ mod tests { let dir = tempfile::tempdir()?; File::create(dir.path().join("main.elm"))?.sync_all()?; let actual = ModuleRenderer::new("elm").path(dir.path()).collect(); - let expected = Some(format!("via {} ", Color::Cyan.bold().paint("🌳 v0.19.1"))); + let expected = Some(format!("via {}", Color::Cyan.bold().paint("🌳 v0.19.1 "))); assert_eq!(expected, actual); dir.close() } |