diff --git a/tests/testsuite/init/auto_git/in b/tests/testsuite/cargo_init/auto_git/in similarity index 100% rename from tests/testsuite/init/auto_git/in rename to tests/testsuite/cargo_init/auto_git/in diff --git a/tests/testsuite/init/auto_git/mod.rs b/tests/testsuite/cargo_init/auto_git/mod.rs similarity index 100% rename from tests/testsuite/init/auto_git/mod.rs rename to tests/testsuite/cargo_init/auto_git/mod.rs diff --git a/tests/testsuite/init/auto_git/out/.gitignore b/tests/testsuite/cargo_init/auto_git/out/.gitignore similarity index 100% rename from tests/testsuite/init/auto_git/out/.gitignore rename to tests/testsuite/cargo_init/auto_git/out/.gitignore diff --git a/tests/testsuite/init/auto_git/out/Cargo.toml b/tests/testsuite/cargo_init/auto_git/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/auto_git/out/Cargo.toml rename to tests/testsuite/cargo_init/auto_git/out/Cargo.toml diff --git a/tests/testsuite/init/auto_git/out/src/lib.rs b/tests/testsuite/cargo_init/auto_git/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/auto_git/out/src/lib.rs rename to tests/testsuite/cargo_init/auto_git/out/src/lib.rs diff --git a/tests/testsuite/init/auto_git/stderr.log b/tests/testsuite/cargo_init/auto_git/stderr.log similarity index 100% rename from tests/testsuite/init/auto_git/stderr.log rename to tests/testsuite/cargo_init/auto_git/stderr.log diff --git a/tests/testsuite/init/auto_git/stdout.log b/tests/testsuite/cargo_init/auto_git/stdout.log similarity index 100% rename from tests/testsuite/init/auto_git/stdout.log rename to tests/testsuite/cargo_init/auto_git/stdout.log diff --git a/tests/testsuite/init/bin_already_exists_explicit/in/src/main.rs b/tests/testsuite/cargo_init/bin_already_exists_explicit/in/src/main.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_explicit/in/src/main.rs rename to tests/testsuite/cargo_init/bin_already_exists_explicit/in/src/main.rs diff --git a/tests/testsuite/init/bin_already_exists_explicit/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_explicit/mod.rs rename to tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs diff --git a/tests/testsuite/init/bin_already_exists_explicit/out/Cargo.toml b/tests/testsuite/cargo_init/bin_already_exists_explicit/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/bin_already_exists_explicit/out/Cargo.toml rename to tests/testsuite/cargo_init/bin_already_exists_explicit/out/Cargo.toml diff --git a/tests/testsuite/init/bin_already_exists_explicit/out/src/main.rs b/tests/testsuite/cargo_init/bin_already_exists_explicit/out/src/main.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_explicit/out/src/main.rs rename to tests/testsuite/cargo_init/bin_already_exists_explicit/out/src/main.rs diff --git a/tests/testsuite/init/bin_already_exists_explicit/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.log similarity index 100% rename from tests/testsuite/init/bin_already_exists_explicit/stderr.log rename to tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.log diff --git a/tests/testsuite/init/bin_already_exists_explicit/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_explicit/stdout.log similarity index 100% rename from tests/testsuite/init/bin_already_exists_explicit/stdout.log rename to tests/testsuite/cargo_init/bin_already_exists_explicit/stdout.log diff --git a/tests/testsuite/init/bin_already_exists_explicit_nosrc/in/main.rs b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/in/main.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_explicit_nosrc/in/main.rs rename to tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/in/main.rs diff --git a/tests/testsuite/init/bin_already_exists_explicit_nosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_explicit_nosrc/mod.rs rename to tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs diff --git a/tests/testsuite/init/bin_already_exists_explicit_nosrc/out/Cargo.toml b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/bin_already_exists_explicit_nosrc/out/Cargo.toml rename to tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/out/Cargo.toml diff --git a/tests/testsuite/init/bin_already_exists_explicit_nosrc/out/main.rs b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/out/main.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_explicit_nosrc/out/main.rs rename to tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/out/main.rs diff --git a/tests/testsuite/init/bin_already_exists_explicit_nosrc/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.log similarity index 100% rename from tests/testsuite/init/bin_already_exists_explicit_nosrc/stderr.log rename to tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.log diff --git a/tests/testsuite/init/bin_already_exists_explicit_nosrc/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stdout.log similarity index 100% rename from tests/testsuite/init/bin_already_exists_explicit_nosrc/stdout.log rename to tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stdout.log diff --git a/tests/testsuite/init/bin_already_exists_implicit/in/src/main.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit/in/src/main.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit/in/src/main.rs rename to tests/testsuite/cargo_init/bin_already_exists_implicit/in/src/main.rs diff --git a/tests/testsuite/init/bin_already_exists_implicit/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit/mod.rs rename to tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs diff --git a/tests/testsuite/init/bin_already_exists_implicit/out/Cargo.toml b/tests/testsuite/cargo_init/bin_already_exists_implicit/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit/out/Cargo.toml rename to tests/testsuite/cargo_init/bin_already_exists_implicit/out/Cargo.toml diff --git a/tests/testsuite/init/bin_already_exists_implicit/out/src/main.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit/out/src/main.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit/out/src/main.rs rename to tests/testsuite/cargo_init/bin_already_exists_implicit/out/src/main.rs diff --git a/tests/testsuite/init/bin_already_exists_implicit/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.log similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit/stderr.log rename to tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.log diff --git a/tests/testsuite/init/bin_already_exists_implicit/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_implicit/stdout.log similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit/stdout.log rename to tests/testsuite/cargo_init/bin_already_exists_implicit/stdout.log diff --git a/tests/testsuite/init/bin_already_exists_implicit_namenosrc/in/case.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/in/case.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_namenosrc/in/case.rs rename to tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/in/case.rs diff --git a/tests/testsuite/init/bin_already_exists_implicit_namenosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_namenosrc/mod.rs rename to tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs diff --git a/tests/testsuite/init/bin_already_exists_implicit_namenosrc/out/Cargo.toml b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_namenosrc/out/Cargo.toml rename to tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/out/Cargo.toml diff --git a/tests/testsuite/init/bin_already_exists_implicit_namenosrc/out/case.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/out/case.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_namenosrc/out/case.rs rename to tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/out/case.rs diff --git a/tests/testsuite/init/bin_already_exists_implicit_namenosrc/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.log similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_namenosrc/stderr.log rename to tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.log diff --git a/tests/testsuite/init/bin_already_exists_implicit_namenosrc/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stdout.log similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_namenosrc/stdout.log rename to tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stdout.log diff --git a/tests/testsuite/init/bin_already_exists_implicit_namesrc/in/src/case.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/in/src/case.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_namesrc/in/src/case.rs rename to tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/in/src/case.rs diff --git a/tests/testsuite/init/bin_already_exists_implicit_namesrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_namesrc/mod.rs rename to tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs diff --git a/tests/testsuite/init/bin_already_exists_implicit_namesrc/out/Cargo.toml b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_namesrc/out/Cargo.toml rename to tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/out/Cargo.toml diff --git a/tests/testsuite/init/bin_already_exists_implicit_namesrc/out/src/case.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/out/src/case.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_namesrc/out/src/case.rs rename to tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/out/src/case.rs diff --git a/tests/testsuite/init/bin_already_exists_implicit_namesrc/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.log similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_namesrc/stderr.log rename to tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.log diff --git a/tests/testsuite/init/bin_already_exists_implicit_namesrc/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stdout.log similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_namesrc/stdout.log rename to tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stdout.log diff --git a/tests/testsuite/init/bin_already_exists_implicit_nosrc/in/main.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/in/main.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_nosrc/in/main.rs rename to tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/in/main.rs diff --git a/tests/testsuite/init/bin_already_exists_implicit_nosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_nosrc/mod.rs rename to tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs diff --git a/tests/testsuite/init/bin_already_exists_implicit_nosrc/out/Cargo.toml b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_nosrc/out/Cargo.toml rename to tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/out/Cargo.toml diff --git a/tests/testsuite/init/bin_already_exists_implicit_nosrc/out/main.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/out/main.rs similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_nosrc/out/main.rs rename to tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/out/main.rs diff --git a/tests/testsuite/init/bin_already_exists_implicit_nosrc/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.log similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_nosrc/stderr.log rename to tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.log diff --git a/tests/testsuite/init/bin_already_exists_implicit_nosrc/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stdout.log similarity index 100% rename from tests/testsuite/init/bin_already_exists_implicit_nosrc/stdout.log rename to tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stdout.log diff --git a/tests/testsuite/init/both_lib_and_bin/mod.rs b/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs similarity index 100% rename from tests/testsuite/init/both_lib_and_bin/mod.rs rename to tests/testsuite/cargo_init/both_lib_and_bin/mod.rs diff --git a/tests/testsuite/init/both_lib_and_bin/stderr.log b/tests/testsuite/cargo_init/both_lib_and_bin/stderr.log similarity index 100% rename from tests/testsuite/init/both_lib_and_bin/stderr.log rename to tests/testsuite/cargo_init/both_lib_and_bin/stderr.log diff --git a/tests/testsuite/init/both_lib_and_bin/stdout.log b/tests/testsuite/cargo_init/both_lib_and_bin/stdout.log similarity index 100% rename from tests/testsuite/init/both_lib_and_bin/stdout.log rename to tests/testsuite/cargo_init/both_lib_and_bin/stdout.log diff --git a/tests/testsuite/init/cant_create_library_when_both_binlib_present/in/case.rs b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/in/case.rs similarity index 100% rename from tests/testsuite/init/cant_create_library_when_both_binlib_present/in/case.rs rename to tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/in/case.rs diff --git a/tests/testsuite/init/cant_create_library_when_both_binlib_present/in/lib.rs b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/in/lib.rs similarity index 100% rename from tests/testsuite/init/cant_create_library_when_both_binlib_present/in/lib.rs rename to tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/in/lib.rs diff --git a/tests/testsuite/init/cant_create_library_when_both_binlib_present/mod.rs b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs similarity index 100% rename from tests/testsuite/init/cant_create_library_when_both_binlib_present/mod.rs rename to tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs diff --git a/tests/testsuite/init/cant_create_library_when_both_binlib_present/stderr.log b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.log similarity index 100% rename from tests/testsuite/init/cant_create_library_when_both_binlib_present/stderr.log rename to tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.log diff --git a/tests/testsuite/init/cant_create_library_when_both_binlib_present/stdout.log b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stdout.log similarity index 100% rename from tests/testsuite/init/cant_create_library_when_both_binlib_present/stdout.log rename to tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stdout.log diff --git a/tests/testsuite/init/confused_by_multiple_lib_files/in/lib.rs b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/in/lib.rs similarity index 100% rename from tests/testsuite/init/confused_by_multiple_lib_files/in/lib.rs rename to tests/testsuite/cargo_init/confused_by_multiple_lib_files/in/lib.rs diff --git a/tests/testsuite/init/confused_by_multiple_lib_files/in/src/lib.rs b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/in/src/lib.rs similarity index 100% rename from tests/testsuite/init/confused_by_multiple_lib_files/in/src/lib.rs rename to tests/testsuite/cargo_init/confused_by_multiple_lib_files/in/src/lib.rs diff --git a/tests/testsuite/init/confused_by_multiple_lib_files/mod.rs b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs similarity index 100% rename from tests/testsuite/init/confused_by_multiple_lib_files/mod.rs rename to tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs diff --git a/tests/testsuite/init/confused_by_multiple_lib_files/out/lib.rs b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/out/lib.rs similarity index 100% rename from tests/testsuite/init/confused_by_multiple_lib_files/out/lib.rs rename to tests/testsuite/cargo_init/confused_by_multiple_lib_files/out/lib.rs diff --git a/tests/testsuite/init/confused_by_multiple_lib_files/out/src/lib.rs b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/confused_by_multiple_lib_files/out/src/lib.rs rename to tests/testsuite/cargo_init/confused_by_multiple_lib_files/out/src/lib.rs diff --git a/tests/testsuite/init/confused_by_multiple_lib_files/stderr.log b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.log similarity index 100% rename from tests/testsuite/init/confused_by_multiple_lib_files/stderr.log rename to tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.log diff --git a/tests/testsuite/init/confused_by_multiple_lib_files/stdout.log b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stdout.log similarity index 100% rename from tests/testsuite/init/confused_by_multiple_lib_files/stdout.log rename to tests/testsuite/cargo_init/confused_by_multiple_lib_files/stdout.log diff --git a/tests/testsuite/init/creates_binary_when_both_binlib_present/in/case.rs b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/in/case.rs similarity index 100% rename from tests/testsuite/init/creates_binary_when_both_binlib_present/in/case.rs rename to tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/in/case.rs diff --git a/tests/testsuite/init/creates_binary_when_both_binlib_present/in/lib.rs b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/in/lib.rs similarity index 100% rename from tests/testsuite/init/creates_binary_when_both_binlib_present/in/lib.rs rename to tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/in/lib.rs diff --git a/tests/testsuite/init/creates_binary_when_both_binlib_present/mod.rs b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs similarity index 100% rename from tests/testsuite/init/creates_binary_when_both_binlib_present/mod.rs rename to tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs diff --git a/tests/testsuite/init/creates_binary_when_both_binlib_present/out/Cargo.toml b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/creates_binary_when_both_binlib_present/out/Cargo.toml rename to tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/out/Cargo.toml diff --git a/tests/testsuite/init/creates_binary_when_both_binlib_present/out/case.rs b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/out/case.rs similarity index 100% rename from tests/testsuite/init/creates_binary_when_both_binlib_present/out/case.rs rename to tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/out/case.rs diff --git a/tests/testsuite/init/creates_binary_when_both_binlib_present/out/lib.rs b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/out/lib.rs similarity index 100% rename from tests/testsuite/init/creates_binary_when_both_binlib_present/out/lib.rs rename to tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/out/lib.rs diff --git a/tests/testsuite/init/creates_binary_when_both_binlib_present/stderr.log b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.log similarity index 100% rename from tests/testsuite/init/creates_binary_when_both_binlib_present/stderr.log rename to tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.log diff --git a/tests/testsuite/init/creates_binary_when_both_binlib_present/stdout.log b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stdout.log similarity index 100% rename from tests/testsuite/init/creates_binary_when_both_binlib_present/stdout.log rename to tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stdout.log diff --git a/tests/testsuite/init/creates_binary_when_instructed_and_has_lib_file/in/case.rs b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/in/case.rs similarity index 100% rename from tests/testsuite/init/creates_binary_when_instructed_and_has_lib_file/in/case.rs rename to tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/in/case.rs diff --git a/tests/testsuite/init/creates_binary_when_instructed_and_has_lib_file/mod.rs b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/mod.rs similarity index 100% rename from tests/testsuite/init/creates_binary_when_instructed_and_has_lib_file/mod.rs rename to tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/mod.rs diff --git a/tests/testsuite/init/creates_binary_when_instructed_and_has_lib_file/out/Cargo.toml b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/creates_binary_when_instructed_and_has_lib_file/out/Cargo.toml rename to tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/out/Cargo.toml diff --git a/tests/testsuite/init/creates_binary_when_instructed_and_has_lib_file/out/case.rs b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/out/case.rs similarity index 100% rename from tests/testsuite/init/creates_binary_when_instructed_and_has_lib_file/out/case.rs rename to tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/out/case.rs diff --git a/tests/testsuite/init/creates_binary_when_instructed_and_has_lib_file/stderr.log b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.log similarity index 100% rename from tests/testsuite/init/creates_binary_when_instructed_and_has_lib_file/stderr.log rename to tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.log diff --git a/tests/testsuite/init/creates_binary_when_instructed_and_has_lib_file/stdout.log b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stdout.log similarity index 100% rename from tests/testsuite/init/creates_binary_when_instructed_and_has_lib_file/stdout.log rename to tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stdout.log diff --git a/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/in/case.rs b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/in/case.rs similarity index 100% rename from tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/in/case.rs rename to tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/in/case.rs diff --git a/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/mod.rs b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/mod.rs similarity index 100% rename from tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/mod.rs rename to tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/mod.rs diff --git a/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/out/Cargo.toml b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/out/Cargo.toml rename to tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/out/Cargo.toml diff --git a/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/out/case.rs b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/out/case.rs similarity index 100% rename from tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/out/case.rs rename to tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/out/case.rs diff --git a/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/stderr.log b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.log similarity index 100% rename from tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/stderr.log rename to tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.log diff --git a/tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/stdout.log b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stdout.log similarity index 100% rename from tests/testsuite/init/creates_library_when_instructed_and_has_bin_file/stdout.log rename to tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stdout.log diff --git a/tests/testsuite/init/empty_dir/.keep b/tests/testsuite/cargo_init/empty_dir/.keep similarity index 100% rename from tests/testsuite/init/empty_dir/.keep rename to tests/testsuite/cargo_init/empty_dir/.keep diff --git a/tests/testsuite/init/empty_dir/mod.rs b/tests/testsuite/cargo_init/empty_dir/mod.rs similarity index 100% rename from tests/testsuite/init/empty_dir/mod.rs rename to tests/testsuite/cargo_init/empty_dir/mod.rs diff --git a/tests/testsuite/init/explicit_bin_with_git/in b/tests/testsuite/cargo_init/explicit_bin_with_git/in similarity index 100% rename from tests/testsuite/init/explicit_bin_with_git/in rename to tests/testsuite/cargo_init/explicit_bin_with_git/in diff --git a/tests/testsuite/init/explicit_bin_with_git/mod.rs b/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs similarity index 100% rename from tests/testsuite/init/explicit_bin_with_git/mod.rs rename to tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs diff --git a/tests/testsuite/init/explicit_bin_with_git/out/.gitignore b/tests/testsuite/cargo_init/explicit_bin_with_git/out/.gitignore similarity index 100% rename from tests/testsuite/init/explicit_bin_with_git/out/.gitignore rename to tests/testsuite/cargo_init/explicit_bin_with_git/out/.gitignore diff --git a/tests/testsuite/init/explicit_bin_with_git/out/Cargo.toml b/tests/testsuite/cargo_init/explicit_bin_with_git/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/explicit_bin_with_git/out/Cargo.toml rename to tests/testsuite/cargo_init/explicit_bin_with_git/out/Cargo.toml diff --git a/tests/testsuite/init/explicit_bin_with_git/out/src/main.rs b/tests/testsuite/cargo_init/explicit_bin_with_git/out/src/main.rs similarity index 100% rename from tests/testsuite/init/explicit_bin_with_git/out/src/main.rs rename to tests/testsuite/cargo_init/explicit_bin_with_git/out/src/main.rs diff --git a/tests/testsuite/init/explicit_bin_with_git/stderr.log b/tests/testsuite/cargo_init/explicit_bin_with_git/stderr.log similarity index 100% rename from tests/testsuite/init/explicit_bin_with_git/stderr.log rename to tests/testsuite/cargo_init/explicit_bin_with_git/stderr.log diff --git a/tests/testsuite/init/explicit_bin_with_git/stdout.log b/tests/testsuite/cargo_init/explicit_bin_with_git/stdout.log similarity index 100% rename from tests/testsuite/init/explicit_bin_with_git/stdout.log rename to tests/testsuite/cargo_init/explicit_bin_with_git/stdout.log diff --git a/tests/testsuite/init/formats_source/in/rustfmt.toml b/tests/testsuite/cargo_init/formats_source/in/rustfmt.toml similarity index 100% rename from tests/testsuite/init/formats_source/in/rustfmt.toml rename to tests/testsuite/cargo_init/formats_source/in/rustfmt.toml diff --git a/tests/testsuite/init/formats_source/mod.rs b/tests/testsuite/cargo_init/formats_source/mod.rs similarity index 100% rename from tests/testsuite/init/formats_source/mod.rs rename to tests/testsuite/cargo_init/formats_source/mod.rs diff --git a/tests/testsuite/init/formats_source/out/Cargo.toml b/tests/testsuite/cargo_init/formats_source/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/formats_source/out/Cargo.toml rename to tests/testsuite/cargo_init/formats_source/out/Cargo.toml diff --git a/tests/testsuite/init/formats_source/out/rustfmt.toml b/tests/testsuite/cargo_init/formats_source/out/rustfmt.toml similarity index 100% rename from tests/testsuite/init/formats_source/out/rustfmt.toml rename to tests/testsuite/cargo_init/formats_source/out/rustfmt.toml diff --git a/tests/testsuite/init/formats_source/out/src/lib.rs b/tests/testsuite/cargo_init/formats_source/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/formats_source/out/src/lib.rs rename to tests/testsuite/cargo_init/formats_source/out/src/lib.rs diff --git a/tests/testsuite/init/formats_source/stderr.log b/tests/testsuite/cargo_init/formats_source/stderr.log similarity index 100% rename from tests/testsuite/init/formats_source/stderr.log rename to tests/testsuite/cargo_init/formats_source/stderr.log diff --git a/tests/testsuite/init/formats_source/stdout.log b/tests/testsuite/cargo_init/formats_source/stdout.log similarity index 100% rename from tests/testsuite/init/formats_source/stdout.log rename to tests/testsuite/cargo_init/formats_source/stdout.log diff --git a/tests/testsuite/init/fossil_autodetect/in/.fossil/.keep b/tests/testsuite/cargo_init/fossil_autodetect/in/.fossil/.keep similarity index 100% rename from tests/testsuite/init/fossil_autodetect/in/.fossil/.keep rename to tests/testsuite/cargo_init/fossil_autodetect/in/.fossil/.keep diff --git a/tests/testsuite/init/fossil_autodetect/mod.rs b/tests/testsuite/cargo_init/fossil_autodetect/mod.rs similarity index 100% rename from tests/testsuite/init/fossil_autodetect/mod.rs rename to tests/testsuite/cargo_init/fossil_autodetect/mod.rs diff --git a/tests/testsuite/init/fossil_autodetect/out/.fossil-settings/clean-glob b/tests/testsuite/cargo_init/fossil_autodetect/out/.fossil-settings/clean-glob similarity index 100% rename from tests/testsuite/init/fossil_autodetect/out/.fossil-settings/clean-glob rename to tests/testsuite/cargo_init/fossil_autodetect/out/.fossil-settings/clean-glob diff --git a/tests/testsuite/init/fossil_autodetect/out/.fossil-settings/ignore-glob b/tests/testsuite/cargo_init/fossil_autodetect/out/.fossil-settings/ignore-glob similarity index 100% rename from tests/testsuite/init/fossil_autodetect/out/.fossil-settings/ignore-glob rename to tests/testsuite/cargo_init/fossil_autodetect/out/.fossil-settings/ignore-glob diff --git a/tests/testsuite/init/fossil_autodetect/out/Cargo.toml b/tests/testsuite/cargo_init/fossil_autodetect/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/fossil_autodetect/out/Cargo.toml rename to tests/testsuite/cargo_init/fossil_autodetect/out/Cargo.toml diff --git a/tests/testsuite/init/fossil_autodetect/out/src/lib.rs b/tests/testsuite/cargo_init/fossil_autodetect/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/fossil_autodetect/out/src/lib.rs rename to tests/testsuite/cargo_init/fossil_autodetect/out/src/lib.rs diff --git a/tests/testsuite/init/fossil_autodetect/stderr.log b/tests/testsuite/cargo_init/fossil_autodetect/stderr.log similarity index 100% rename from tests/testsuite/init/fossil_autodetect/stderr.log rename to tests/testsuite/cargo_init/fossil_autodetect/stderr.log diff --git a/tests/testsuite/init/fossil_autodetect/stdout.log b/tests/testsuite/cargo_init/fossil_autodetect/stdout.log similarity index 100% rename from tests/testsuite/init/fossil_autodetect/stdout.log rename to tests/testsuite/cargo_init/fossil_autodetect/stdout.log diff --git a/tests/testsuite/init/git_autodetect/mod.rs b/tests/testsuite/cargo_init/git_autodetect/mod.rs similarity index 100% rename from tests/testsuite/init/git_autodetect/mod.rs rename to tests/testsuite/cargo_init/git_autodetect/mod.rs diff --git a/tests/testsuite/init/git_autodetect/out/.gitignore b/tests/testsuite/cargo_init/git_autodetect/out/.gitignore similarity index 100% rename from tests/testsuite/init/git_autodetect/out/.gitignore rename to tests/testsuite/cargo_init/git_autodetect/out/.gitignore diff --git a/tests/testsuite/init/git_autodetect/out/Cargo.toml b/tests/testsuite/cargo_init/git_autodetect/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/git_autodetect/out/Cargo.toml rename to tests/testsuite/cargo_init/git_autodetect/out/Cargo.toml diff --git a/tests/testsuite/init/git_autodetect/out/src/lib.rs b/tests/testsuite/cargo_init/git_autodetect/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/git_autodetect/out/src/lib.rs rename to tests/testsuite/cargo_init/git_autodetect/out/src/lib.rs diff --git a/tests/testsuite/init/git_autodetect/stderr.log b/tests/testsuite/cargo_init/git_autodetect/stderr.log similarity index 100% rename from tests/testsuite/init/git_autodetect/stderr.log rename to tests/testsuite/cargo_init/git_autodetect/stderr.log diff --git a/tests/testsuite/init/git_autodetect/stdout.log b/tests/testsuite/cargo_init/git_autodetect/stdout.log similarity index 100% rename from tests/testsuite/init/git_autodetect/stdout.log rename to tests/testsuite/cargo_init/git_autodetect/stdout.log diff --git a/tests/testsuite/init/git_ignore_exists_no_conflicting_entries/in/.gitignore b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/in/.gitignore similarity index 100% rename from tests/testsuite/init/git_ignore_exists_no_conflicting_entries/in/.gitignore rename to tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/in/.gitignore diff --git a/tests/testsuite/init/git_ignore_exists_no_conflicting_entries/mod.rs b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs similarity index 100% rename from tests/testsuite/init/git_ignore_exists_no_conflicting_entries/mod.rs rename to tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs diff --git a/tests/testsuite/init/git_ignore_exists_no_conflicting_entries/out/.gitignore b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/out/.gitignore similarity index 100% rename from tests/testsuite/init/git_ignore_exists_no_conflicting_entries/out/.gitignore rename to tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/out/.gitignore diff --git a/tests/testsuite/init/git_ignore_exists_no_conflicting_entries/out/Cargo.toml b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/git_ignore_exists_no_conflicting_entries/out/Cargo.toml rename to tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/out/Cargo.toml diff --git a/tests/testsuite/init/git_ignore_exists_no_conflicting_entries/out/src/lib.rs b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/git_ignore_exists_no_conflicting_entries/out/src/lib.rs rename to tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/out/src/lib.rs diff --git a/tests/testsuite/init/git_ignore_exists_no_conflicting_entries/stderr.log b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.log similarity index 100% rename from tests/testsuite/init/git_ignore_exists_no_conflicting_entries/stderr.log rename to tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.log diff --git a/tests/testsuite/init/git_ignore_exists_no_conflicting_entries/stdout.log b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stdout.log similarity index 100% rename from tests/testsuite/init/git_ignore_exists_no_conflicting_entries/stdout.log rename to tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stdout.log diff --git a/tests/testsuite/init/ignores_failure_to_format_source/in/rustfmt.toml b/tests/testsuite/cargo_init/ignores_failure_to_format_source/in/rustfmt.toml similarity index 100% rename from tests/testsuite/init/ignores_failure_to_format_source/in/rustfmt.toml rename to tests/testsuite/cargo_init/ignores_failure_to_format_source/in/rustfmt.toml diff --git a/tests/testsuite/init/ignores_failure_to_format_source/mod.rs b/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs similarity index 100% rename from tests/testsuite/init/ignores_failure_to_format_source/mod.rs rename to tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs diff --git a/tests/testsuite/init/ignores_failure_to_format_source/out/Cargo.toml b/tests/testsuite/cargo_init/ignores_failure_to_format_source/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/ignores_failure_to_format_source/out/Cargo.toml rename to tests/testsuite/cargo_init/ignores_failure_to_format_source/out/Cargo.toml diff --git a/tests/testsuite/init/ignores_failure_to_format_source/out/rustfmt.toml b/tests/testsuite/cargo_init/ignores_failure_to_format_source/out/rustfmt.toml similarity index 100% rename from tests/testsuite/init/ignores_failure_to_format_source/out/rustfmt.toml rename to tests/testsuite/cargo_init/ignores_failure_to_format_source/out/rustfmt.toml diff --git a/tests/testsuite/init/ignores_failure_to_format_source/out/src/lib.rs b/tests/testsuite/cargo_init/ignores_failure_to_format_source/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/ignores_failure_to_format_source/out/src/lib.rs rename to tests/testsuite/cargo_init/ignores_failure_to_format_source/out/src/lib.rs diff --git a/tests/testsuite/init/ignores_failure_to_format_source/stderr.log b/tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.log similarity index 100% rename from tests/testsuite/init/ignores_failure_to_format_source/stderr.log rename to tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.log diff --git a/tests/testsuite/init/ignores_failure_to_format_source/stdout.log b/tests/testsuite/cargo_init/ignores_failure_to_format_source/stdout.log similarity index 100% rename from tests/testsuite/init/ignores_failure_to_format_source/stdout.log rename to tests/testsuite/cargo_init/ignores_failure_to_format_source/stdout.log diff --git a/tests/testsuite/init/inferred_bin_with_git/in/main.rs b/tests/testsuite/cargo_init/inferred_bin_with_git/in/main.rs similarity index 100% rename from tests/testsuite/init/inferred_bin_with_git/in/main.rs rename to tests/testsuite/cargo_init/inferred_bin_with_git/in/main.rs diff --git a/tests/testsuite/init/inferred_bin_with_git/mod.rs b/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs similarity index 100% rename from tests/testsuite/init/inferred_bin_with_git/mod.rs rename to tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs diff --git a/tests/testsuite/init/inferred_bin_with_git/out/.gitignore b/tests/testsuite/cargo_init/inferred_bin_with_git/out/.gitignore similarity index 100% rename from tests/testsuite/init/inferred_bin_with_git/out/.gitignore rename to tests/testsuite/cargo_init/inferred_bin_with_git/out/.gitignore diff --git a/tests/testsuite/init/inferred_bin_with_git/out/Cargo.toml b/tests/testsuite/cargo_init/inferred_bin_with_git/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/inferred_bin_with_git/out/Cargo.toml rename to tests/testsuite/cargo_init/inferred_bin_with_git/out/Cargo.toml diff --git a/tests/testsuite/init/inferred_bin_with_git/out/main.rs b/tests/testsuite/cargo_init/inferred_bin_with_git/out/main.rs similarity index 100% rename from tests/testsuite/init/inferred_bin_with_git/out/main.rs rename to tests/testsuite/cargo_init/inferred_bin_with_git/out/main.rs diff --git a/tests/testsuite/init/inferred_bin_with_git/stderr.log b/tests/testsuite/cargo_init/inferred_bin_with_git/stderr.log similarity index 100% rename from tests/testsuite/init/inferred_bin_with_git/stderr.log rename to tests/testsuite/cargo_init/inferred_bin_with_git/stderr.log diff --git a/tests/testsuite/init/inferred_bin_with_git/stdout.log b/tests/testsuite/cargo_init/inferred_bin_with_git/stdout.log similarity index 100% rename from tests/testsuite/init/inferred_bin_with_git/stdout.log rename to tests/testsuite/cargo_init/inferred_bin_with_git/stdout.log diff --git a/tests/testsuite/init/inferred_lib_with_git/in/lib.rs b/tests/testsuite/cargo_init/inferred_lib_with_git/in/lib.rs similarity index 100% rename from tests/testsuite/init/inferred_lib_with_git/in/lib.rs rename to tests/testsuite/cargo_init/inferred_lib_with_git/in/lib.rs diff --git a/tests/testsuite/init/inferred_lib_with_git/mod.rs b/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs similarity index 100% rename from tests/testsuite/init/inferred_lib_with_git/mod.rs rename to tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs diff --git a/tests/testsuite/init/inferred_lib_with_git/out/.gitignore b/tests/testsuite/cargo_init/inferred_lib_with_git/out/.gitignore similarity index 100% rename from tests/testsuite/init/inferred_lib_with_git/out/.gitignore rename to tests/testsuite/cargo_init/inferred_lib_with_git/out/.gitignore diff --git a/tests/testsuite/init/inferred_lib_with_git/out/Cargo.toml b/tests/testsuite/cargo_init/inferred_lib_with_git/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/inferred_lib_with_git/out/Cargo.toml rename to tests/testsuite/cargo_init/inferred_lib_with_git/out/Cargo.toml diff --git a/tests/testsuite/init/inferred_lib_with_git/out/lib.rs b/tests/testsuite/cargo_init/inferred_lib_with_git/out/lib.rs similarity index 100% rename from tests/testsuite/init/inferred_lib_with_git/out/lib.rs rename to tests/testsuite/cargo_init/inferred_lib_with_git/out/lib.rs diff --git a/tests/testsuite/init/inferred_lib_with_git/stderr.log b/tests/testsuite/cargo_init/inferred_lib_with_git/stderr.log similarity index 100% rename from tests/testsuite/init/inferred_lib_with_git/stderr.log rename to tests/testsuite/cargo_init/inferred_lib_with_git/stderr.log diff --git a/tests/testsuite/init/inferred_lib_with_git/stdout.log b/tests/testsuite/cargo_init/inferred_lib_with_git/stdout.log similarity index 100% rename from tests/testsuite/init/inferred_lib_with_git/stdout.log rename to tests/testsuite/cargo_init/inferred_lib_with_git/stdout.log diff --git a/tests/testsuite/init/inherit_workspace_package_table/in/Cargo.toml b/tests/testsuite/cargo_init/inherit_workspace_package_table/in/Cargo.toml similarity index 100% rename from tests/testsuite/init/inherit_workspace_package_table/in/Cargo.toml rename to tests/testsuite/cargo_init/inherit_workspace_package_table/in/Cargo.toml diff --git a/tests/testsuite/init/inherit_workspace_package_table/in/README.md b/tests/testsuite/cargo_init/inherit_workspace_package_table/in/README.md similarity index 100% rename from tests/testsuite/init/inherit_workspace_package_table/in/README.md rename to tests/testsuite/cargo_init/inherit_workspace_package_table/in/README.md diff --git a/tests/testsuite/init/inherit_workspace_package_table/in/crates/foo/src/main.rs b/tests/testsuite/cargo_init/inherit_workspace_package_table/in/crates/foo/src/main.rs similarity index 100% rename from tests/testsuite/init/inherit_workspace_package_table/in/crates/foo/src/main.rs rename to tests/testsuite/cargo_init/inherit_workspace_package_table/in/crates/foo/src/main.rs diff --git a/tests/testsuite/init/inherit_workspace_package_table/in/src/lib.rs b/tests/testsuite/cargo_init/inherit_workspace_package_table/in/src/lib.rs similarity index 100% rename from tests/testsuite/init/inherit_workspace_package_table/in/src/lib.rs rename to tests/testsuite/cargo_init/inherit_workspace_package_table/in/src/lib.rs diff --git a/tests/testsuite/init/inherit_workspace_package_table/mod.rs b/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs similarity index 100% rename from tests/testsuite/init/inherit_workspace_package_table/mod.rs rename to tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs diff --git a/tests/testsuite/init/inherit_workspace_package_table/out/Cargo.toml b/tests/testsuite/cargo_init/inherit_workspace_package_table/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/inherit_workspace_package_table/out/Cargo.toml rename to tests/testsuite/cargo_init/inherit_workspace_package_table/out/Cargo.toml diff --git a/tests/testsuite/init/inherit_workspace_package_table/out/crates/foo/Cargo.toml b/tests/testsuite/cargo_init/inherit_workspace_package_table/out/crates/foo/Cargo.toml similarity index 100% rename from tests/testsuite/init/inherit_workspace_package_table/out/crates/foo/Cargo.toml rename to tests/testsuite/cargo_init/inherit_workspace_package_table/out/crates/foo/Cargo.toml diff --git a/tests/testsuite/init/inherit_workspace_package_table/out/crates/foo/src/main.rs b/tests/testsuite/cargo_init/inherit_workspace_package_table/out/crates/foo/src/main.rs similarity index 100% rename from tests/testsuite/init/inherit_workspace_package_table/out/crates/foo/src/main.rs rename to tests/testsuite/cargo_init/inherit_workspace_package_table/out/crates/foo/src/main.rs diff --git a/tests/testsuite/init/inherit_workspace_package_table/out/src/lib.rs b/tests/testsuite/cargo_init/inherit_workspace_package_table/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/inherit_workspace_package_table/out/src/lib.rs rename to tests/testsuite/cargo_init/inherit_workspace_package_table/out/src/lib.rs diff --git a/tests/testsuite/init/inherit_workspace_package_table/stderr.log b/tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.log similarity index 100% rename from tests/testsuite/init/inherit_workspace_package_table/stderr.log rename to tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.log diff --git a/tests/testsuite/init/inherit_workspace_package_table/stdout.log b/tests/testsuite/cargo_init/inherit_workspace_package_table/stdout.log similarity index 100% rename from tests/testsuite/init/inherit_workspace_package_table/stdout.log rename to tests/testsuite/cargo_init/inherit_workspace_package_table/stdout.log diff --git a/tests/testsuite/init/invalid_dir_name/mod.rs b/tests/testsuite/cargo_init/invalid_dir_name/mod.rs similarity index 100% rename from tests/testsuite/init/invalid_dir_name/mod.rs rename to tests/testsuite/cargo_init/invalid_dir_name/mod.rs diff --git a/tests/testsuite/init/invalid_dir_name/stderr.log b/tests/testsuite/cargo_init/invalid_dir_name/stderr.log similarity index 100% rename from tests/testsuite/init/invalid_dir_name/stderr.log rename to tests/testsuite/cargo_init/invalid_dir_name/stderr.log diff --git a/tests/testsuite/init/invalid_dir_name/stdout.log b/tests/testsuite/cargo_init/invalid_dir_name/stdout.log similarity index 100% rename from tests/testsuite/init/invalid_dir_name/stdout.log rename to tests/testsuite/cargo_init/invalid_dir_name/stdout.log diff --git a/tests/testsuite/init/lib_already_exists_nosrc/in/lib.rs b/tests/testsuite/cargo_init/lib_already_exists_nosrc/in/lib.rs similarity index 100% rename from tests/testsuite/init/lib_already_exists_nosrc/in/lib.rs rename to tests/testsuite/cargo_init/lib_already_exists_nosrc/in/lib.rs diff --git a/tests/testsuite/init/lib_already_exists_nosrc/mod.rs b/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs similarity index 100% rename from tests/testsuite/init/lib_already_exists_nosrc/mod.rs rename to tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs diff --git a/tests/testsuite/init/lib_already_exists_nosrc/out/Cargo.toml b/tests/testsuite/cargo_init/lib_already_exists_nosrc/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/lib_already_exists_nosrc/out/Cargo.toml rename to tests/testsuite/cargo_init/lib_already_exists_nosrc/out/Cargo.toml diff --git a/tests/testsuite/init/lib_already_exists_nosrc/out/lib.rs b/tests/testsuite/cargo_init/lib_already_exists_nosrc/out/lib.rs similarity index 100% rename from tests/testsuite/init/lib_already_exists_nosrc/out/lib.rs rename to tests/testsuite/cargo_init/lib_already_exists_nosrc/out/lib.rs diff --git a/tests/testsuite/init/lib_already_exists_nosrc/stderr.log b/tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.log similarity index 100% rename from tests/testsuite/init/lib_already_exists_nosrc/stderr.log rename to tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.log diff --git a/tests/testsuite/init/lib_already_exists_nosrc/stdout.log b/tests/testsuite/cargo_init/lib_already_exists_nosrc/stdout.log similarity index 100% rename from tests/testsuite/init/lib_already_exists_nosrc/stdout.log rename to tests/testsuite/cargo_init/lib_already_exists_nosrc/stdout.log diff --git a/tests/testsuite/init/lib_already_exists_src/in/src/lib.rs b/tests/testsuite/cargo_init/lib_already_exists_src/in/src/lib.rs similarity index 100% rename from tests/testsuite/init/lib_already_exists_src/in/src/lib.rs rename to tests/testsuite/cargo_init/lib_already_exists_src/in/src/lib.rs diff --git a/tests/testsuite/init/lib_already_exists_src/mod.rs b/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs similarity index 100% rename from tests/testsuite/init/lib_already_exists_src/mod.rs rename to tests/testsuite/cargo_init/lib_already_exists_src/mod.rs diff --git a/tests/testsuite/init/lib_already_exists_src/out/Cargo.toml b/tests/testsuite/cargo_init/lib_already_exists_src/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/lib_already_exists_src/out/Cargo.toml rename to tests/testsuite/cargo_init/lib_already_exists_src/out/Cargo.toml diff --git a/tests/testsuite/init/lib_already_exists_src/out/src/lib.rs b/tests/testsuite/cargo_init/lib_already_exists_src/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/lib_already_exists_src/out/src/lib.rs rename to tests/testsuite/cargo_init/lib_already_exists_src/out/src/lib.rs diff --git a/tests/testsuite/init/lib_already_exists_src/stderr.log b/tests/testsuite/cargo_init/lib_already_exists_src/stderr.log similarity index 100% rename from tests/testsuite/init/lib_already_exists_src/stderr.log rename to tests/testsuite/cargo_init/lib_already_exists_src/stderr.log diff --git a/tests/testsuite/init/lib_already_exists_src/stdout.log b/tests/testsuite/cargo_init/lib_already_exists_src/stdout.log similarity index 100% rename from tests/testsuite/init/lib_already_exists_src/stdout.log rename to tests/testsuite/cargo_init/lib_already_exists_src/stdout.log diff --git a/tests/testsuite/init/mercurial_autodetect/in/.hg/.keep b/tests/testsuite/cargo_init/mercurial_autodetect/in/.hg/.keep similarity index 100% rename from tests/testsuite/init/mercurial_autodetect/in/.hg/.keep rename to tests/testsuite/cargo_init/mercurial_autodetect/in/.hg/.keep diff --git a/tests/testsuite/init/mercurial_autodetect/mod.rs b/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs similarity index 100% rename from tests/testsuite/init/mercurial_autodetect/mod.rs rename to tests/testsuite/cargo_init/mercurial_autodetect/mod.rs diff --git a/tests/testsuite/init/mercurial_autodetect/out/.hgignore b/tests/testsuite/cargo_init/mercurial_autodetect/out/.hgignore similarity index 100% rename from tests/testsuite/init/mercurial_autodetect/out/.hgignore rename to tests/testsuite/cargo_init/mercurial_autodetect/out/.hgignore diff --git a/tests/testsuite/init/mercurial_autodetect/out/Cargo.toml b/tests/testsuite/cargo_init/mercurial_autodetect/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/mercurial_autodetect/out/Cargo.toml rename to tests/testsuite/cargo_init/mercurial_autodetect/out/Cargo.toml diff --git a/tests/testsuite/init/mercurial_autodetect/out/src/lib.rs b/tests/testsuite/cargo_init/mercurial_autodetect/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/mercurial_autodetect/out/src/lib.rs rename to tests/testsuite/cargo_init/mercurial_autodetect/out/src/lib.rs diff --git a/tests/testsuite/init/mercurial_autodetect/stderr.log b/tests/testsuite/cargo_init/mercurial_autodetect/stderr.log similarity index 100% rename from tests/testsuite/init/mercurial_autodetect/stderr.log rename to tests/testsuite/cargo_init/mercurial_autodetect/stderr.log diff --git a/tests/testsuite/init/mercurial_autodetect/stdout.log b/tests/testsuite/cargo_init/mercurial_autodetect/stdout.log similarity index 100% rename from tests/testsuite/init/mercurial_autodetect/stdout.log rename to tests/testsuite/cargo_init/mercurial_autodetect/stdout.log diff --git a/tests/testsuite/init/mod.rs b/tests/testsuite/cargo_init/mod.rs similarity index 100% rename from tests/testsuite/init/mod.rs rename to tests/testsuite/cargo_init/mod.rs diff --git a/tests/testsuite/init/multibin_project_name_clash/in/case.rs b/tests/testsuite/cargo_init/multibin_project_name_clash/in/case.rs similarity index 100% rename from tests/testsuite/init/multibin_project_name_clash/in/case.rs rename to tests/testsuite/cargo_init/multibin_project_name_clash/in/case.rs diff --git a/tests/testsuite/init/multibin_project_name_clash/in/main.rs b/tests/testsuite/cargo_init/multibin_project_name_clash/in/main.rs similarity index 100% rename from tests/testsuite/init/multibin_project_name_clash/in/main.rs rename to tests/testsuite/cargo_init/multibin_project_name_clash/in/main.rs diff --git a/tests/testsuite/init/multibin_project_name_clash/mod.rs b/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs similarity index 100% rename from tests/testsuite/init/multibin_project_name_clash/mod.rs rename to tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs diff --git a/tests/testsuite/init/multibin_project_name_clash/out/case.rs b/tests/testsuite/cargo_init/multibin_project_name_clash/out/case.rs similarity index 100% rename from tests/testsuite/init/multibin_project_name_clash/out/case.rs rename to tests/testsuite/cargo_init/multibin_project_name_clash/out/case.rs diff --git a/tests/testsuite/init/multibin_project_name_clash/out/main.rs b/tests/testsuite/cargo_init/multibin_project_name_clash/out/main.rs similarity index 100% rename from tests/testsuite/init/multibin_project_name_clash/out/main.rs rename to tests/testsuite/cargo_init/multibin_project_name_clash/out/main.rs diff --git a/tests/testsuite/init/multibin_project_name_clash/stderr.log b/tests/testsuite/cargo_init/multibin_project_name_clash/stderr.log similarity index 100% rename from tests/testsuite/init/multibin_project_name_clash/stderr.log rename to tests/testsuite/cargo_init/multibin_project_name_clash/stderr.log diff --git a/tests/testsuite/init/multibin_project_name_clash/stdout.log b/tests/testsuite/cargo_init/multibin_project_name_clash/stdout.log similarity index 100% rename from tests/testsuite/init/multibin_project_name_clash/stdout.log rename to tests/testsuite/cargo_init/multibin_project_name_clash/stdout.log diff --git a/tests/testsuite/init/no_filename/mod.rs b/tests/testsuite/cargo_init/no_filename/mod.rs similarity index 100% rename from tests/testsuite/init/no_filename/mod.rs rename to tests/testsuite/cargo_init/no_filename/mod.rs diff --git a/tests/testsuite/init/no_filename/stderr.log b/tests/testsuite/cargo_init/no_filename/stderr.log similarity index 100% rename from tests/testsuite/init/no_filename/stderr.log rename to tests/testsuite/cargo_init/no_filename/stderr.log diff --git a/tests/testsuite/init/no_filename/stdout.log b/tests/testsuite/cargo_init/no_filename/stdout.log similarity index 100% rename from tests/testsuite/init/no_filename/stdout.log rename to tests/testsuite/cargo_init/no_filename/stdout.log diff --git a/tests/testsuite/init/path_contains_separator/in/.keep b/tests/testsuite/cargo_init/path_contains_separator/in/.keep similarity index 100% rename from tests/testsuite/init/path_contains_separator/in/.keep rename to tests/testsuite/cargo_init/path_contains_separator/in/.keep diff --git a/tests/testsuite/init/path_contains_separator/mod.rs b/tests/testsuite/cargo_init/path_contains_separator/mod.rs similarity index 100% rename from tests/testsuite/init/path_contains_separator/mod.rs rename to tests/testsuite/cargo_init/path_contains_separator/mod.rs diff --git a/tests/testsuite/init/path_contains_separator/out/Cargo.toml b/tests/testsuite/cargo_init/path_contains_separator/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/path_contains_separator/out/Cargo.toml rename to tests/testsuite/cargo_init/path_contains_separator/out/Cargo.toml diff --git a/tests/testsuite/init/path_contains_separator/out/src/main.rs b/tests/testsuite/cargo_init/path_contains_separator/out/src/main.rs similarity index 100% rename from tests/testsuite/init/path_contains_separator/out/src/main.rs rename to tests/testsuite/cargo_init/path_contains_separator/out/src/main.rs diff --git a/tests/testsuite/init/path_contains_separator/stderr.log b/tests/testsuite/cargo_init/path_contains_separator/stderr.log similarity index 100% rename from tests/testsuite/init/path_contains_separator/stderr.log rename to tests/testsuite/cargo_init/path_contains_separator/stderr.log diff --git a/tests/testsuite/init/path_contains_separator/stdout.log b/tests/testsuite/cargo_init/path_contains_separator/stdout.log similarity index 100% rename from tests/testsuite/init/path_contains_separator/stdout.log rename to tests/testsuite/cargo_init/path_contains_separator/stdout.log diff --git a/tests/testsuite/init/pijul_autodetect/in/.pijul/.keep b/tests/testsuite/cargo_init/pijul_autodetect/in/.pijul/.keep similarity index 100% rename from tests/testsuite/init/pijul_autodetect/in/.pijul/.keep rename to tests/testsuite/cargo_init/pijul_autodetect/in/.pijul/.keep diff --git a/tests/testsuite/init/pijul_autodetect/mod.rs b/tests/testsuite/cargo_init/pijul_autodetect/mod.rs similarity index 100% rename from tests/testsuite/init/pijul_autodetect/mod.rs rename to tests/testsuite/cargo_init/pijul_autodetect/mod.rs diff --git a/tests/testsuite/init/pijul_autodetect/out/.ignore b/tests/testsuite/cargo_init/pijul_autodetect/out/.ignore similarity index 100% rename from tests/testsuite/init/pijul_autodetect/out/.ignore rename to tests/testsuite/cargo_init/pijul_autodetect/out/.ignore diff --git a/tests/testsuite/init/pijul_autodetect/out/Cargo.toml b/tests/testsuite/cargo_init/pijul_autodetect/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/pijul_autodetect/out/Cargo.toml rename to tests/testsuite/cargo_init/pijul_autodetect/out/Cargo.toml diff --git a/tests/testsuite/init/pijul_autodetect/out/src/lib.rs b/tests/testsuite/cargo_init/pijul_autodetect/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/pijul_autodetect/out/src/lib.rs rename to tests/testsuite/cargo_init/pijul_autodetect/out/src/lib.rs diff --git a/tests/testsuite/init/pijul_autodetect/stderr.log b/tests/testsuite/cargo_init/pijul_autodetect/stderr.log similarity index 100% rename from tests/testsuite/init/pijul_autodetect/stderr.log rename to tests/testsuite/cargo_init/pijul_autodetect/stderr.log diff --git a/tests/testsuite/init/pijul_autodetect/stdout.log b/tests/testsuite/cargo_init/pijul_autodetect/stdout.log similarity index 100% rename from tests/testsuite/init/pijul_autodetect/stdout.log rename to tests/testsuite/cargo_init/pijul_autodetect/stdout.log diff --git a/tests/testsuite/init/reserved_name/mod.rs b/tests/testsuite/cargo_init/reserved_name/mod.rs similarity index 100% rename from tests/testsuite/init/reserved_name/mod.rs rename to tests/testsuite/cargo_init/reserved_name/mod.rs diff --git a/tests/testsuite/init/reserved_name/stderr.log b/tests/testsuite/cargo_init/reserved_name/stderr.log similarity index 100% rename from tests/testsuite/init/reserved_name/stderr.log rename to tests/testsuite/cargo_init/reserved_name/stderr.log diff --git a/tests/testsuite/init/reserved_name/stdout.log b/tests/testsuite/cargo_init/reserved_name/stdout.log similarity index 100% rename from tests/testsuite/init/reserved_name/stdout.log rename to tests/testsuite/cargo_init/reserved_name/stdout.log diff --git a/tests/testsuite/init/simple_bin/in b/tests/testsuite/cargo_init/simple_bin/in similarity index 100% rename from tests/testsuite/init/simple_bin/in rename to tests/testsuite/cargo_init/simple_bin/in diff --git a/tests/testsuite/init/simple_bin/mod.rs b/tests/testsuite/cargo_init/simple_bin/mod.rs similarity index 100% rename from tests/testsuite/init/simple_bin/mod.rs rename to tests/testsuite/cargo_init/simple_bin/mod.rs diff --git a/tests/testsuite/init/simple_bin/out/Cargo.toml b/tests/testsuite/cargo_init/simple_bin/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/simple_bin/out/Cargo.toml rename to tests/testsuite/cargo_init/simple_bin/out/Cargo.toml diff --git a/tests/testsuite/init/simple_bin/out/src/main.rs b/tests/testsuite/cargo_init/simple_bin/out/src/main.rs similarity index 100% rename from tests/testsuite/init/simple_bin/out/src/main.rs rename to tests/testsuite/cargo_init/simple_bin/out/src/main.rs diff --git a/tests/testsuite/init/simple_bin/stderr.log b/tests/testsuite/cargo_init/simple_bin/stderr.log similarity index 100% rename from tests/testsuite/init/simple_bin/stderr.log rename to tests/testsuite/cargo_init/simple_bin/stderr.log diff --git a/tests/testsuite/init/simple_bin/stdout.log b/tests/testsuite/cargo_init/simple_bin/stdout.log similarity index 100% rename from tests/testsuite/init/simple_bin/stdout.log rename to tests/testsuite/cargo_init/simple_bin/stdout.log diff --git a/tests/testsuite/init/simple_git/in b/tests/testsuite/cargo_init/simple_git/in similarity index 100% rename from tests/testsuite/init/simple_git/in rename to tests/testsuite/cargo_init/simple_git/in diff --git a/tests/testsuite/init/simple_git/mod.rs b/tests/testsuite/cargo_init/simple_git/mod.rs similarity index 100% rename from tests/testsuite/init/simple_git/mod.rs rename to tests/testsuite/cargo_init/simple_git/mod.rs diff --git a/tests/testsuite/init/simple_git/out/.gitignore b/tests/testsuite/cargo_init/simple_git/out/.gitignore similarity index 100% rename from tests/testsuite/init/simple_git/out/.gitignore rename to tests/testsuite/cargo_init/simple_git/out/.gitignore diff --git a/tests/testsuite/init/simple_git/out/Cargo.toml b/tests/testsuite/cargo_init/simple_git/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/simple_git/out/Cargo.toml rename to tests/testsuite/cargo_init/simple_git/out/Cargo.toml diff --git a/tests/testsuite/init/simple_git/out/src/lib.rs b/tests/testsuite/cargo_init/simple_git/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/simple_git/out/src/lib.rs rename to tests/testsuite/cargo_init/simple_git/out/src/lib.rs diff --git a/tests/testsuite/init/simple_git/stderr.log b/tests/testsuite/cargo_init/simple_git/stderr.log similarity index 100% rename from tests/testsuite/init/simple_git/stderr.log rename to tests/testsuite/cargo_init/simple_git/stderr.log diff --git a/tests/testsuite/init/simple_git/stdout.log b/tests/testsuite/cargo_init/simple_git/stdout.log similarity index 100% rename from tests/testsuite/init/simple_git/stdout.log rename to tests/testsuite/cargo_init/simple_git/stdout.log diff --git a/tests/testsuite/init/simple_git_ignore_exists/in/.gitignore b/tests/testsuite/cargo_init/simple_git_ignore_exists/in/.gitignore similarity index 100% rename from tests/testsuite/init/simple_git_ignore_exists/in/.gitignore rename to tests/testsuite/cargo_init/simple_git_ignore_exists/in/.gitignore diff --git a/tests/testsuite/init/simple_git_ignore_exists/mod.rs b/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs similarity index 100% rename from tests/testsuite/init/simple_git_ignore_exists/mod.rs rename to tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs diff --git a/tests/testsuite/init/simple_git_ignore_exists/out/.gitignore b/tests/testsuite/cargo_init/simple_git_ignore_exists/out/.gitignore similarity index 100% rename from tests/testsuite/init/simple_git_ignore_exists/out/.gitignore rename to tests/testsuite/cargo_init/simple_git_ignore_exists/out/.gitignore diff --git a/tests/testsuite/init/simple_git_ignore_exists/out/Cargo.toml b/tests/testsuite/cargo_init/simple_git_ignore_exists/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/simple_git_ignore_exists/out/Cargo.toml rename to tests/testsuite/cargo_init/simple_git_ignore_exists/out/Cargo.toml diff --git a/tests/testsuite/init/simple_git_ignore_exists/out/src/lib.rs b/tests/testsuite/cargo_init/simple_git_ignore_exists/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/simple_git_ignore_exists/out/src/lib.rs rename to tests/testsuite/cargo_init/simple_git_ignore_exists/out/src/lib.rs diff --git a/tests/testsuite/init/simple_git_ignore_exists/stderr.log b/tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.log similarity index 100% rename from tests/testsuite/init/simple_git_ignore_exists/stderr.log rename to tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.log diff --git a/tests/testsuite/init/simple_git_ignore_exists/stdout.log b/tests/testsuite/cargo_init/simple_git_ignore_exists/stdout.log similarity index 100% rename from tests/testsuite/init/simple_git_ignore_exists/stdout.log rename to tests/testsuite/cargo_init/simple_git_ignore_exists/stdout.log diff --git a/tests/testsuite/init/simple_hg/in b/tests/testsuite/cargo_init/simple_hg/in similarity index 100% rename from tests/testsuite/init/simple_hg/in rename to tests/testsuite/cargo_init/simple_hg/in diff --git a/tests/testsuite/init/simple_hg/mod.rs b/tests/testsuite/cargo_init/simple_hg/mod.rs similarity index 100% rename from tests/testsuite/init/simple_hg/mod.rs rename to tests/testsuite/cargo_init/simple_hg/mod.rs diff --git a/tests/testsuite/init/simple_hg/out/.hgignore b/tests/testsuite/cargo_init/simple_hg/out/.hgignore similarity index 100% rename from tests/testsuite/init/simple_hg/out/.hgignore rename to tests/testsuite/cargo_init/simple_hg/out/.hgignore diff --git a/tests/testsuite/init/simple_hg/out/Cargo.toml b/tests/testsuite/cargo_init/simple_hg/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/simple_hg/out/Cargo.toml rename to tests/testsuite/cargo_init/simple_hg/out/Cargo.toml diff --git a/tests/testsuite/init/simple_hg/out/src/lib.rs b/tests/testsuite/cargo_init/simple_hg/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/simple_hg/out/src/lib.rs rename to tests/testsuite/cargo_init/simple_hg/out/src/lib.rs diff --git a/tests/testsuite/init/simple_hg/stderr.log b/tests/testsuite/cargo_init/simple_hg/stderr.log similarity index 100% rename from tests/testsuite/init/simple_hg/stderr.log rename to tests/testsuite/cargo_init/simple_hg/stderr.log diff --git a/tests/testsuite/init/simple_hg/stdout.log b/tests/testsuite/cargo_init/simple_hg/stdout.log similarity index 100% rename from tests/testsuite/init/simple_hg/stdout.log rename to tests/testsuite/cargo_init/simple_hg/stdout.log diff --git a/tests/testsuite/init/simple_hg_ignore_exists/in/.hg/.keep b/tests/testsuite/cargo_init/simple_hg_ignore_exists/in/.hg/.keep similarity index 100% rename from tests/testsuite/init/simple_hg_ignore_exists/in/.hg/.keep rename to tests/testsuite/cargo_init/simple_hg_ignore_exists/in/.hg/.keep diff --git a/tests/testsuite/init/simple_hg_ignore_exists/in/.hgignore b/tests/testsuite/cargo_init/simple_hg_ignore_exists/in/.hgignore similarity index 100% rename from tests/testsuite/init/simple_hg_ignore_exists/in/.hgignore rename to tests/testsuite/cargo_init/simple_hg_ignore_exists/in/.hgignore diff --git a/tests/testsuite/init/simple_hg_ignore_exists/mod.rs b/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs similarity index 100% rename from tests/testsuite/init/simple_hg_ignore_exists/mod.rs rename to tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs diff --git a/tests/testsuite/init/simple_hg_ignore_exists/out/.hgignore b/tests/testsuite/cargo_init/simple_hg_ignore_exists/out/.hgignore similarity index 100% rename from tests/testsuite/init/simple_hg_ignore_exists/out/.hgignore rename to tests/testsuite/cargo_init/simple_hg_ignore_exists/out/.hgignore diff --git a/tests/testsuite/init/simple_hg_ignore_exists/out/Cargo.toml b/tests/testsuite/cargo_init/simple_hg_ignore_exists/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/simple_hg_ignore_exists/out/Cargo.toml rename to tests/testsuite/cargo_init/simple_hg_ignore_exists/out/Cargo.toml diff --git a/tests/testsuite/init/simple_hg_ignore_exists/out/src/lib.rs b/tests/testsuite/cargo_init/simple_hg_ignore_exists/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/simple_hg_ignore_exists/out/src/lib.rs rename to tests/testsuite/cargo_init/simple_hg_ignore_exists/out/src/lib.rs diff --git a/tests/testsuite/init/simple_hg_ignore_exists/stderr.log b/tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.log similarity index 100% rename from tests/testsuite/init/simple_hg_ignore_exists/stderr.log rename to tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.log diff --git a/tests/testsuite/init/simple_hg_ignore_exists/stdout.log b/tests/testsuite/cargo_init/simple_hg_ignore_exists/stdout.log similarity index 100% rename from tests/testsuite/init/simple_hg_ignore_exists/stdout.log rename to tests/testsuite/cargo_init/simple_hg_ignore_exists/stdout.log diff --git a/tests/testsuite/init/simple_lib/in b/tests/testsuite/cargo_init/simple_lib/in similarity index 100% rename from tests/testsuite/init/simple_lib/in rename to tests/testsuite/cargo_init/simple_lib/in diff --git a/tests/testsuite/init/simple_lib/mod.rs b/tests/testsuite/cargo_init/simple_lib/mod.rs similarity index 100% rename from tests/testsuite/init/simple_lib/mod.rs rename to tests/testsuite/cargo_init/simple_lib/mod.rs diff --git a/tests/testsuite/init/simple_lib/out/Cargo.toml b/tests/testsuite/cargo_init/simple_lib/out/Cargo.toml similarity index 100% rename from tests/testsuite/init/simple_lib/out/Cargo.toml rename to tests/testsuite/cargo_init/simple_lib/out/Cargo.toml diff --git a/tests/testsuite/init/simple_lib/out/src/lib.rs b/tests/testsuite/cargo_init/simple_lib/out/src/lib.rs similarity index 100% rename from tests/testsuite/init/simple_lib/out/src/lib.rs rename to tests/testsuite/cargo_init/simple_lib/out/src/lib.rs diff --git a/tests/testsuite/init/simple_lib/stderr.log b/tests/testsuite/cargo_init/simple_lib/stderr.log similarity index 100% rename from tests/testsuite/init/simple_lib/stderr.log rename to tests/testsuite/cargo_init/simple_lib/stderr.log diff --git a/tests/testsuite/init/simple_lib/stdout.log b/tests/testsuite/cargo_init/simple_lib/stdout.log similarity index 100% rename from tests/testsuite/init/simple_lib/stdout.log rename to tests/testsuite/cargo_init/simple_lib/stdout.log diff --git a/tests/testsuite/init/unknown_flags/mod.rs b/tests/testsuite/cargo_init/unknown_flags/mod.rs similarity index 100% rename from tests/testsuite/init/unknown_flags/mod.rs rename to tests/testsuite/cargo_init/unknown_flags/mod.rs diff --git a/tests/testsuite/init/unknown_flags/stderr.log b/tests/testsuite/cargo_init/unknown_flags/stderr.log similarity index 100% rename from tests/testsuite/init/unknown_flags/stderr.log rename to tests/testsuite/cargo_init/unknown_flags/stderr.log diff --git a/tests/testsuite/init/unknown_flags/stdout.log b/tests/testsuite/cargo_init/unknown_flags/stdout.log similarity index 100% rename from tests/testsuite/init/unknown_flags/stdout.log rename to tests/testsuite/cargo_init/unknown_flags/stdout.log diff --git a/tests/testsuite/init/with_argument/in/foo/.keep b/tests/testsuite/cargo_init/with_argument/in/foo/.keep similarity index 100% rename from tests/testsuite/init/with_argument/in/foo/.keep rename to tests/testsuite/cargo_init/with_argument/in/foo/.keep diff --git a/tests/testsuite/init/with_argument/mod.rs b/tests/testsuite/cargo_init/with_argument/mod.rs similarity index 100% rename from tests/testsuite/init/with_argument/mod.rs rename to tests/testsuite/cargo_init/with_argument/mod.rs diff --git a/tests/testsuite/init/with_argument/out/foo/Cargo.toml b/tests/testsuite/cargo_init/with_argument/out/foo/Cargo.toml similarity index 100% rename from tests/testsuite/init/with_argument/out/foo/Cargo.toml rename to tests/testsuite/cargo_init/with_argument/out/foo/Cargo.toml diff --git a/tests/testsuite/init/with_argument/out/foo/src/main.rs b/tests/testsuite/cargo_init/with_argument/out/foo/src/main.rs similarity index 100% rename from tests/testsuite/init/with_argument/out/foo/src/main.rs rename to tests/testsuite/cargo_init/with_argument/out/foo/src/main.rs diff --git a/tests/testsuite/init/with_argument/stderr.log b/tests/testsuite/cargo_init/with_argument/stderr.log similarity index 100% rename from tests/testsuite/init/with_argument/stderr.log rename to tests/testsuite/cargo_init/with_argument/stderr.log diff --git a/tests/testsuite/init/with_argument/stdout.log b/tests/testsuite/cargo_init/with_argument/stdout.log similarity index 100% rename from tests/testsuite/init/with_argument/stdout.log rename to tests/testsuite/cargo_init/with_argument/stdout.log diff --git a/tests/testsuite/main.rs b/tests/testsuite/main.rs index 2c282c0a33e..373f444c88a 100644 --- a/tests/testsuite/main.rs +++ b/tests/testsuite/main.rs @@ -24,6 +24,7 @@ mod cargo_command; mod cargo_config; mod cargo_env_config; mod cargo_features; +mod cargo_init; mod cargo_new; mod cargo_remove; mod cargo_targets; @@ -65,7 +66,6 @@ mod glob_targets; mod help; mod https; mod inheritable_workspace_fields; -mod init; mod install; mod install_upgrade; mod jobserver;