greg/just
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression in error message color printing (#566)

Browse Source 
Make the word "error" print in red instead of plain text.
This commit is contained in:
Casey Rodarmor 2019-12-12 17:55:55 -08:00 committed by GitHub
parent bb4afe1481
commit fe906a1b6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/error_result_ext.rs
View File

@ -10,7 +10,7 @@ impl<T, E: Error> ErrorResultExt<T> for Result<T, E> {
Ok(ok) => Ok(ok), Ok(ok) => Ok(ok),
Err(error) => { Err(error) => {
if color.stderr().active() { if color.stderr().active() {
eprintln!("{} {:#}", color.error().paint("error:"), error); eprintln!("{}: {:#}", color.stderr().error().paint("error"), error);
} else { } else {
eprintln!("error: {}", error); eprintln!("error: {}", error);
} }

4
tests/integration.rs
View File

@ -970,7 +970,7 @@ test! {
justfile: "b := a\na := `exit 100`\nbar:\n echo '{{`exit 200`}}'", justfile: "b := a\na := `exit 100`\nbar:\n echo '{{`exit 200`}}'",
args: ("--color", "always"), args: ("--color", "always"),
stdout: "", stdout: "",
stderr: "\u{1b}[1;31merror:\u{1b}[0m \u{1b}[1mBacktick failed with exit code 100 stderr: "\u{1b}[1;31merror\u{1b}[0m: \u{1b}[1mBacktick failed with exit code 100
\u{1b}[0m |\n2 | a := `exit 100`\n | \u{1b}[1;31m^^^^^^^^^^\u{1b}[0m\n", \u{1b}[0m |\n2 | a := `exit 100`\n | \u{1b}[1;31m^^^^^^^^^^\u{1b}[0m\n",
status: 100, status: 100,
} }
@ -1008,7 +1008,7 @@ recipe:
@exit 100", @exit 100",
args: ("--color=always"), args: ("--color=always"),
stdout: "", stdout: "",
stderr: "\u{1b}[1;31merror:\u{1b}[0m \u{1b}[1m\ stderr: "\u{1b}[1;31merror\u{1b}[0m: \u{1b}[1m\
Recipe `recipe` failed on line 3 with exit code 100\u{1b}[0m\n", Recipe `recipe` failed on line 3 with exit code 100\u{1b}[0m\n",
status: 100, status: 100,
} }