compiletest: make some internals pub for use as a library

Make Config, TestPaths, CollectedTest, CollectedTestDesc, ShouldFail,
FileDirectives, parse_config and collect_and_make_tests public so that
external tools can depend on compiletest as a library and use its test
collection infrastructure directly.

r? jackh726

Author: akintewe

src/tools/compiletest/src/common.rs

@@ -1169,7 +1169,7 @@ pub(crate) fn query_rustc_output(
 
 /// Path information for a single test file.
 #[derive(Debug, Clone)]
-pub(crate) struct TestPaths {
+pub struct TestPaths {
     /// Full path to the test file.
     ///
     /// For example:
@@ -1182,7 +1182,7 @@ pub(crate) struct TestPaths {
     ///
     /// For example:
     /// - `/home/ferris/rust/tests/run-make/emit`
-    pub(crate) file: Utf8PathBuf,
+    pub file: Utf8PathBuf,
 
     /// Subset of the full path that excludes the suite directory and the
     /// test filename. For tests in the root of their test suite directory,
@@ -1191,7 +1191,7 @@ pub(crate) struct TestPaths {
     /// For example:
     /// - `file`: `/home/ferris/rust/tests/ui/warnings/hello-world.rs`
     /// - `relative_dir`: `warnings`
-    pub(crate) relative_dir: Utf8PathBuf,
+    pub relative_dir: Utf8PathBuf,
 }
 
 /// Used by `ui` tests to generate things like `foo.stderr` from `foo.rs`.

src/tools/compiletest/src/directives/file.rs

@@ -3,16 +3,16 @@ use camino::Utf8Path;
 use crate::directives::LineNumber;
 use crate::directives::line::{DirectiveLine, line_directive};
 
-pub(crate) struct FileDirectives<'a> {
-    pub(crate) path: &'a Utf8Path,
-    pub(crate) lines: Vec<DirectiveLine<'a>>,
+pub struct FileDirectives<'a> {
+    pub path: &'a Utf8Path,
+    pub lines: Vec<DirectiveLine<'a>>,
 
     /// Whether the test source file contains an explicit `#![no_std]`/`#![no_core]` attribute.
-    pub(crate) has_explicit_no_std_core_attribute: bool,
+    pub has_explicit_no_std_core_attribute: bool,
 }
 
 impl<'a> FileDirectives<'a> {
-    pub(crate) fn from_file_contents(path: &'a Utf8Path, file_contents: &'a str) -> Self {
+    pub fn from_file_contents(path: &'a Utf8Path, file_contents: &'a str) -> Self {
         let mut lines = vec![];
         let mut has_explicit_no_std_core_attribute = false;
 

src/tools/compiletest/src/executor.rs

@@ -325,26 +325,26 @@ fn get_concurrency() -> usize {
 }
 
 /// Information that was historically needed to create a libtest `TestDescAndFn`.
-pub(crate) struct CollectedTest {
-    pub(crate) desc: CollectedTestDesc,
-    pub(crate) config: Arc<Config>,
-    pub(crate) testpaths: TestPaths,
-    pub(crate) revision: Option<String>,
+pub struct CollectedTest {
+    pub desc: CollectedTestDesc,
+    pub config: Arc<Config>,
+    pub testpaths: TestPaths,
+    pub revision: Option<String>,
 }
 
 /// Information that was historically needed to create a libtest `TestDesc`.
-pub(crate) struct CollectedTestDesc {
-    pub(crate) name: String,
-    pub(crate) filterable_path: Utf8PathBuf,
-    pub(crate) ignore: bool,
-    pub(crate) ignore_message: Option<Cow<'static, str>>,
-    pub(crate) should_fail: ShouldFail,
+pub struct CollectedTestDesc {
+    pub name: String,
+    pub filterable_path: Utf8PathBuf,
+    pub ignore: bool,
+    pub ignore_message: Option<Cow<'static, str>>,
+    pub should_fail: ShouldFail,
 }
 
 /// Tests with `//@ should-fail` are tests of compiletest itself, and should
 /// be reported as successful if and only if they would have _failed_.
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub(crate) enum ShouldFail {
+pub enum ShouldFail {
     No,
     Yes,
 }

src/tools/compiletest/src/lib.rs

@@ -4,10 +4,10 @@
 mod tests;
 
 pub mod cli;
-mod common;
+pub mod common;
 mod debuggers;
 mod diagnostics;
-mod directives;
+pub mod directives;
 mod edition;
 mod errors;
 mod executor;
@@ -49,7 +49,7 @@ use crate::executor::CollectedTest;
 /// The config mostly reflects command-line arguments, but there might also be
 /// some code here that inspects environment variables or even runs executables
 /// (e.g. when discovering debugger versions).
-fn parse_config(args: Vec<String>) -> Config {
+pub fn parse_config(args: Vec<String>) -> Config {
     let mut opts = Options::new();
     opts.reqopt("", "compile-lib-path", "path to host shared libraries", "PATH")
         .reqopt("", "run-lib-path", "path to target shared libraries", "PATH")
@@ -650,7 +650,7 @@ impl TestCollector {
 /// FIXME(Zalathar): Now that we no longer rely on libtest, try to overhaul
 /// test discovery to take into account the filters/tests specified on the
 /// command-line, instead of having to enumerate everything.
-fn collect_and_make_tests(config: Arc<Config>) -> Vec<CollectedTest> {
+pub fn collect_and_make_tests(config: Arc<Config>) -> Vec<CollectedTest> {
     debug!("making tests from {}", config.src_test_suite_root);
     let common_inputs_stamp = common_inputs_stamp(&config);
     let modified_tests =