haskal
/
starship
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

perf(perl): Lazy eval perl (#2189) 

* perf(perl): evaluate version lazily

* fix(perl): update format string; update tests

* refact(perl): run rustfmt

Co-authored-by: Moritz Vetter <mv@3yourmind.com>
This commit is contained in:
Moritz Vetter 2021-01-22 18:07:03 +01:00 committed by GitHub
parent d10a83ce6b
commit 16b8cbfdb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/config/README.md
View File

@ -1929,12 +1929,12 @@ The module will be shown if any of the following conditions are met:
### Options ### Options
| Option | Default | Description | | Option | Default | Description |
| ---------- | ---------------------------------- | ----------------------------------------------------- | | ---------- | ------------------------------------ | ----------------------------------------------------- |
| `format` | `"via [$symbol$version]($style) "` | The format string for the module. | | `format` | `"via [$symbol($version )]($style)"` | The format string for the module. |
| `symbol` | `"🐪 "` | The symbol used before displaying the version of Perl | | `symbol` | `"🐪 "` | The symbol used before displaying the version of Perl |
| `style` | `"bold 149"` | The style for the module. | | `style` | `"bold 149"` | The style for the module. |
| `disabled` | `false` | Disables the `perl` module. | | `disabled` | `false` | Disables the `perl` module. |
### Variables ### Variables

2
src/configs/perl.rs
View File

@ -15,7 +15,7 @@ impl<'a> RootModuleConfig<'a> for PerlConfig<'a> {
PerlConfig { PerlConfig {
symbol: "🐪 ", symbol: "🐪 ",
style: "149 bold", style: "149 bold",
format: "via [$symbol$version]($style) ", format: "via [$symbol($version )]($style)",
disabled: false, disabled: false,
} }
} }

48
src/modules/perl.rs
View File

@ -29,8 +29,6 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
return None; return None;
} }
let perl_version = utils::exec_cmd("perl", &["-e", "printf q#%vd#,$^V;"])?.stdout;
let mut module = context.new_module("perl"); let mut module = context.new_module("perl");
let config: PerlConfig = PerlConfig::try_load(module.config); let config: PerlConfig = PerlConfig::try_load(module.config);
@ -45,7 +43,11 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
_ => None, _ => None,
}) })
.map(|variable| match variable { .map(|variable| match variable {
"version" => Some(Ok(format!("v{}", &perl_version))), "version" => {
let perl_version =
utils::exec_cmd("perl", &["-e", "printf q#%vd#,$^V;"])?.stdout;
Some(Ok(format!("v{}", perl_version)))
}
_ => None, _ => None,
}) })
.parse(None) .parse(None)
@ -88,8 +90,8 @@ mod tests {
let actual = ModuleRenderer::new("perl").path(dir.path()).collect(); let actual = ModuleRenderer::new("perl").path(dir.path()).collect();
let expected = Some(format!( let expected = Some(format!(
"via {} ", "via {}",
Color::Fixed(149).bold().paint("🐪 v5.26.1") Color::Fixed(149).bold().paint("🐪 v5.26.1 ")
)); ));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
@ -103,8 +105,8 @@ mod tests {
let actual = ModuleRenderer::new("perl").path(dir.path()).collect(); let actual = ModuleRenderer::new("perl").path(dir.path()).collect();
let expected = Some(format!( let expected = Some(format!(
"via {} ", "via {}",
Color::Fixed(149).bold().paint("🐪 v5.26.1") Color::Fixed(149).bold().paint("🐪 v5.26.1 ")
)); ));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
@ -118,8 +120,8 @@ mod tests {
let actual = ModuleRenderer::new("perl").path(dir.path()).collect(); let actual = ModuleRenderer::new("perl").path(dir.path()).collect();
let expected = Some(format!( let expected = Some(format!(
"via {} ", "via {}",
Color::Fixed(149).bold().paint("🐪 v5.26.1") Color::Fixed(149).bold().paint("🐪 v5.26.1 ")
)); ));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
@ -133,8 +135,8 @@ mod tests {
let actual = ModuleRenderer::new("perl").path(dir.path()).collect(); let actual = ModuleRenderer::new("perl").path(dir.path()).collect();
let expected = Some(format!( let expected = Some(format!(
"via {} ", "via {}",
Color::Fixed(149).bold().paint("🐪 v5.26.1") Color::Fixed(149).bold().paint("🐪 v5.26.1 ")
)); ));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
@ -148,8 +150,8 @@ mod tests {
let actual = ModuleRenderer::new("perl").path(dir.path()).collect(); let actual = ModuleRenderer::new("perl").path(dir.path()).collect();
let expected = Some(format!( let expected = Some(format!(
"via {} ", "via {}",
Color::Fixed(149).bold().paint("🐪 v5.26.1") Color::Fixed(149).bold().paint("🐪 v5.26.1 ")
)); ));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
@ -163,8 +165,8 @@ mod tests {
let actual = ModuleRenderer::new("perl").path(dir.path()).collect(); let actual = ModuleRenderer::new("perl").path(dir.path()).collect();
let expected = Some(format!( let expected = Some(format!(
"via {} ", "via {}",
Color::Fixed(149).bold().paint("🐪 v5.26.1") Color::Fixed(149).bold().paint("🐪 v5.26.1 ")
)); ));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
@ -178,8 +180,8 @@ mod tests {
let actual = ModuleRenderer::new("perl").path(dir.path()).collect(); let actual = ModuleRenderer::new("perl").path(dir.path()).collect();
let expected = Some(format!( let expected = Some(format!(
"via {} ", "via {}",
Color::Fixed(149).bold().paint("🐪 v5.26.1") Color::Fixed(149).bold().paint("🐪 v5.26.1 ")
)); ));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
@ -193,8 +195,8 @@ mod tests {
let actual = ModuleRenderer::new("perl").path(dir.path()).collect(); let actual = ModuleRenderer::new("perl").path(dir.path()).collect();
let expected = Some(format!( let expected = Some(format!(
"via {} ", "via {}",
Color::Fixed(149).bold().paint("🐪 v5.26.1") Color::Fixed(149).bold().paint("🐪 v5.26.1 ")
)); ));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
@ -208,8 +210,8 @@ mod tests {
let actual = ModuleRenderer::new("perl").path(dir.path()).collect(); let actual = ModuleRenderer::new("perl").path(dir.path()).collect();
let expected = Some(format!( let expected = Some(format!(
"via {} ", "via {}",
Color::Fixed(149).bold().paint("🐪 v5.26.1") Color::Fixed(149).bold().paint("🐪 v5.26.1 ")
)); ));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
@ -223,8 +225,8 @@ mod tests {
let actual = ModuleRenderer::new("perl").path(dir.path()).collect(); let actual = ModuleRenderer::new("perl").path(dir.path()).collect();
let expected = Some(format!( let expected = Some(format!(
"via {} ", "via {}",
Color::Fixed(149).bold().paint("🐪 v5.26.1") Color::Fixed(149).bold().paint("🐪 v5.26.1 ")
)); ));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()