chore: Migrated testsuite to testsuite::prelude

tests/testsuite/advanced_env.rs

@@ -1,6 +1,6 @@
 //! -Zadvanced-env tests
 
-use cargo_test_support::prelude::*;
+use crate::prelude::*;
 use cargo_test_support::{paths, project, registry::Package};
 
 #[cargo_test]

tests/testsuite/alt_registry.rs

@@ -2,8 +2,8 @@
 
 use std::fs;
 
+use crate::prelude::*;
 use cargo_test_support::compare::assert_e2e;
-use cargo_test_support::prelude::*;
 use cargo_test_support::publish::validate_alt_upload;
 use cargo_test_support::registry::{self, Package, RegistryBuilder};
 use cargo_test_support::str;

tests/testsuite/artifact_dep.rs

@@ -1,11 +1,11 @@
 //! Tests specific to artifact dependencies, designated using
 //! the new `dep = { artifact = "bin", … }` syntax in manifests.
 
+use crate::prelude::*;
 use crate::utils::cross_compile::{
     can_run_on_host as cross_compile_can_run_on_host, disabled as cross_compile_disabled,
 };
 use cargo_test_support::compare::assert_e2e;
-use cargo_test_support::prelude::*;
 use cargo_test_support::registry::{Package, RegistryBuilder};
 use cargo_test_support::str;
 use cargo_test_support::{

tests/testsuite/artifact_dir.rs

@@ -4,7 +4,7 @@ use std::env;
 use std::fs;
 use std::path::Path;
 
-use cargo_test_support::prelude::*;
+use crate::prelude::*;
 use cargo_test_support::sleep_ms;
 use cargo_test_support::str;
 use cargo_test_support::{basic_manifest, project};

tests/testsuite/bad_config.rs

@@ -1,7 +1,7 @@
 //! Tests for some invalid .cargo/config files.
 
+use crate::prelude::*;
 use cargo_test_support::git::cargo_uses_gitoxide;
-use cargo_test_support::prelude::*;
 use cargo_test_support::registry::{self, Package};
 use cargo_test_support::str;
 use cargo_test_support::{basic_manifest, project, rustc_host};

tests/testsuite/bad_manifest_path.rs

@@ -1,6 +1,6 @@
 //! Tests for invalid --manifest-path arguments.
 
-use cargo_test_support::prelude::*;
+use crate::prelude::*;
 use cargo_test_support::{basic_bin_manifest, main_file, project, str};
 
 #[track_caller]

tests/testsuite/bench.rs

@@ -1,6 +1,6 @@
 //! Tests for the `cargo bench` command.
 
-use cargo_test_support::prelude::*;
+use crate::prelude::*;
 use cargo_test_support::{basic_bin_manifest, basic_lib_manifest, basic_manifest, project, str};
 
 #[cargo_test(nightly, reason = "bench")]

tests/testsuite/binary_name.rs

@@ -1,10 +1,10 @@
 //! Tests for `cargo-features = ["different-binary-name"]`.
 
+use crate::prelude::*;
 use cargo_test_support::install::assert_has_installed_exe;
 use cargo_test_support::install::assert_has_not_installed_exe;
 use cargo_test_support::is_nightly;
 use cargo_test_support::paths;
-use cargo_test_support::prelude::*;
 use cargo_test_support::project;
 use cargo_test_support::str;
 

tests/testsuite/build.rs

@@ -5,6 +5,7 @@ use std::fs;
 use std::io::Read;
 use std::process::Stdio;
 
+use crate::prelude::*;
 use crate::utils::tools;
 use cargo::core::compiler::UserIntent;
 use cargo::core::Shell;
@@ -13,7 +14,6 @@ use cargo::ops::CompileOptions;
 use cargo::GlobalContext;
 use cargo_test_support::compare::assert_e2e;
 use cargo_test_support::paths::root;
-use cargo_test_support::prelude::*;
 use cargo_test_support::registry::Package;
 use cargo_test_support::str;
 use cargo_test_support::{

tests/testsuite/build_dir.rs

@@ -11,6 +11,7 @@
 
 use std::path::PathBuf;
 
+use crate::prelude::*;
 use cargo_test_support::{paths, project, str};
 use cargo_test_support::{prelude::*, Project};
 use std::env::consts::{DLL_PREFIX, DLL_SUFFIX, EXE_SUFFIX};

tests/testsuite/build_plan.rs

@@ -1,6 +1,6 @@
 //! Tests for --build-plan feature.
 
-use cargo_test_support::prelude::*;
+use crate::prelude::*;
 use cargo_test_support::registry::Package;
 use cargo_test_support::{basic_bin_manifest, basic_manifest, main_file, project, str};
 

tests/testsuite/build_script.rs

@@ -5,13 +5,13 @@ use std::fs;
 use std::io;
 use std::thread;
 
+use crate::prelude::*;
 use crate::utils::cross_compile::{
     can_run_on_host as cross_compile_can_run_on_host, disabled as cross_compile_disabled,
 };
 use crate::utils::tools;
 use cargo_test_support::compare::assert_e2e;
 use cargo_test_support::paths::cargo_home;
-use cargo_test_support::prelude::*;
 use cargo_test_support::registry::Package;
 use cargo_test_support::str;
 use cargo_test_support::{

tests/testsuite/build_script_env.rs

@@ -1,7 +1,7 @@
 //! Tests for build.rs rerun-if-env-changed and rustc-env
 
+use crate::prelude::*;
 use cargo_test_support::basic_manifest;
-use cargo_test_support::prelude::*;
 use cargo_test_support::project;
 use cargo_test_support::sleep_ms;
 use cargo_test_support::str;

tests/testsuite/build_script_extra_link_arg.rs

@@ -4,7 +4,7 @@
 // because MSVC link.exe just gives a warning on unknown flags (how helpful!),
 // and other linkers will return an error.
 
-use cargo_test_support::prelude::*;
+use crate::prelude::*;
 use cargo_test_support::registry::Package;
 use cargo_test_support::str;
 use cargo_test_support::{basic_bin_manifest, basic_lib_manifest, basic_manifest, project};

tests/testsuite/build_scripts_multiple.rs

@@ -1,8 +1,8 @@
 //! Tests for multiple build scripts feature.
 
+use crate::prelude::*;
 use cargo_test_support::compare::assert_e2e;
 use cargo_test_support::git;
-use cargo_test_support::prelude::*;
 use cargo_test_support::publish::validate_crate_contents;
 use cargo_test_support::str;
 use cargo_test_support::{project, Project};

tests/testsuite/cache_lock.rs

@@ -2,9 +2,9 @@
 
 use std::thread::JoinHandle;
 
+use crate::prelude::*;
 use cargo::util::cache_lock::{CacheLockMode, CacheLocker};
 use cargo_test_support::paths;
-use cargo_test_support::prelude::*;
 use cargo_test_support::{retry, thread_wait_timeout, threaded_timeout};
 
 use crate::config::GlobalContextBuilder;

tests/testsuite/cache_messages.rs

@@ -1,7 +1,7 @@
 //! Tests for caching compiler diagnostics.
 
+use crate::prelude::*;
 use crate::utils::tools;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::{basic_manifest, is_coarse_mtime, project, registry::Package, sleep_ms};
 

tests/testsuite/cargo/help/mod.rs

@@ -1,5 +1,5 @@
+use crate::prelude::*;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 
 #[cargo_test]

tests/testsuite/cargo/z_help/mod.rs

@@ -1,5 +1,5 @@
+use crate::prelude::*;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 
 #[cargo_test]

tests/testsuite/cargo_add/add_basic/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/add_multiple/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/add_toolchain/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/build/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/change_rename_target/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/cyclic_features/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/default_features/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/deprecated_default_features/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/deprecated_section/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/detect_workspace_inherit_path_base/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/dev/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/dev_build_conflict/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/dev_existing_path_base/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/dry_run/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/empty_dep_name/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/feature_suggestion_multiple/mod.rs

@@ -1,6 +1,6 @@
+use crate::prelude::*;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::Project;
 
 #[cargo_test]

tests/testsuite/cargo_add/feature_suggestion_none/mod.rs

@@ -1,6 +1,6 @@
+use crate::prelude::*;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::Project;
 
 #[cargo_test]

tests/testsuite/cargo_add/feature_suggestion_single/mod.rs

@@ -1,6 +1,6 @@
+use crate::prelude::*;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::Project;
 
 #[cargo_test]

tests/testsuite/cargo_add/features/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/features_activated_over_limit/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 use itertools::Itertools;

tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 use itertools::Itertools;

tests/testsuite/cargo_add/features_empty/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/features_error_activated_over_limit/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/features_error_deactivated_over_limit/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/features_preserve/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/features_spaced_values/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/features_unknown/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/features_unknown_no_features/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/git/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/git_branch/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/git_conflicts_namever/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/git_dev/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/git_inferred_name/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/git_multiple_names/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/git_registry/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/git_rev/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/git_tag/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/help/mod.rs

@@ -1,5 +1,5 @@
+use crate::prelude::*;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 
 #[cargo_test]

tests/testsuite/cargo_add/infer_prerelease/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/invalid_arg/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/invalid_git_name/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/invalid_manifest/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/invalid_name_external/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/invalid_path/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/invalid_path_name/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/invalid_path_self/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/invalid_target_empty/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/invalid_vers/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/list_features/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/list_features_path/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/list_features_path_no_default/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/locked_changed/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/locked_unchanged/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/lockfile_updated/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/manifest_path_package/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/merge_activated_features/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/missing_at_in_crate_spec/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/namever/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/no_args/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/no_default_features/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/no_optional/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/no_public/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/normalize_name_git/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/normalize_name_path/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;
 

tests/testsuite/cargo_add/normalize_name_path_existing/mod.rs

@@ -1,7 +1,7 @@
+use crate::prelude::*;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
-use cargo_test_support::prelude::*;
 use cargo_test_support::str;
 use cargo_test_support::Project;