Merge pull request #1959 from rust-lang/output

Improve output

1 files changed, 9 insertions, 9 deletions

diff --git a/src/run.rs b/src/run.rs
index a2b6972..cbc9ad7 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -4,20 +4,19 @@ use std::io::{self, Write};
 
 use crate::{
     app_state::{AppState, ExercisesProgress},
+    exercise::OUTPUT_CAPACITY,
     terminal_link::TerminalFileLink,
 };
 
 pub fn run(app_state: &mut AppState) -> Result<()> {
     let exercise = app_state.current_exercise();
-    let output = exercise.run()?;
+    let mut output = Vec::with_capacity(OUTPUT_CAPACITY);
+    let success = exercise.run(&mut output)?;
 
     let mut stdout = io::stdout().lock();
-    stdout.write_all(&output.stdout)?;
-    stdout.write_all(b"\n")?;
-    stdout.write_all(&output.stderr)?;
-    stdout.flush()?;
+    stdout.write_all(&output)?;
 
-    if !output.status.success() {
+    if !success {
         app_state.set_pending(app_state.current_exercise_ind())?;
 
         bail!(
@@ -26,11 +25,12 @@ pub fn run(app_state: &mut AppState) -> Result<()> {
         );
     }
 
-    stdout.write_fmt(format_args!(
-        "{}{}\n",
+    writeln!(
+        stdout,
+        "{}{}",
         "✓ Successfully ran ".green(),
         exercise.path.green(),
-    ))?;
+    )?;
 
     if let Some(solution_path) = app_state.current_solution_path()? {
         println!(