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

perf: evaluate swift version lazily (#2159) 

* perf(swift): evaluate version lazily

* fix(swift): update format string

Co-authored-by: Moritz Vetter <mv@3yourmind.com>
This commit is contained in:
Moritz Vetter 2021-01-19 05:42:28 +01:00 committed by GitHub
parent 45bab3a42c
commit 2391a2863c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/config/README.md
View File

@ -2316,12 +2316,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 for the module. | | `format` | `"via [$symbol($version )]($style)"` | The format for the module. |
| `symbol` | `"🐦 "` | A format string representing the symbol of Swift | | `symbol` | `"🐦 "` | A format string representing the symbol of Swift |
| `style` | `"bold 202"` | The style for the module. | | `style` | `"bold 202"` | The style for the module. |
| `disabled` | `false` | Disables the `swift` module. | | `disabled` | `false` | Disables the `swift` module. |
### Variables ### Variables

2
src/configs/swift.rs
View File

@ -13,7 +13,7 @@ pub struct SwiftConfig<'a> {
impl<'a> RootModuleConfig<'a> for SwiftConfig<'a> { impl<'a> RootModuleConfig<'a> for SwiftConfig<'a> {
fn new() -> Self { fn new() -> Self {
SwiftConfig { SwiftConfig {
format: "via [$symbol$version]($style) ", format: "via [$symbol($version )]($style)",
symbol: "🐦 ", symbol: "🐦 ",
style: "bold 202", style: "bold 202",
disabled: false, disabled: false,

15
src/modules/swift.rs
View File

@ -19,8 +19,6 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
return None; return None;
} }
let swift_version = utils::exec_cmd("swift", &["--version"])?.stdout;
let mut module = context.new_module("swift"); let mut module = context.new_module("swift");
let config: SwiftConfig = SwiftConfig::try_load(module.config); let config: SwiftConfig = SwiftConfig::try_load(module.config);
@ -35,7 +33,10 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
_ => None, _ => None,
}) })
.map(|variable| match variable { .map(|variable| match variable {
"version" => parse_swift_version(&swift_version).map(Ok), "version" => {
let swift_version = utils::exec_cmd("swift", &["--version"])?.stdout;
parse_swift_version(&swift_version).map(Ok)
}
_ => None, _ => None,
}) })
.parse(None) .parse(None)
@ -99,8 +100,8 @@ mod tests {
File::create(dir.path().join("Package.swift"))?.sync_all()?; File::create(dir.path().join("Package.swift"))?.sync_all()?;
let actual = ModuleRenderer::new("swift").path(dir.path()).collect(); let actual = ModuleRenderer::new("swift").path(dir.path()).collect();
let expected = Some(format!( let expected = Some(format!(
"via {} ", "via {}",
Color::Fixed(202).bold().paint("🐦 v5.2.2") Color::Fixed(202).bold().paint("🐦 v5.2.2 ")
)); ));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
@ -112,8 +113,8 @@ mod tests {
File::create(dir.path().join("main.swift"))?.sync_all()?; File::create(dir.path().join("main.swift"))?.sync_all()?;
let actual = ModuleRenderer::new("swift").path(dir.path()).collect(); let actual = ModuleRenderer::new("swift").path(dir.path()).collect();
let expected = Some(format!( let expected = Some(format!(
"via {} ", "via {}",
Color::Fixed(202).bold().paint("🐦 v5.2.2") Color::Fixed(202).bold().paint("🐦 v5.2.2 ")
)); ));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()