refactor(test): Track 'capture' rather than 'nocapture'

Rather than fixing the wording to match the new flag name,
I switched to positive logic under the assumption people have a harder
time following negative logic.

Author: epage

library/test/src/bench.rs

@@ -193,7 +193,7 @@ pub fn benchmark<F>(
     id: TestId,
     desc: TestDesc,
     monitor_ch: Sender<CompletedTest>,
-    nocapture: bool,
+    capture: bool,
     f: F,
 ) where
     F: FnMut(&mut Bencher) -> Result<(), String>,
@@ -202,7 +202,7 @@ pub fn benchmark<F>(
 
     let data = Arc::new(Mutex::new(Vec::new()));
 
-    if !nocapture {
+    if capture {
         io::set_output_capture(Some(data.clone()));
     }
 

library/test/src/cli.rs

@@ -18,7 +18,7 @@ pub struct TestOpts {
     pub run_tests: bool,
     pub bench_benchmarks: bool,
     pub logfile: Option<PathBuf>,
-    pub nocapture: bool,
+    pub capture: bool,
     pub color: ColorConfig,
     pub format: OutputFormat,
     pub shuffle: bool,
@@ -36,7 +36,7 @@ pub struct TestOpts {
 impl TestOpts {
     pub fn use_color(&self) -> bool {
         match self.color {
-            ColorConfig::AutoColor => !self.nocapture && io::stdout().is_terminal(),
+            ColorConfig::AutoColor => self.capture && io::stdout().is_terminal(),
             ColorConfig::AlwaysColor => true,
             ColorConfig::NeverColor => false,
         }
@@ -274,7 +274,7 @@ fn parse_opts_impl(matches: getopts::Matches) -> OptRes {
     let logfile = get_log_file(&matches)?;
     let run_ignored = get_run_ignored(&matches, include_ignored)?;
     let filters = matches.free.clone();
-    let nocapture = get_nocapture(&matches)?;
+    let capture = get_capture(&matches)?;
     let test_threads = get_test_threads(&matches)?;
     let color = get_color_config(&matches)?;
     let format = get_format(&matches, quiet, allow_unstable)?;
@@ -295,7 +295,7 @@ fn parse_opts_impl(matches: getopts::Matches) -> OptRes {
         run_tests,
         bench_benchmarks,
         logfile,
-        nocapture,
+        capture,
         color,
         format,
         shuffle,
@@ -446,16 +446,16 @@ fn get_color_config(matches: &getopts::Matches) -> OptPartRes<ColorConfig> {
     Ok(color)
 }
 
-fn get_nocapture(matches: &getopts::Matches) -> OptPartRes<bool> {
-    let mut nocapture = matches.opt_present("nocapture");
-    if !nocapture {
-        nocapture = match env::var("RUST_TEST_NOCAPTURE") {
+fn get_capture(matches: &getopts::Matches) -> OptPartRes<bool> {
+    let mut capture = !matches.opt_present("nocapture");
+    if capture {
+        capture = !match env::var("RUST_TEST_NOCAPTURE") {
             Ok(val) => &val != "0",
             Err(_) => false,
         };
     }
 
-    Ok(nocapture)
+    Ok(capture)
 }
 
 fn get_run_ignored(matches: &getopts::Matches, include_ignored: bool) -> OptPartRes<RunIgnored> {

library/test/src/lib.rs

@@ -115,7 +115,7 @@ pub fn test_main(args: &[String], tests: Vec<TestDescAndFn>, options: Option<Opt
             process::exit(ERROR_EXIT_CODE);
         }
     } else {
-        if !opts.nocapture {
+        if opts.capture {
             // If we encounter a non-unwinding panic, flush any captured output from the current test,
             // and stop capturing output to ensure that the non-unwinding panic message is visible.
             // We also acquire the locks for both output streams to prevent output from other threads
@@ -574,15 +574,15 @@ pub fn run_test(
             }
 
             let name = desc.name.clone();
-            let nocapture = opts.nocapture;
+            let capture = opts.capture;
             let time_options = opts.time_options;
             let bench_benchmarks = opts.bench_benchmarks;
 
             let runtest = move || match strategy {
                 RunStrategy::InProcess => run_test_in_process(
                     id,
                     desc,
-                    nocapture,
+                    capture,
                     time_options.is_some(),
                     runnable_test,
                     monitor_ch,
@@ -591,7 +591,7 @@ pub fn run_test(
                 RunStrategy::SpawnPrimary => spawn_test_subprocess(
                     id,
                     desc,
-                    nocapture,
+                    capture,
                     time_options.is_some(),
                     monitor_ch,
                     time_options,
@@ -626,7 +626,7 @@ pub fn run_test(
         }
         Runnable::Bench(runnable_bench) => {
             // Benchmarks aren't expected to panic, so we run them all in-process.
-            runnable_bench.run(id, &desc, &monitor_ch, opts.nocapture);
+            runnable_bench.run(id, &desc, &monitor_ch, opts.capture);
             None
         }
     }
@@ -644,7 +644,7 @@ fn __rust_begin_short_backtrace<T, F: FnOnce() -> T>(f: F) -> T {
 fn run_test_in_process(
     id: TestId,
     desc: TestDesc,
-    nocapture: bool,
+    capture: bool,
     report_time: bool,
     runnable_test: RunnableTest,
     monitor_ch: Sender<CompletedTest>,
@@ -653,7 +653,7 @@ fn run_test_in_process(
     // Buffer for capturing standard I/O
     let data = Arc::new(Mutex::new(Vec::new()));
 
-    if !nocapture {
+    if capture {
         io::set_output_capture(Some(data.clone()));
     }
 
@@ -691,7 +691,7 @@ where
 fn spawn_test_subprocess(
     id: TestId,
     desc: TestDesc,
-    nocapture: bool,
+    capture: bool,
     report_time: bool,
     monitor_ch: Sender<CompletedTest>,
     time_opts: Option<time::TestTimeOptions>,
@@ -706,7 +706,7 @@ fn spawn_test_subprocess(
         if bench_benchmarks {
             command.env(SECONDARY_TEST_BENCH_BENCHMARKS_VAR, "1");
         }
-        if nocapture {
+        if !capture {
             command.stdout(process::Stdio::inherit());
             command.stderr(process::Stdio::inherit());
         }

library/test/src/tests.rs

@@ -24,7 +24,7 @@ impl TestOpts {
             run_tests: false,
             bench_benchmarks: false,
             logfile: None,
-            nocapture: false,
+            capture: true,
             color: AutoColor,
             format: OutputFormat::Pretty,
             shuffle: false,

library/test/src/types.rs

@@ -174,14 +174,14 @@ impl RunnableBench {
         id: TestId,
         desc: &TestDesc,
         monitor_ch: &Sender<CompletedTest>,
-        nocapture: bool,
+        capture: bool,
     ) {
         match self {
             RunnableBench::Static(f) => {
-                crate::bench::benchmark(id, desc.clone(), monitor_ch.clone(), nocapture, f)
+                crate::bench::benchmark(id, desc.clone(), monitor_ch.clone(), capture, f)
             }
             RunnableBench::Dynamic(f) => {
-                crate::bench::benchmark(id, desc.clone(), monitor_ch.clone(), nocapture, f)
+                crate::bench::benchmark(id, desc.clone(), monitor_ch.clone(), capture, f)
             }
         }
     }

src/tools/compiletest/src/lib.rs

@@ -432,7 +432,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
         target_cfgs: OnceLock::new(),
         builtin_cfg_names: OnceLock::new(),
 
-        nocapture: matches.opt_present("no-capture"),
+        capture: !matches.opt_present("no-capture"),
 
         git_repository: matches.opt_str("git-repository").unwrap(),
         nightly_branch: matches.opt_str("nightly-branch").unwrap(),