Llewellyn/starship
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/starship.git synced 2024-12-01 09:13:54 +00:00
Code Issues Releases Activity

fix(haskell): avoid creating .lock files or downloading GHC (#1147)

Browse Source 
* (Haskell) avoid creating .lock files or downloading GHC

* Fix stack command in mock expectations for Haskell module + befriend cargo fmt
This commit is contained in:
Oisín 2020-04-28 09:07:18 +01:00 committed by GitHub
parent 8c17f7b97c
commit 8e8519552f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/haskell.rs
View File

@ -22,7 +22,14 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
let haskell_version = utils::exec_cmd( let haskell_version = utils::exec_cmd(
"stack", "stack",
&["ghc", "--", "--numeric-version", "--no-install-ghc"], &[
"--no-install-ghc",
"--lock-file",
"read-only",
"ghc",
"--",
"--numeric-version",
],
)? )?
.stdout; .stdout;
let formatted_version = Some(format!("v{}", haskell_version.trim()))?; let formatted_version = Some(format!("v{}", haskell_version.trim()))?;

6
src/utils.rs
View File

@ -73,10 +73,12 @@ pub fn exec_cmd(cmd: &str, args: &[&str]) -> Option<CommandOutput> {
stdout: String::from("ruby 2.5.1p57 (2018-03-29 revision 63029) [x86_64-linux-gnu]"), stdout: String::from("ruby 2.5.1p57 (2018-03-29 revision 63029) [x86_64-linux-gnu]"),
stderr: String::default(), stderr: String::default(),
}), }),
"stack ghc -- --numeric-version --no-install-ghc" => Some(CommandOutput { "stack --no-install-ghc --lock-file read-only ghc -- --numeric-version" => {
Some(CommandOutput {
stdout: String::from("8.6.5"), stdout: String::from("8.6.5"),
stderr: String::default(), stderr: String::default(),
}), })
}
"elixir --version" => Some(CommandOutput { "elixir --version" => Some(CommandOutput {
stdout: String::from( stdout: String::from(
"\ "\