Make all tests functions and structs crate-private

Author: 0xPoe

tests/cli-exact.rs

@@ -1,7 +1,8 @@
+#![feature(crate_visibility_modifier)]
 //! Yet more cli test cases. These are testing that the output
 //! is exactly as expected.
 
-pub mod mock;
+crate mod mock;
 
 use crate::mock::clitools::{
     self, check_update_setup, expect_err_ex, expect_ok, expect_ok_ex, expect_stdout_ok,

tests/cli-inst-interactive.rs

@@ -1,6 +1,7 @@
+#![feature(crate_visibility_modifier)]
 //! Tests of the interactive console installer
 
-pub mod mock;
+crate mod mock;
 
 use std::env::consts::EXE_SUFFIX;
 use std::io::Write;

tests/cli-misc.rs

@@ -1,7 +1,8 @@
+#![feature(crate_visibility_modifier)]
 //! Test cases of the rustup command that do not depend on the
 //! dist server, mostly derived from multirust/test-v2.sh
 
-pub mod mock;
+crate mod mock;
 
 use std::env::consts::EXE_SUFFIX;
 use std::str;
@@ -16,7 +17,7 @@ use crate::mock::clitools::{
     expect_stderr_ok, expect_stdout_ok, run, set_current_dist_date, Config, Scenario,
 };
 
-pub fn setup(f: &dyn Fn(&mut Config)) {
+crate fn setup(f: &dyn Fn(&mut Config)) {
     clitools::setup(Scenario::SimpleV2, f);
 }
 
@@ -325,7 +326,7 @@ fn rustup_failed_path_search() {
         expect_err(
             config,
             broken,
-            &format!("unknown proxy name: 'fake_proxy'; valid proxy names are 'rustc', 'rustdoc', 'cargo', 'rust-lldb', 'rust-gdb', 'rls', 'cargo-clippy', 'clippy-driver', 'cargo-miri'",),
+            &"unknown proxy name: 'fake_proxy'; valid proxy names are 'rustc', 'rustdoc', 'cargo', 'rust-lldb', 'rust-gdb', 'rls', 'cargo-clippy', 'clippy-driver', 'cargo-miri'".to_string(),
         );
 
         // Hardlink will be automatically cleaned up by test setup code

tests/cli-paths.rs

@@ -1,7 +1,8 @@
+#![feature(crate_visibility_modifier)]
 //! This file contains tests relevant to Rustup's handling of updating PATHs.
 //! It depends on self-update working, so if absolutely everything here breaks,
 //! check those tests as well.
-pub mod mock;
+crate mod mock;
 
 // Prefer omitting actually unpacking content while just testing paths.
 const INIT_NONE: [&str; 4] = ["rustup-init", "-y", "--default-toolchain", "none"];

tests/cli-rustup.rs

@@ -1,6 +1,7 @@
+#![feature(crate_visibility_modifier)]
 //! Test cases for new rustup UI
 
-pub mod mock;
+crate mod mock;
 
 use std::env::consts::EXE_SUFFIX;
 use std::fs;
@@ -21,7 +22,7 @@ macro_rules! for_host_and_home {
     };
 }
 
-pub fn setup(f: &dyn Fn(&Config)) {
+crate fn setup(f: &dyn Fn(&Config)) {
     clitools::setup(Scenario::ArchivesV2, &|config| {
         f(config);
     });

tests/cli-self-upd.rs

@@ -1,6 +1,7 @@
+#![feature(crate_visibility_modifier)]
 //! Testing self install, uninstall and update
 
-pub mod mock;
+crate mod mock;
 
 use std::env;
 use std::env::consts::EXE_SUFFIX;
@@ -24,7 +25,7 @@ use crate::mock::dist::calc_hash;
 
 const TEST_VERSION: &str = "1.1.1";
 
-pub fn update_setup(f: &dyn Fn(&Config, &Path)) {
+crate fn update_setup(f: &dyn Fn(&Config, &Path)) {
     self_update_setup(f, TEST_VERSION)
 }
 

tests/cli-v1.rs

@@ -1,7 +1,8 @@
+#![feature(crate_visibility_modifier)]
 //! Test cases of the rustup command, using v1 manifests, mostly
 //! derived from multirust/test-v2.sh
 
-pub mod mock;
+crate mod mock;
 
 use std::fs;
 
@@ -12,7 +13,7 @@ use crate::mock::clitools::{
     Scenario,
 };
 
-pub fn setup(f: &dyn Fn(&mut Config)) {
+crate fn setup(f: &dyn Fn(&mut Config)) {
     clitools::setup(Scenario::SimpleV1, f);
 }
 

tests/cli-v2.rs

@@ -1,7 +1,8 @@
+#![feature(crate_visibility_modifier)]
 //! Test cases of the rustup command, using v2 manifests, mostly
 //! derived from multirust/test-v2.sh
 
-pub mod mock;
+crate mod mock;
 
 use std::fs;
 use std::io::Write;
@@ -16,11 +17,11 @@ use crate::mock::clitools::{
     expect_stdout_ok, set_current_dist_date, Config, Scenario,
 };
 
-pub fn setup(f: &dyn Fn(&mut Config)) {
+crate fn setup(f: &dyn Fn(&mut Config)) {
     clitools::setup(Scenario::SimpleV2, f);
 }
 
-pub fn setup_complex(f: &dyn Fn(&mut Config)) {
+crate fn setup_complex(f: &dyn Fn(&mut Config)) {
     clitools::setup(Scenario::UnavailableRls, f);
 }
 

tests/dist.rs

@@ -1,7 +1,8 @@
+#![feature(crate_visibility_modifier)]
 // Tests of installation and updates from a v2 Rust distribution
 // server (mocked on the file system)
 
-pub mod mock;
+crate mod mock;
 
 use std::cell::Cell;
 use std::collections::HashMap;
@@ -33,7 +34,7 @@ use crate::mock::{MockComponentBuilder, MockFile, MockInstallerBuilder};
 const SHA256_HASH_LEN: usize = 64;
 
 // Creates a mock dist server populated with some test data
-pub fn create_mock_dist_server(
+crate fn create_mock_dist_server(
     path: &Path,
     edit: Option<&dyn Fn(&str, &mut MockChannel)>,
 ) -> MockDistServer {
@@ -46,7 +47,7 @@ pub fn create_mock_dist_server(
     }
 }
 
-pub fn create_mock_channel(
+crate fn create_mock_channel(
     channel: &str,
     date: &str,
     edit: Option<&dyn Fn(&str, &mut MockChannel)>,

tests/dist_install.rs

@@ -1,4 +1,6 @@
-pub mod mock;
+#![feature(crate_visibility_modifier)]
+
+crate mod mock;
 
 use crate::mock::{MockComponentBuilder, MockFile, MockInstallerBuilder};
 use rustup::dist::component::Components;