diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-03-22 01:07:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-22 01:07:31 +0100 |
| commit | 05ae329524b49e1e443c6aeeaf48456bfa40f049 (patch) | |
| tree | de04f7a549f878b16ce9eb904347c2589cc4b93b /src | |
| parent | 1757cb5871f81f33ae34790a3b30efb68082b1aa (diff) | |
| parent | 796105ef63acdacd9407a7d22f34af18438801e7 (diff) | |
| download | rust-05ae329524b49e1e443c6aeeaf48456bfa40f049.tar.gz rust-05ae329524b49e1e443c6aeeaf48456bfa40f049.zip | |
Rollup merge of #122831 - onur-ozkan:less-verbose-fail-logs, r=clubby789
make failure logs less verbose Resolves #122706 Logs without verbose flag:  Logs with verbose flag:  I decided to exclude command from the log since it's already included in verbose mode. cc ```@Nilstrieb```
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/src/lib.rs | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs index f1edbb5ad8a..d8397ab51de 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs @@ -1009,15 +1009,23 @@ impl Build { let result = if !output.status.success() { if print_error { println!( - "\n\ncommand did not execute successfully: {:?}\n\ - expected success, got: {}\n\n\ - stdout ----\n{}\n\ - stderr ----\n{}\n\n", - command.command, + "\n\nCommand did not execute successfully.\ + \nExpected success, got: {}", output.status, - String::from_utf8_lossy(&output.stdout), - String::from_utf8_lossy(&output.stderr) ); + + if !self.is_verbose() { + println!("Add `-v` to see more details.\n"); + } + + self.verbose(|| { + println!( + "\nSTDOUT ----\n{}\n\ + STDERR ----\n{}\n", + String::from_utf8_lossy(&output.stdout), + String::from_utf8_lossy(&output.stderr) + ) + }); } Err(()) } else { |
