Auto merge of #5762 - dwijnand:test-mod-reorg, r=alexcrichton

Reorganise the testsuite crate module hierarchy

* Collapse the nested cargotest::support module into the cargotest
  module (merge the mod.rs's)
* Rename the cargotest module to support
* Nest the top-level hamcrest module into support

Fixes #5744

I apologise ahead-of-time to the authors of the PRs this is going to break..

tests/testsuite/alt_registry.rs

@@ -1,7 +1,7 @@
-use cargotest::ChannelChanger;
-use cargotest::support::registry::{self, alt_api_path, Package};
-use cargotest::support::{execs, paths, project};
-use hamcrest::assert_that;
+use support::ChannelChanger;
+use support::registry::{self, alt_api_path, Package};
+use support::{execs, paths, project};
+use support::hamcrest::assert_that;
 use std::fs::File;
 use std::io::Write;
 

tests/testsuite/bad_config.rs

@@ -1,6 +1,6 @@
-use cargotest::support::{execs, project};
-use cargotest::support::registry::Package;
-use hamcrest::assert_that;
+use support::{execs, project};
+use support::registry::Package;
+use support::hamcrest::assert_that;
 
 #[test]
 fn bad1() {

tests/testsuite/bad_manifest_path.rs

@@ -1,5 +1,5 @@
-use cargotest::support::{basic_bin_manifest, execs, main_file, project};
-use hamcrest::assert_that;
+use support::{basic_bin_manifest, execs, main_file, project};
+use support::hamcrest::assert_that;
 
 fn assert_not_a_cargo_toml(command: &str, manifest_path_argument: &str) {
     let p = project()

tests/testsuite/bench.rs

@@ -1,10 +1,10 @@
 use std::str;
 
 use cargo::util::process;
-use cargotest::{is_nightly, ChannelChanger};
-use cargotest::support::paths::CargoPathExt;
-use cargotest::support::{basic_bin_manifest, basic_lib_manifest, execs, project};
-use hamcrest::{assert_that, existing_file};
+use support::{is_nightly, ChannelChanger};
+use support::paths::CargoPathExt;
+use support::{basic_bin_manifest, basic_lib_manifest, execs, project};
+use support::hamcrest::{assert_that, existing_file};
 
 #[test]
 fn cargo_bench_simple() {

tests/testsuite/build.rs

@@ -4,13 +4,13 @@ use std::io::prelude::*;
 
 use cargo::util::paths::dylib_path_envvar;
 use cargo::util::{process, ProcessBuilder};
-use cargotest::{is_nightly, rustc_host, sleep_ms};
-use cargotest::support::paths::{root, CargoPathExt};
-use cargotest::support::ProjectBuilder;
-use cargotest::support::{basic_bin_manifest, execs, main_file, project};
-use cargotest::support::registry::Package;
-use cargotest::ChannelChanger;
-use hamcrest::{assert_that, existing_dir, existing_file, is_not};
+use support::{is_nightly, rustc_host, sleep_ms};
+use support::paths::{root, CargoPathExt};
+use support::ProjectBuilder;
+use support::{basic_bin_manifest, execs, main_file, project};
+use support::registry::Package;
+use support::ChannelChanger;
+use support::hamcrest::{assert_that, existing_dir, existing_file, is_not};
 use tempfile;
 
 #[test]

tests/testsuite/build_auth.rs

@@ -6,9 +6,9 @@ use std::thread;
 
 use git2;
 use bufstream::BufStream;
-use cargotest::support::paths;
-use cargotest::support::{execs, project};
-use hamcrest::assert_that;
+use support::paths;
+use support::{execs, project};
+use support::hamcrest::assert_that;
 
 // Test that HTTP auth is offered from `credential.helper`
 #[test]

tests/testsuite/build_lib.rs

@@ -1,5 +1,5 @@
-use cargotest::support::{basic_bin_manifest, execs, project, Project};
-use hamcrest::assert_that;
+use support::{basic_bin_manifest, execs, project, Project};
+use support::hamcrest::assert_that;
 
 fn verbose_output_for_lib(p: &Project) -> String {
     format!(

tests/testsuite/build_plan.rs

@@ -1,6 +1,6 @@
-use cargotest::ChannelChanger;
-use cargotest::support::{basic_bin_manifest, execs, main_file, project};
-use hamcrest::{assert_that, existing_file, is_not};
+use support::ChannelChanger;
+use support::{basic_bin_manifest, execs, main_file, project};
+use support::hamcrest::{assert_that, existing_file, is_not};
 
 #[test]
 fn cargo_build_plan_simple() {

tests/testsuite/build_script.rs

@@ -7,11 +7,11 @@ use std::thread;
 use std::time::Duration;
 
 use cargo::util::paths::remove_dir_all;
-use cargotest::{rustc_host, sleep_ms};
-use cargotest::support::{cross_compile, execs, project};
-use cargotest::support::paths::CargoPathExt;
-use cargotest::support::registry::Package;
-use hamcrest::{assert_that, existing_dir, existing_file};
+use support::{rustc_host, sleep_ms};
+use support::{cross_compile, execs, project};
+use support::paths::CargoPathExt;
+use support::registry::Package;
+use support::hamcrest::{assert_that, existing_dir, existing_file};
 
 #[test]
 fn custom_build_script_failed() {

tests/testsuite/build_script_env.rs

@@ -1,8 +1,8 @@
 use std::fs::File;
 
-use cargotest::sleep_ms;
-use cargotest::support::{execs, project};
-use hamcrest::assert_that;
+use support::sleep_ms;
+use support::{execs, project};
+use support::hamcrest::assert_that;
 
 #[test]
 fn rerun_if_env_changes() {

tests/testsuite/cargo_alias_config.rs

@@ -1,5 +1,5 @@
-use cargotest::support::{basic_bin_manifest, execs, project};
-use hamcrest::assert_that;
+use support::{basic_bin_manifest, execs, project};
+use support::hamcrest::assert_that;
 
 #[test]
 fn alias_incorrect_config_type() {

tests/testsuite/cargo_command.rs

@@ -5,11 +5,11 @@ use std::path::{Path, PathBuf};
 use std::str;
 
 use cargo;
-use cargotest::cargo_process;
-use cargotest::support::paths::{self, CargoPathExt};
-use cargotest::support::registry::Package;
-use cargotest::support::{basic_bin_manifest, cargo_exe, execs, project, Project};
-use hamcrest::{assert_that, existing_file};
+use support::cargo_process;
+use support::paths::{self, CargoPathExt};
+use support::registry::Package;
+use support::{basic_bin_manifest, cargo_exe, execs, project, Project};
+use support::hamcrest::{assert_that, existing_file};
 
 #[cfg_attr(windows, allow(dead_code))]
 enum FakeKind<'a> {

tests/testsuite/cargo_features.rs

@@ -1,6 +1,6 @@
-use cargotest::ChannelChanger;
-use cargotest::support::{execs, project, publish};
-use hamcrest::assert_that;
+use support::ChannelChanger;
+use support::{execs, project, publish};
+use support::hamcrest::assert_that;
 
 #[test]
 fn feature_required() {

tests/testsuite/cfg.rs

@@ -2,10 +2,10 @@ use std::str::FromStr;
 use std::fmt;
 
 use cargo::util::{Cfg, CfgExpr};
-use cargotest::rustc_host;
-use cargotest::support::registry::Package;
-use cargotest::support::{execs, project};
-use hamcrest::assert_that;
+use support::rustc_host;
+use support::registry::Package;
+use support::{execs, project};
+use support::hamcrest::assert_that;
 
 macro_rules! c {
     ($a:ident) => (

tests/testsuite/check.rs

@@ -1,10 +1,10 @@
-use cargotest::install::exe;
-use cargotest::is_nightly;
-use cargotest::support::paths::CargoPathExt;
-use cargotest::support::registry::Package;
-use cargotest::support::{execs, project};
+use support::install::exe;
+use support::is_nightly;
+use support::paths::CargoPathExt;
+use support::registry::Package;
+use support::{execs, project};
 use glob::glob;
-use hamcrest::{assert_that, existing_file, is_not};
+use support::hamcrest::{assert_that, existing_file, is_not};
 
 const SIMPLE_MANIFEST: &str = r#"
 [package]

tests/testsuite/clean.rs

@@ -1,8 +1,8 @@
 use std::env;
 
-use cargotest::support::{basic_bin_manifest, execs, git, main_file, project};
-use cargotest::support::registry::Package;
-use hamcrest::{assert_that, existing_dir, existing_file, is_not};
+use support::{basic_bin_manifest, execs, git, main_file, project};
+use support::registry::Package;
+use support::hamcrest::{assert_that, existing_dir, existing_file, is_not};
 
 #[test]
 fn cargo_clean_simple() {