refactor bin_info -> suite_info

Author: arxanas

nextest-runner/src/list/test_list.rs

@@ -776,8 +776,8 @@ pub struct TestInstance<'a> {
     /// The test binary.
     pub binary: &'a Utf8Path,
 
-    /// Information about the binary.
-    pub bin_info: &'a RustTestSuite<'a>,
+    /// Information about the test suite.
+    pub suite_info: &'a RustTestSuite<'a>,
 
     /// Information about the test.
     pub test_info: &'a RustTestCaseSummary,
@@ -788,21 +788,21 @@ impl<'a> TestInstance<'a> {
     pub(crate) fn new(
         name: &'a (impl AsRef<str> + ?Sized),
         binary: &'a (impl AsRef<Utf8Path> + ?Sized),
-        bin_info: &'a RustTestSuite,
+        suite_info: &'a RustTestSuite,
         test_info: &'a RustTestCaseSummary,
     ) -> Self {
         Self {
             name: name.as_ref(),
             binary: binary.as_ref(),
-            bin_info,
+            suite_info,
             test_info,
         }
     }
 
     /// Return a reasonable key for sorting. This is (binary ID, test name).
     #[inline]
     pub(crate) fn sort_key(&self) -> (&'a str, &'a str) {
-        (&self.bin_info.binary_id, self.name)
+        (&self.suite_info.binary_id, self.name)
     }
 
     /// Creates the command expression for this test instance.
@@ -811,7 +811,7 @@ impl<'a> TestInstance<'a> {
         test_list: &TestList<'_>,
         target_runner: &TargetRunner,
     ) -> std::process::Command {
-        let platform_runner = target_runner.for_build_platform(self.bin_info.build_platform);
+        let platform_runner = target_runner.for_build_platform(self.suite_info.build_platform);
         // TODO: non-rust tests
 
         let mut args = Vec::new();
@@ -833,10 +833,10 @@ impl<'a> TestInstance<'a> {
         make_test_command(
             program,
             args,
-            &self.bin_info.cwd,
-            &self.bin_info.package,
+            &self.suite_info.cwd,
+            &self.suite_info.package,
             test_list.updated_dylib_path(),
-            &self.bin_info.non_test_binaries,
+            &self.suite_info.non_test_binaries,
         )
     }
 }

nextest-runner/src/reporter.rs

@@ -1027,7 +1027,7 @@ impl<'a> TestReporterImpl<'a> {
             writer,
             "{:>width$} ",
             instance
-                .bin_info
+                .suite_info
                 .binary_id
                 .style(self.styles.list_styles.binary_id),
             width = self.binary_id_width

nextest-runner/src/reporter/aggregator.rs

@@ -156,7 +156,7 @@ impl<'cfg> MetadataJunit<'cfg> {
 
                 let mut testcase = TestCase::new(test_instance.name, testcase_status);
                 testcase
-                    .set_classname(&test_instance.bin_info.binary_id)
+                    .set_classname(&test_instance.suite_info.binary_id)
                     .set_timestamp(to_datetime(main_status.start_time))
                     .set_time(main_status.time_taken);
 
@@ -233,8 +233,8 @@ impl<'cfg> MetadataJunit<'cfg> {
 
     fn testsuite_for(&mut self, test_instance: TestInstance<'cfg>) -> &mut TestSuite {
         self.test_suites
-            .entry(&test_instance.bin_info.binary_id)
-            .or_insert_with(|| TestSuite::new(&test_instance.bin_info.binary_id))
+            .entry(&test_instance.suite_info.binary_id)
+            .or_insert_with(|| TestSuite::new(&test_instance.suite_info.binary_id))
     }
 }
 

nextest-runner/src/runner.rs

@@ -310,11 +310,11 @@ impl<'a> TestRunnerInner<'a> {
 
                             let query = TestQuery {
                                 binary_query: BinaryQuery {
-                                    package_id: test_instance.bin_info.package.id(),
-                                    kind: test_instance.bin_info.kind.as_str(),
-                                    binary_name: &test_instance.bin_info.binary_name,
+                                    package_id: test_instance.suite_info.package.id(),
+                                    kind: test_instance.suite_info.kind.as_str(),
+                                    binary_name: &test_instance.suite_info.binary_name,
                                     platform: convert_build_platform(
-                                        test_instance.bin_info.build_platform,
+                                        test_instance.suite_info.build_platform,
                                     ),
                                 },
                                 test_name: test_instance.name,

nextest-runner/tests/integration/basic.rs

@@ -286,7 +286,7 @@ fn test_filter_expr_with_string_filters() -> Result<()> {
             // * first, ignored
             // * then, expression
             // * then, for string
-            let expected_test = get_expected_test(&test.bin_info.binary_id, test.name);
+            let expected_test = get_expected_test(&test.suite_info.binary_id, test.name);
             let reason = if expected_test.status.is_ignored() {
                 MismatchReason::Ignored
             } else {

nextest-runner/tests/integration/fixtures.rs

@@ -374,8 +374,8 @@ pub(crate) fn execute_collect<'a>(
         instance_statuses.insert(
             (test_instance.binary, test_instance.name),
             InstanceValue {
-                binary_id: test_instance.bin_info.binary_id.as_str(),
-                cwd: test_instance.bin_info.cwd.as_path(),
+                binary_id: test_instance.suite_info.binary_id.as_str(),
+                cwd: test_instance.suite_info.cwd.as_path(),
                 status,
             },
         );