test: privatize clitools module

Author: djc

src/test.rs

@@ -26,7 +26,11 @@ use crate::process::TestProcess;
 #[cfg(windows)]
 pub use crate::cli::self_update::{RegistryGuard, RegistryValueId, USER_PATH, get_path};
 
-pub mod clitools;
+mod clitools;
+pub use clitools::{
+    CliTestContext, Config, SanitizedOutput, Scenario, SelfUpdateTestContext, output_release_file,
+    print_command, print_indented, set_current_dist_date,
+};
 pub(crate) mod dist;
 pub(crate) mod mock;
 pub use mock::{MockComponentBuilder, MockFile, MockInstallerBuilder};

tests/suite/cli_exact.rs

@@ -3,8 +3,7 @@
 
 use rustup::for_host;
 use rustup::test::{
-    CROSS_ARCH1, CROSS_ARCH2, MULTI_ARCH1,
-    clitools::{CliTestContext, Scenario, set_current_dist_date},
+    CROSS_ARCH1, CROSS_ARCH2, CliTestContext, MULTI_ARCH1, Scenario, set_current_dist_date,
     this_host_triple,
 };
 

tests/suite/cli_inst_interactive.rs

@@ -5,12 +5,11 @@ use std::io::Write;
 use std::process::Stdio;
 
 use rustup::for_host;
-#[cfg(windows)]
-use rustup::test::{RegistryGuard, USER_PATH};
 use rustup::test::{
-    clitools::{CliTestContext, Config, SanitizedOutput, Scenario, set_current_dist_date},
-    this_host_triple,
+    CliTestContext, Config, SanitizedOutput, Scenario, set_current_dist_date, this_host_triple,
 };
+#[cfg(windows)]
+use rustup::test::{RegistryGuard, USER_PATH};
 use rustup::utils::raw;
 
 fn run_input(config: &Config, args: &[&str], input: &str) -> SanitizedOutput {

tests/suite/cli_misc.rs

@@ -7,9 +7,8 @@ use std::{env::consts::EXE_SUFFIX, path::Path};
 
 use rustup::for_host;
 use rustup::test::{
-    MULTI_ARCH1,
-    clitools::{self, CliTestContext, Config, Scenario, set_current_dist_date},
-    this_host_triple,
+    CliTestContext, Config, MULTI_ARCH1, Scenario, print_command, print_indented,
+    set_current_dist_date, this_host_triple,
 };
 use rustup::utils;
 use rustup::utils::raw::symlink_dir;
@@ -340,9 +339,9 @@ async fn rustup_doesnt_prepend_path_unnecessarily() {
             true
         };
         if !out.ok || !first_then_second(&out.stderr) {
-            clitools::print_command(args, &out);
+            print_command(args, &out);
             println!("expected.ok: true");
-            clitools::print_indented(
+            print_indented(
                 "expected.stderr.first_then",
                 &format!("{} comes before {:?}", first.display(), second),
             );

tests/suite/cli_paths.rs

@@ -12,7 +12,7 @@ mod unix {
     use std::path::PathBuf;
 
     use super::INIT_NONE;
-    use rustup::test::clitools::{CliTestContext, Scenario};
+    use rustup::test::{CliTestContext, Scenario};
     use rustup::utils::raw;
 
     // Let's write a fake .rc which looks vaguely like a real script.
@@ -380,7 +380,7 @@ export PATH="$HOME/apple/bin"
 #[cfg(windows)]
 mod windows {
     use super::INIT_NONE;
-    use rustup::test::mock::clitools::{CliTestContext, Scenario};
+    use rustup::test::{CliTestContext, Scenario};
     use rustup::test::{RegistryGuard, USER_PATH, get_path};
 
     use windows_registry::{HSTRING, Value};

tests/suite/cli_rustup.rs

@@ -6,9 +6,8 @@ use std::{env::consts::EXE_SUFFIX, path::Path};
 
 use rustup::for_host;
 use rustup::test::{
-    CROSS_ARCH1, CROSS_ARCH2, MULTI_ARCH1,
-    clitools::{CliTestContext, Scenario},
-    this_host_triple, topical_doc_data,
+    CROSS_ARCH1, CROSS_ARCH2, CliTestContext, MULTI_ARCH1, Scenario, this_host_triple,
+    topical_doc_data,
 };
 use rustup::utils::raw;
 

tests/suite/cli_self_upd.rs

@@ -13,8 +13,7 @@ use retry::{
     retry,
 };
 use rustup::test::{
-    CROSS_ARCH1, calc_hash,
-    clitools::{CliTestContext, Scenario, SelfUpdateTestContext, output_release_file},
+    CROSS_ARCH1, CliTestContext, Scenario, SelfUpdateTestContext, calc_hash, output_release_file,
     this_host_triple,
 };
 #[cfg(windows)]

tests/suite/cli_v1.rs

@@ -4,7 +4,7 @@
 use std::fs;
 
 use rustup::for_host;
-use rustup::test::clitools::{CliTestContext, Scenario, set_current_dist_date};
+use rustup::test::{CliTestContext, Scenario, set_current_dist_date};
 
 #[tokio::test]
 async fn rustc_no_default_toolchain() {

tests/suite/cli_v2.rs

@@ -8,8 +8,10 @@ use std::path::PathBuf;
 use rustup::dist::TargetTriple;
 use rustup::dist::manifest::Manifest;
 use rustup::for_host;
-use rustup::test::clitools::{CliTestContext, Config, Scenario, set_current_dist_date};
-use rustup::test::{CROSS_ARCH1, CROSS_ARCH2, create_hash, this_host_triple};
+use rustup::test::{
+    CROSS_ARCH1, CROSS_ARCH2, CliTestContext, Config, Scenario, create_hash, set_current_dist_date,
+    this_host_triple,
+};
 
 #[tokio::test]
 async fn rustc_no_default_toolchain() {