Revert "Make it easier to detect when bootstrap tries to read uncaptured stdout/stderr"

This reverts commit 82d5743.

Author: tgross35

src/bootstrap/src/lib.rs

@@ -1022,9 +1022,7 @@ impl Build {
         let mut message = String::new();
         let output: CommandOutput = match output {
             // Command has succeeded
-            Ok(output) if output.status.success() => {
-                CommandOutput::from_output(output, stdout, stderr)
-            }
+            Ok(output) if output.status.success() => output.into(),
             // Command has started, but then it failed
             Ok(output) => {
                 writeln!(
@@ -1038,7 +1036,7 @@ Executed at: {executed_at}"#,
                 )
                 .unwrap();
 
-                let output: CommandOutput = CommandOutput::from_output(output, stdout, stderr);
+                let output: CommandOutput = output.into();
 
                 // If the output mode is OutputMode::Capture, we can now print the output.
                 // If it is OutputMode::Print, then the output has already been printed to

src/bootstrap/src/utils/exec.rs

@@ -223,31 +223,17 @@ pub fn command<S: AsRef<OsStr>>(program: S) -> BootstrapCommand {
 }
 
 /// Represents the output of an executed process.
+#[allow(unused)]
 pub struct CommandOutput {
     status: CommandStatus,
-    stdout: Option<Vec<u8>>,
-    stderr: Option<Vec<u8>>,
+    stdout: Vec<u8>,
+    stderr: Vec<u8>,
 }
 
 impl CommandOutput {
     #[must_use]
     pub fn did_not_start() -> Self {
-        Self { status: CommandStatus::DidNotStart, stdout: None, stderr: None }
-    }
-
-    #[must_use]
-    pub fn from_output(output: Output, stdout: OutputMode, stderr: OutputMode) -> Self {
-        Self {
-            status: CommandStatus::Finished(output.status),
-            stdout: match stdout {
-                OutputMode::Print => None,
-                OutputMode::Capture => Some(output.stdout),
-            },
-            stderr: match stderr {
-                OutputMode::Print => None,
-                OutputMode::Capture => Some(output.stderr),
-            },
-        }
+        Self { status: CommandStatus::DidNotStart, stdout: vec![], stderr: vec![] }
     }
 
     #[must_use]
@@ -273,10 +259,7 @@ impl CommandOutput {
 
     #[must_use]
     pub fn stdout(&self) -> String {
-        String::from_utf8(
-            self.stdout.clone().expect("Accessing stdout of a command that did not capture stdout"),
-        )
-        .expect("Cannot parse process stdout as UTF-8")
+        String::from_utf8(self.stdout.clone()).expect("Cannot parse process stdout as UTF-8")
     }
 
     #[must_use]
@@ -286,19 +269,26 @@ impl CommandOutput {
 
     #[must_use]
     pub fn stderr(&self) -> String {
-        String::from_utf8(
-            self.stderr.clone().expect("Accessing stderr of a command that did not capture stderr"),
-        )
-        .expect("Cannot parse process stderr as UTF-8")
+        String::from_utf8(self.stderr.clone()).expect("Cannot parse process stderr as UTF-8")
     }
 }
 
 impl Default for CommandOutput {
     fn default() -> Self {
         Self {
             status: CommandStatus::Finished(ExitStatus::default()),
-            stdout: Some(vec![]),
-            stderr: Some(vec![]),
+            stdout: vec![],
+            stderr: vec![],
+        }
+    }
+}
+
+impl From<Output> for CommandOutput {
+    fn from(output: Output) -> Self {
+        Self {
+            status: CommandStatus::Finished(output.status),
+            stdout: output.stdout,
+            stderr: output.stderr,
         }
     }
 }