Reorganise the testsuite crate module hierarchy

[dwijnand]

• 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..

[rust-highfive]

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

[alexcrichton]

🏆

@bors: r+

My hero!

[bors]

📌 Commit 566b4c343a2ca2265ed49437d6f4fc64263ee73d has been approved by alexcrichton

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout test-mod-reorg (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self test-mod-reorg --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging tests/testsuite/support/registry.rs
Auto-merging tests/testsuite/support/publish.rs
Auto-merging tests/testsuite/support/mod.rs
Auto-merging tests/testsuite/support/install.rs
Auto-merging tests/testsuite/support/git.rs
Auto-merging tests/testsuite/support/cross_compile.rs
Auto-merging tests/testsuite/run.rs
Auto-merging tests/testsuite/package.rs
CONFLICT (content): Merge conflict in tests/testsuite/package.rs
Removing tests/testsuite/cargotest/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

[bors]

☔ The latest upstream changes (presumably #5763) made this pull request unmergeable. Please resolve the merge conflicts.

[alexcrichton]

@bors: r+

[bors]

📌 Commit 43b42d6 has been approved by alexcrichton

[bors]

⌛ Testing commit 43b42d6 with merge 6b38295...

[bors]

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 6b38295 to master...