[nextest-runner] a few renames

Rename `TestReporter` to simply `Reporter`, and `TestReporterImpl` to
`DisplayReporterImpl` (to go with `DisplayReporter`).

Author: sunshowers

cargo-nextest/src/dispatch.rs

@@ -32,8 +32,8 @@ use nextest_runner::{
     redact::Redactor,
     reporter::{
         events::{FinalRunStats, RunStatsFailureKind},
-        highlight_end, structured, FinalStatusLevel, StatusLevel, TestOutputDisplay,
-        TestOutputErrorSlice, TestReporterBuilder,
+        highlight_end, structured, FinalStatusLevel, ReporterBuilder, StatusLevel,
+        TestOutputDisplay, TestOutputErrorSlice,
     },
     reuse_build::{archive_to_file, ArchiveReporter, PathMapper, ReuseBuildInfo},
     runner::{configure_handle_inheritance, TestRunnerBuilder},
@@ -480,7 +480,7 @@ struct RunOpts {
     no_capture: bool,
 
     #[clap(flatten)]
-    reporter_opts: TestReporterOpts,
+    reporter_opts: ReporterOpts,
 
     #[clap(flatten)]
     reuse_build: ReuseBuildOpts,
@@ -942,7 +942,7 @@ enum MessageFormat {
 
 #[derive(Debug, Default, Args)]
 #[command(next_help_heading = "Reporter options")]
-struct TestReporterOpts {
+struct ReporterOpts {
     /// Output stdout and stderr on failure
     #[arg(
         long,
@@ -1021,9 +1021,9 @@ struct TestReporterOpts {
     message_format_version: Option<String>,
 }
 
-impl TestReporterOpts {
-    fn to_builder(&self, no_capture: bool, should_colorize: bool) -> TestReporterBuilder {
-        let mut builder = TestReporterBuilder::default();
+impl ReporterOpts {
+    fn to_builder(&self, no_capture: bool, should_colorize: bool) -> ReporterBuilder {
+        let mut builder = ReporterBuilder::default();
         builder.set_no_capture(no_capture);
         builder.set_colorize(should_colorize);
 
@@ -1720,7 +1720,7 @@ impl App {
         &self,
         no_capture: bool,
         runner_opts: &TestRunnerOpts,
-        reporter_opts: &TestReporterOpts,
+        reporter_opts: &ReporterOpts,
         cli_args: Vec<String>,
         output_writer: &mut OutputWriter,
     ) -> Result<i32> {

nextest-runner/src/reporter/displayer/imp.rs

@@ -111,7 +111,7 @@ impl DisplayReporterBuilder {
         };
 
         DisplayReporter {
-            inner: TestReporterImpl {
+            inner: DisplayReporterImpl {
                 default_filter: self.default_filter,
                 status_levels: StatusLevels {
                     status_level,
@@ -132,7 +132,7 @@ impl DisplayReporterBuilder {
 /// Functionality to report test results to stderr, JUnit, and/or structured,
 /// machine-readable results to stdout
 pub(crate) struct DisplayReporter<'a> {
-    inner: TestReporterImpl<'a>,
+    inner: DisplayReporterImpl<'a>,
     stderr: ReporterStderrImpl<'a>,
 }
 
@@ -207,7 +207,7 @@ impl FinalOutput {
     }
 }
 
-struct TestReporterImpl<'a> {
+struct DisplayReporterImpl<'a> {
     default_filter: CompiledDefaultFilter,
     status_levels: StatusLevels,
     no_capture: bool,
@@ -218,7 +218,7 @@ struct TestReporterImpl<'a> {
     final_outputs: DebugIgnore<Vec<(TestInstance<'a>, FinalOutput)>>,
 }
 
-impl<'a> TestReporterImpl<'a> {
+impl<'a> DisplayReporterImpl<'a> {
     fn write_event_impl(
         &mut self,
         event: &TestEvent<'a>,

nextest-runner/src/reporter/events.rs

@@ -19,8 +19,8 @@ use std::{collections::BTreeMap, fmt, process::ExitStatus, time::Duration};
 
 /// A test event.
 ///
-/// Events are produced by a [`TestRunner`](crate::runner::TestRunner) and consumed by a
-/// [`TestReporter`](crate::reporter::TestReporter).
+/// Events are produced by a [`TestRunner`](crate::runner::TestRunner) and
+/// consumed by a [`Reporter`](crate::reporter::Reporter).
 #[derive(Clone, Debug)]
 pub struct TestEvent<'a> {
     /// The time at which the event was generated, including the offset from UTC.

nextest-runner/src/reporter/imp.rs

@@ -31,7 +31,7 @@ pub enum ReporterStderr<'a> {
 
 /// Test reporter builder.
 #[derive(Debug, Default)]
-pub struct TestReporterBuilder {
+pub struct ReporterBuilder {
     no_capture: bool,
     should_colorize: bool,
     failure_output: Option<TestOutputDisplay>,
@@ -43,7 +43,7 @@ pub struct TestReporterBuilder {
     hide_progress_bar: bool,
 }
 
-impl TestReporterBuilder {
+impl ReporterBuilder {
     /// Sets no-capture mode.
     ///
     /// In this mode, `failure_output` and `success_output` will be ignored, and `status_level`
@@ -97,15 +97,15 @@ impl TestReporterBuilder {
     }
 }
 
-impl TestReporterBuilder {
+impl ReporterBuilder {
     /// Creates a new test reporter.
     pub fn build<'a>(
         &self,
         test_list: &TestList,
         profile: &EvaluatableProfile<'a>,
         output: ReporterStderr<'a>,
         structured_reporter: StructuredReporter<'a>,
-    ) -> TestReporter<'a> {
+    ) -> Reporter<'a> {
         let aggregator = EventAggregator::new(profile);
 
         let status_level = self.status_level.unwrap_or_else(|| profile.status_level());
@@ -128,7 +128,7 @@ impl TestReporterBuilder {
         }
         .build(output);
 
-        TestReporter {
+        Reporter {
             display_reporter,
             structured_reporter,
             metadata_reporter: aggregator,
@@ -137,8 +137,8 @@ impl TestReporterBuilder {
 }
 
 /// Functionality to report test results to stderr, JUnit, and/or structured,
-/// machine-readable results to stdout
-pub struct TestReporter<'a> {
+/// machine-readable results to stdout.
+pub struct Reporter<'a> {
     /// Used to display results to standard error.
     display_reporter: DisplayReporter<'a>,
     /// Used to aggregate events for JUnit reports written to disk
@@ -147,7 +147,7 @@ pub struct TestReporter<'a> {
     structured_reporter: StructuredReporter<'a>,
 }
 
-impl<'a> TestReporter<'a> {
+impl<'a> Reporter<'a> {
     /// Report a test event.
     pub fn report_event(&mut self, event: TestEvent<'a>) -> Result<(), WriteEventError> {
         self.write_event(event)

nextest-runner/src/reporter/mod.rs

@@ -3,7 +3,7 @@
 
 //! Report the results of a test run in human and machine-readable formats.
 //!
-//! The main type here is [`TestReporter`], which is constructed via a [`TestReporterBuilder`].
+//! The main type here is [`Reporter`], which is constructed via a [`ReporterBuilder`].
 
 mod aggregator;
 mod displayer;