Skip to content

Commit d029105

Browse files
committed
Revert "Fix storing of stdout/stderr in bootstrap commands that failed to start"
This reverts commit abd8768.
1 parent e5918e3 commit d029105

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

src/bootstrap/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,7 @@ Executed at: {executed_at}"#,
10591059
\nIt was not possible to execute the command: {e:?}"
10601060
)
10611061
.unwrap();
1062-
CommandOutput::did_not_start(stdout, stderr)
1062+
CommandOutput::did_not_start()
10631063
}
10641064
};
10651065
if !output.is_success() {

src/bootstrap/src/utils/exec.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -231,18 +231,8 @@ pub struct CommandOutput {
231231

232232
impl CommandOutput {
233233
#[must_use]
234-
pub fn did_not_start(stdout: OutputMode, stderr: OutputMode) -> Self {
235-
Self {
236-
status: CommandStatus::DidNotStart,
237-
stdout: match stdout {
238-
OutputMode::Print => None,
239-
OutputMode::Capture => Some(vec![]),
240-
},
241-
stderr: match stderr {
242-
OutputMode::Print => None,
243-
OutputMode::Capture => Some(vec![]),
244-
},
245-
}
234+
pub fn did_not_start() -> Self {
235+
Self { status: CommandStatus::DidNotStart, stdout: None, stderr: None }
246236
}
247237

248238
#[must_use]

0 commit comments

Comments
 (0)