From b065758b1c562638a26bb0bdc891ccc2ff8a6cb4 Mon Sep 17 00:00:00 2001 From: Moritz Vetter Date: Wed, 20 Jan 2021 18:49:26 +0100 Subject: [PATCH] perf(elm): Lazy eval elm (#2167) * perf(elm): evaluate version lazily * fix(elm): update format string * fix: use suggested format string Co-authored-by: Moritz Vetter --- docs/config/README.md | 12 ++++++------ src/configs/elm.rs | 2 +- src/modules/elm.rs | 19 ++++++++++--------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/docs/config/README.md b/docs/config/README.md index 1c97e6b1..44a9cf22 100644 --- a/docs/config/README.md +++ b/docs/config/README.md @@ -848,12 +848,12 @@ The module will be shown if any of the following conditions are met: ### Options -| Option | Default | Description | -| ---------- | ---------------------------------- | ----------------------------------------------- | -| `format` | `"via [$symbol$version]($style) "` | The format for the module. | -| `symbol` | `"🌳 "` | A format string representing the symbol of Elm. | -| `style` | `"cyan bold"` | The style for the module. | -| `disabled` | `false` | Disables the `elm` module. | +| Option | Default | Description | +| ---------- | ------------------------------------ | ----------------------------------------------- | +| `format` | `"via [$symbol($version )]($style)"` | The format for the module. | +| `symbol` | `"🌳 "` | A format string representing the symbol of Elm. | +| `style` | `"cyan bold"` | The style for the module. | +| `disabled` | `false` | Disables the `elm` module. | ### Variables diff --git a/src/configs/elm.rs b/src/configs/elm.rs index b88b2ede..17dc3568 100644 --- a/src/configs/elm.rs +++ b/src/configs/elm.rs @@ -13,7 +13,7 @@ pub struct ElmConfig<'a> { impl<'a> RootModuleConfig<'a> for ElmConfig<'a> { fn new() -> Self { ElmConfig { - format: "via [$symbol$version]($style) ", + format: "via [$symbol($version )]($style)", symbol: "🌳 ", style: "cyan bold", disabled: false, diff --git a/src/modules/elm.rs b/src/modules/elm.rs index a7da023b..b4773c46 100644 --- a/src/modules/elm.rs +++ b/src/modules/elm.rs @@ -24,9 +24,6 @@ pub fn module<'a>(context: &'a Context) -> Option> { 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> { _ => 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() }