compiletest: Make all other modules non-public

All APIs used from outside the compiletest library crate have been isolated to
the `cli` and `rustdoc_gui_test` modules, so no other items need to be publicly
exported.

Author: Zalathar

src/bootstrap/src/core/build_steps/test.rs

@@ -1974,9 +1974,6 @@ HELP: You can add it into `bootstrap.toml` in `rust.codegen-backends = [{name:?}
 }elseif mode == "rustdoc-js"{
 panic!("need nodejs to run rustdoc-js suite");
 }
-ifletSome(ref npm) = builder.config.npm{
- cmd.arg("--npm").arg(npm);
-}
 if builder.config.rust_optimize_tests{
  cmd.arg("--optimize-tests");
 }

src/tools/compiletest/src/common.rs

@@ -631,8 +631,6 @@ pub struct Config {
 
 /// Path to a NodeJS executable. Used for JS doctests, emscripten and WASM tests.
 pubnodejs:Option<String>,
-/// Path to a npm executable. Used for rustdoc GUI tests.
-pubnpm:Option<String>,
 
 /// Whether to rerun tests even if the inputs are unchanged.
 pubforce_rerun:bool,
@@ -721,7 +719,8 @@ impl Config {
 self.target_cfg().abi == abi
 }
 
-pubfnmatches_family(&self,family:&str) -> bool{
+#[cfg_attr(not(test), expect(dead_code, reason = "only used by tests for `ignore-{family}`"))]
+pub(crate)fnmatches_family(&self,family:&str) -> bool{
 self.target_cfg().families.iter().any(|f| f == family)
 }
 

src/tools/compiletest/src/directives.rs

@@ -198,8 +198,6 @@ pub struct TestProps {
 pubfilecheck_flags:Vec<String>,
 /// Don't automatically insert any `--check-cfg` args
 pubno_auto_check_cfg:bool,
-/// Run tests which require enzyme being build
-pubhas_enzyme:bool,
 /// Build and use `minicore` as `core` stub for `no_core` tests in cross-compilation scenarios
 /// that don't otherwise want/need `-Z build-std`.
 pubadd_core_stubs:bool,
@@ -314,7 +312,6 @@ impl TestProps {
 llvm_cov_flags:vec![],
 filecheck_flags:vec![],
 no_auto_check_cfg:false,
-has_enzyme:false,
 add_core_stubs:false,
 core_stubs_compile_flags:vec![],
 dont_require_annotations:Default::default(),

src/tools/compiletest/src/lib.rs

@@ -4,21 +4,21 @@
 mod tests;
 
 pubmod cli;
-pubmod common;
+mod common;
 mod debuggers;
-pubmod diagnostics;
-pubmod directives;
-pubmod edition;
-pubmod errors;
+mod diagnostics;
+mod directives;
+mod edition;
+mod errors;
 mod executor;
 mod json;
 mod output_capture;
 mod panic_hook;
 mod raise_fd_limit;
 mod read2;
-pubmod runtest;
+mod runtest;
 pubmod rustdoc_gui_test;
-pubmod util;
+mod util;
 
 use core::panic;
 use std::collections::HashSet;
@@ -50,7 +50,7 @@ use crate::executor::{CollectedTest, ColorConfig};
 /// 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).
-pubfnparse_config(args:Vec<String>) -> Config{
+fnparse_config(args:Vec<String>) -> Config{
 letmut opts = Options::new();
  opts.reqopt("","compile-lib-path","path to host shared libraries","PATH")
 .reqopt("","run-lib-path","path to target shared libraries","PATH")
@@ -464,7 +464,6 @@ pub fn parse_config(args: Vec<String>) -> Config {
 host_linker: matches.opt_str("host-linker"),
 llvm_components: matches.opt_str("llvm-components").unwrap(),
 nodejs: matches.opt_str("nodejs"),
-npm: matches.opt_str("npm"),
 
 force_rerun: matches.opt_present("force-rerun"),
 
@@ -488,22 +487,15 @@ pub fn parse_config(args: Vec<String>) -> Config {
 }
 }
 
-pubfnopt_str(maybestr:&Option<String>) -> &str{
-match*maybestr {
-None => "(none)",
-Some(ref s) => s,
-}
-}
-
-pubfnopt_str2(maybestr:Option<String>) -> String{
+fnopt_str2(maybestr:Option<String>) -> String{
 match maybestr {
 None => "(none)".to_owned(),
 Some(s) => s,
 }
 }
 
 /// Called by `main` after the config has been parsed.
-pubfnrun_tests(config:Arc<Config>){
+fnrun_tests(config:Arc<Config>){
 debug!(?config,"run_tests");
 
  panic_hook::install_panic_hook();
@@ -641,7 +633,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.
-pub(crate)fncollect_and_make_tests(config:Arc<Config>) -> Vec<CollectedTest>{
+fncollect_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 =
@@ -853,7 +845,7 @@ fn collect_tests_from_dir(
 }
 
 /// Returns true if `file_name` looks like a proper test file name.
-pubfnis_test(file_name:&str) -> bool{
+fnis_test(file_name:&str) -> bool{
 if !file_name.ends_with(".rs"){
 returnfalse;
 }
@@ -1133,7 +1125,7 @@ fn check_for_overlapping_test_paths(found_path_stems: &HashSet<Utf8PathBuf>) {
 }
 }
 
-pubfnearly_config_check(config:&Config){
+fnearly_config_check(config:&Config){
 if !config.has_html_tidy && config.mode == TestMode::Rustdoc{
 warning!("`tidy` (html-tidy.org) is not installed; diffs will not be generated");
 }

src/tools/compiletest/src/rustdoc_gui_test.rs

@@ -125,7 +125,6 @@ fn incomplete_config_for_rustdoc_gui_test() -> Config {
 host_linker:Default::default(),
 llvm_components:Default::default(),
 nodejs:Default::default(),
-npm:Default::default(),
 force_rerun:Default::default(),
 only_modified:Default::default(),
 target_cfgs:Default::default(),

src/tools/compiletest/src/util.rs

@@ -102,7 +102,9 @@ macro_rules! string_enum {
 }
 
 impl $name {
+ #[allow(dead_code)]
  $vis constVARIANTS:&'static[Self] = &[$(Self::$variant,)*];
+ #[allow(dead_code)]
  $vis constSTR_VARIANTS:&'static[&'staticstr] = &[$(Self::$variant.to_str(),)*];
 
  $vis constfn to_str(&self) -> &'staticstr{