From 0bd2c99ce8a3df2ae734748a69b4dc7644b5db1c Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume.gomez@huawei.com>
Date: Tue, 18 Jun 2024 22:49:27 +0200
Subject: [PATCH] Only show rustdoc doctest compilation output if `nocapture`
 is used

---
 src/librustdoc/doctest.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/librustdoc/doctest.rs b/src/librustdoc/doctest.rs
index 74adcb415fa..7028666371b 100644
--- a/src/librustdoc/doctest.rs
+++ b/src/librustdoc/doctest.rs
@@ -542,9 +542,11 @@ fn run_test(
             return Err(TestFailure::CompileError);
         }
         compiler.arg(input_file);
-        // FIXME: Remove once done fixing bugs.
-        // FIXME: Should this call only be done if `nocapture` is not set?
-        // compiler.stderr(Stdio::null());
+        if !rustdoc_options.nocapture {
+            // If `nocapture` is disabled, then we don't display rustc's output when compiling
+            // the merged doctests.
+            compiler.stderr(Stdio::null());
+        }
     } else {
         compiler.arg("-");
         compiler.stdin(Stdio::piped());