diff --git a/tests/testsuite/advanced_env.rs b/tests/testsuite/advanced_env.rs index d2a117078..56c197863 100644 --- a/tests/testsuite/advanced_env.rs +++ b/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] diff --git a/tests/testsuite/alt_registry.rs b/tests/testsuite/alt_registry.rs index 391dfad1d..139adcb40 100644 --- a/tests/testsuite/alt_registry.rs +++ b/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; diff --git a/tests/testsuite/artifact_dep.rs b/tests/testsuite/artifact_dep.rs index 8ec39d748..a88cf7cbf 100644 --- a/tests/testsuite/artifact_dep.rs +++ b/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::{ diff --git a/tests/testsuite/artifact_dir.rs b/tests/testsuite/artifact_dir.rs index 982c68b61..ea89a7c55 100644 --- a/tests/testsuite/artifact_dir.rs +++ b/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}; diff --git a/tests/testsuite/bad_config.rs b/tests/testsuite/bad_config.rs index baced0c95..18692d620 100644 --- a/tests/testsuite/bad_config.rs +++ b/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}; diff --git a/tests/testsuite/bad_manifest_path.rs b/tests/testsuite/bad_manifest_path.rs index d4cc16fbb..e5cd8ea50 100644 --- a/tests/testsuite/bad_manifest_path.rs +++ b/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] diff --git a/tests/testsuite/bench.rs b/tests/testsuite/bench.rs index 258af709f..a11822a5e 100644 --- a/tests/testsuite/bench.rs +++ b/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")] diff --git a/tests/testsuite/binary_name.rs b/tests/testsuite/binary_name.rs index a26ba9882..f1e04004c 100644 --- a/tests/testsuite/binary_name.rs +++ b/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; diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs index 0ead9eb50..30d8f8765 100644 --- a/tests/testsuite/build.rs +++ b/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::{ diff --git a/tests/testsuite/build_dir.rs b/tests/testsuite/build_dir.rs index 5a0cd6f0a..e6eebaf87 100644 --- a/tests/testsuite/build_dir.rs +++ b/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}; diff --git a/tests/testsuite/build_plan.rs b/tests/testsuite/build_plan.rs index d6eaf87fd..1a3a15fc2 100644 --- a/tests/testsuite/build_plan.rs +++ b/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}; diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs index c8766c958..716c20019 100644 --- a/tests/testsuite/build_script.rs +++ b/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::{ diff --git a/tests/testsuite/build_script_env.rs b/tests/testsuite/build_script_env.rs index db48bcd83..5443ff4bd 100644 --- a/tests/testsuite/build_script_env.rs +++ b/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; diff --git a/tests/testsuite/build_script_extra_link_arg.rs b/tests/testsuite/build_script_extra_link_arg.rs index fc1e03f98..5273d1a08 100644 --- a/tests/testsuite/build_script_extra_link_arg.rs +++ b/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}; diff --git a/tests/testsuite/build_scripts_multiple.rs b/tests/testsuite/build_scripts_multiple.rs index 4f81b8f42..d87f9a2c3 100644 --- a/tests/testsuite/build_scripts_multiple.rs +++ b/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}; diff --git a/tests/testsuite/cache_lock.rs b/tests/testsuite/cache_lock.rs index 3f3710fc7..08f5b9e77 100644 --- a/tests/testsuite/cache_lock.rs +++ b/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; diff --git a/tests/testsuite/cache_messages.rs b/tests/testsuite/cache_messages.rs index ed2a12083..a677225de 100644 --- a/tests/testsuite/cache_messages.rs +++ b/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}; diff --git a/tests/testsuite/cargo/help/mod.rs b/tests/testsuite/cargo/help/mod.rs index e40d56a18..ab26c860c 100644 --- a/tests/testsuite/cargo/help/mod.rs +++ b/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] diff --git a/tests/testsuite/cargo/z_help/mod.rs b/tests/testsuite/cargo/z_help/mod.rs index e89083984..9104d418b 100644 --- a/tests/testsuite/cargo/z_help/mod.rs +++ b/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] diff --git a/tests/testsuite/cargo_add/add_basic/mod.rs b/tests/testsuite/cargo_add/add_basic/mod.rs index 850a4a66b..892fe8429 100644 --- a/tests/testsuite/cargo_add/add_basic/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/add_multiple/mod.rs b/tests/testsuite/cargo_add/add_multiple/mod.rs index 805d0089c..3da73fd43 100644 --- a/tests/testsuite/cargo_add/add_multiple/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/mod.rs b/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/mod.rs index 26f9880be..4e96848b9 100644 --- a/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs b/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs index 7a2772a2a..8fbdfa604 100644 --- a/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/add_toolchain/mod.rs b/tests/testsuite/cargo_add/add_toolchain/mod.rs index 7cfb71a6d..5ff03f976 100644 --- a/tests/testsuite/cargo_add/add_toolchain/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/build/mod.rs b/tests/testsuite/cargo_add/build/mod.rs index f72db7dd4..e82a02db3 100644 --- a/tests/testsuite/cargo_add/build/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs b/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs index be6f2a685..874b3a7c8 100644 --- a/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/change_rename_target/mod.rs b/tests/testsuite/cargo_add/change_rename_target/mod.rs index b60deb2ed..e1cac9a56 100644 --- a/tests/testsuite/cargo_add/change_rename_target/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/cyclic_features/mod.rs b/tests/testsuite/cargo_add/cyclic_features/mod.rs index 275f7acd4..723577c89 100644 --- a/tests/testsuite/cargo_add/cyclic_features/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/default_features/mod.rs b/tests/testsuite/cargo_add/default_features/mod.rs index c08a6bea9..7b471a509 100644 --- a/tests/testsuite/cargo_add/default_features/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/deprecated_default_features/mod.rs b/tests/testsuite/cargo_add/deprecated_default_features/mod.rs index c25d40d22..754276049 100644 --- a/tests/testsuite/cargo_add/deprecated_default_features/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/deprecated_section/mod.rs b/tests/testsuite/cargo_add/deprecated_section/mod.rs index c25d40d22..754276049 100644 --- a/tests/testsuite/cargo_add/deprecated_section/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs index 86545d3f4..5e731c626 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs index 197df7811..7464eeb0d 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs index d9f519322..08c14b97d 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_path_base/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_path_base/mod.rs index 95ecd0d65..bb94303bd 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_path_base/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs index 3d2424ebf..a437b1471 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/dev/mod.rs b/tests/testsuite/cargo_add/dev/mod.rs index 00f9bd8fd..ac4b94936 100644 --- a/tests/testsuite/cargo_add/dev/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/dev_build_conflict/mod.rs b/tests/testsuite/cargo_add/dev_build_conflict/mod.rs index f4bb8786a..c964ef9fa 100644 --- a/tests/testsuite/cargo_add/dev_build_conflict/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/dev_existing_path_base/mod.rs b/tests/testsuite/cargo_add/dev_existing_path_base/mod.rs index 5a4f2c4a9..0cfaea19f 100644 --- a/tests/testsuite/cargo_add/dev_existing_path_base/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs b/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs index 95391cb16..99e43d9f8 100644 --- a/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/dry_run/mod.rs b/tests/testsuite/cargo_add/dry_run/mod.rs index 515e975bc..7983eb286 100644 --- a/tests/testsuite/cargo_add/dry_run/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/empty_dep_name/mod.rs b/tests/testsuite/cargo_add/empty_dep_name/mod.rs index 5e1c51403..c067e3c80 100644 --- a/tests/testsuite/cargo_add/empty_dep_name/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/feature_suggestion_multiple/mod.rs b/tests/testsuite/cargo_add/feature_suggestion_multiple/mod.rs index 898f3aa81..d8653d5e0 100644 --- a/tests/testsuite/cargo_add/feature_suggestion_multiple/mod.rs +++ b/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] diff --git a/tests/testsuite/cargo_add/feature_suggestion_none/mod.rs b/tests/testsuite/cargo_add/feature_suggestion_none/mod.rs index b157660f7..9492d3315 100644 --- a/tests/testsuite/cargo_add/feature_suggestion_none/mod.rs +++ b/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] diff --git a/tests/testsuite/cargo_add/feature_suggestion_single/mod.rs b/tests/testsuite/cargo_add/feature_suggestion_single/mod.rs index 682dd893a..640eeadb4 100644 --- a/tests/testsuite/cargo_add/feature_suggestion_single/mod.rs +++ b/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] diff --git a/tests/testsuite/cargo_add/features/mod.rs b/tests/testsuite/cargo_add/features/mod.rs index 468587d7c..835f5bf15 100644 --- a/tests/testsuite/cargo_add/features/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs b/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs index 41075a98a..c89a98e7a 100644 --- a/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs b/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs index cce0d9042..714c40f29 100644 --- a/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/features_empty/mod.rs b/tests/testsuite/cargo_add/features_empty/mod.rs index f7071d44d..33cf4bba1 100644 --- a/tests/testsuite/cargo_add/features_empty/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/features_error_activated_over_limit/mod.rs b/tests/testsuite/cargo_add/features_error_activated_over_limit/mod.rs index 5be109b87..0905763e1 100644 --- a/tests/testsuite/cargo_add/features_error_activated_over_limit/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/features_error_deactivated_over_limit/mod.rs b/tests/testsuite/cargo_add/features_error_deactivated_over_limit/mod.rs index 9724b2c51..c7c4250ff 100644 --- a/tests/testsuite/cargo_add/features_error_deactivated_over_limit/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs b/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs index e149dc009..e17937f8e 100644 --- a/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/features_preserve/mod.rs b/tests/testsuite/cargo_add/features_preserve/mod.rs index 0434d5bce..e994cf9ae 100644 --- a/tests/testsuite/cargo_add/features_preserve/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/features_spaced_values/mod.rs b/tests/testsuite/cargo_add/features_spaced_values/mod.rs index 4a689e723..2709f5cf6 100644 --- a/tests/testsuite/cargo_add/features_spaced_values/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/features_unknown/mod.rs b/tests/testsuite/cargo_add/features_unknown/mod.rs index dc60e5dac..1f794ccc1 100644 --- a/tests/testsuite/cargo_add/features_unknown/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs b/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs index b0e229d8d..055d86cb1 100644 --- a/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/git/mod.rs b/tests/testsuite/cargo_add/git/mod.rs index cd8e4c388..9703b99b9 100644 --- a/tests/testsuite/cargo_add/git/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/git_branch/mod.rs b/tests/testsuite/cargo_add/git_branch/mod.rs index e0b7049be..c1dd818e1 100644 --- a/tests/testsuite/cargo_add/git_branch/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs b/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs index f0f031e8e..7cf4c3674 100644 --- a/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/git_dev/mod.rs b/tests/testsuite/cargo_add/git_dev/mod.rs index c0f6c6972..90c4037b7 100644 --- a/tests/testsuite/cargo_add/git_dev/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/git_inferred_name/mod.rs b/tests/testsuite/cargo_add/git_inferred_name/mod.rs index d11d31986..c05f1e2d4 100644 --- a/tests/testsuite/cargo_add/git_inferred_name/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs b/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs index 0ee595b87..1139c3101 100644 --- a/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/git_multiple_names/mod.rs b/tests/testsuite/cargo_add/git_multiple_names/mod.rs index 1747b81f0..069011402 100644 --- a/tests/testsuite/cargo_add/git_multiple_names/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs b/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs index 18c7ce4a5..ba23de0e5 100644 --- a/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/git_registry/mod.rs b/tests/testsuite/cargo_add/git_registry/mod.rs index b1e5e6246..7783e9f6d 100644 --- a/tests/testsuite/cargo_add/git_registry/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/git_rev/mod.rs b/tests/testsuite/cargo_add/git_rev/mod.rs index 3cd5759bf..56999d86e 100644 --- a/tests/testsuite/cargo_add/git_rev/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/git_tag/mod.rs b/tests/testsuite/cargo_add/git_tag/mod.rs index a29ae6d7d..419808a7d 100644 --- a/tests/testsuite/cargo_add/git_tag/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/help/mod.rs b/tests/testsuite/cargo_add/help/mod.rs index a93be5e5d..db3f96c25 100644 --- a/tests/testsuite/cargo_add/help/mod.rs +++ b/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] diff --git a/tests/testsuite/cargo_add/infer_prerelease/mod.rs b/tests/testsuite/cargo_add/infer_prerelease/mod.rs index eb9842b2d..d8e2479bf 100644 --- a/tests/testsuite/cargo_add/infer_prerelease/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/invalid_arg/mod.rs b/tests/testsuite/cargo_add/invalid_arg/mod.rs index c8ef1f756..b22cb8cfa 100644 --- a/tests/testsuite/cargo_add/invalid_arg/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/invalid_git_name/mod.rs b/tests/testsuite/cargo_add/invalid_git_name/mod.rs index 0a923250f..e1106b594 100644 --- a/tests/testsuite/cargo_add/invalid_git_name/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs index fb0e0a16c..ce7f8b8ab 100644 --- a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs index fb0e0a16c..ce7f8b8ab 100644 --- a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs index e7acbf0f4..4590f3503 100644 --- a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/invalid_manifest/mod.rs b/tests/testsuite/cargo_add/invalid_manifest/mod.rs index f404cd2c7..dc9604886 100644 --- a/tests/testsuite/cargo_add/invalid_manifest/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/invalid_name_external/mod.rs b/tests/testsuite/cargo_add/invalid_name_external/mod.rs index c15f9158c..f12920a95 100644 --- a/tests/testsuite/cargo_add/invalid_name_external/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/invalid_path/mod.rs b/tests/testsuite/cargo_add/invalid_path/mod.rs index d19260496..13cb53be4 100644 --- a/tests/testsuite/cargo_add/invalid_path/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/invalid_path_name/mod.rs b/tests/testsuite/cargo_add/invalid_path_name/mod.rs index 92319f791..54106ac30 100644 --- a/tests/testsuite/cargo_add/invalid_path_name/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/invalid_path_self/mod.rs b/tests/testsuite/cargo_add/invalid_path_self/mod.rs index 9397c5a6c..05161bf7c 100644 --- a/tests/testsuite/cargo_add/invalid_path_self/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/invalid_target_empty/mod.rs b/tests/testsuite/cargo_add/invalid_target_empty/mod.rs index b3184089e..349acecca 100644 --- a/tests/testsuite/cargo_add/invalid_target_empty/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/invalid_vers/mod.rs b/tests/testsuite/cargo_add/invalid_vers/mod.rs index 812be6142..f8f6fcc3b 100644 --- a/tests/testsuite/cargo_add/invalid_vers/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/list_features/mod.rs b/tests/testsuite/cargo_add/list_features/mod.rs index 891e0c332..a3dce3e62 100644 --- a/tests/testsuite/cargo_add/list_features/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/list_features_path/mod.rs b/tests/testsuite/cargo_add/list_features_path/mod.rs index 401a52f45..e60db0b43 100644 --- a/tests/testsuite/cargo_add/list_features_path/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs b/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs index e6172c001..0e670f886 100644 --- a/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/locked_changed/mod.rs b/tests/testsuite/cargo_add/locked_changed/mod.rs index 4f3f675c5..39db9f90c 100644 --- a/tests/testsuite/cargo_add/locked_changed/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/locked_unchanged/mod.rs b/tests/testsuite/cargo_add/locked_unchanged/mod.rs index 79c44a182..45674af0d 100644 --- a/tests/testsuite/cargo_add/locked_unchanged/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/lockfile_updated/mod.rs b/tests/testsuite/cargo_add/lockfile_updated/mod.rs index e256189bf..fb83f94a2 100644 --- a/tests/testsuite/cargo_add/lockfile_updated/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/manifest_path_package/mod.rs b/tests/testsuite/cargo_add/manifest_path_package/mod.rs index 8f8732fd4..17b12b737 100644 --- a/tests/testsuite/cargo_add/manifest_path_package/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/merge_activated_features/mod.rs b/tests/testsuite/cargo_add/merge_activated_features/mod.rs index 385046d04..dc8abb925 100644 --- a/tests/testsuite/cargo_add/merge_activated_features/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/missing_at_in_crate_spec/mod.rs b/tests/testsuite/cargo_add/missing_at_in_crate_spec/mod.rs index 7ccc5d7aa..e5d718117 100644 --- a/tests/testsuite/cargo_add/missing_at_in_crate_spec/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs b/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs index ceea4f171..cf4355e9e 100644 --- a/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs index 3ff29dc33..5679729c9 100644 --- a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/namever/mod.rs b/tests/testsuite/cargo_add/namever/mod.rs index 05dc7b6b1..48caff404 100644 --- a/tests/testsuite/cargo_add/namever/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/no_args/mod.rs b/tests/testsuite/cargo_add/no_args/mod.rs index c525cba65..770bca573 100644 --- a/tests/testsuite/cargo_add/no_args/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/no_default_features/mod.rs b/tests/testsuite/cargo_add/no_default_features/mod.rs index 73ff19a5b..2ede55bd7 100644 --- a/tests/testsuite/cargo_add/no_default_features/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/no_optional/mod.rs b/tests/testsuite/cargo_add/no_optional/mod.rs index 9f4f9e643..0045cf8dd 100644 --- a/tests/testsuite/cargo_add/no_optional/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/no_public/mod.rs b/tests/testsuite/cargo_add/no_public/mod.rs index 360bac45e..0f290913d 100644 --- a/tests/testsuite/cargo_add/no_public/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/normalize_name_git/mod.rs b/tests/testsuite/cargo_add/normalize_name_git/mod.rs index 739468a65..bb14c009a 100644 --- a/tests/testsuite/cargo_add/normalize_name_git/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/normalize_name_path/mod.rs b/tests/testsuite/cargo_add/normalize_name_path/mod.rs index 717be7aa3..01530851c 100644 --- a/tests/testsuite/cargo_add/normalize_name_path/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/normalize_name_path_existing/mod.rs b/tests/testsuite/cargo_add/normalize_name_path_existing/mod.rs index ef4f35704..c3b11fc87 100644 --- a/tests/testsuite/cargo_add/normalize_name_path_existing/mod.rs +++ b/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; diff --git a/tests/testsuite/cargo_add/normalize_name_registry/mod.rs b/tests/testsuite/cargo_add/normalize_name_registry/mod.rs index 23c1c5053..b07bf58dd 100644 --- a/tests/testsuite/cargo_add/normalize_name_registry/mod.rs +++ b/tests/testsuite/cargo_add/normalize_name_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; diff --git a/tests/testsuite/cargo_add/normalize_name_registry_existing/mod.rs b/tests/testsuite/cargo_add/normalize_name_registry_existing/mod.rs index f5d96445b..c20857a1b 100644 --- a/tests/testsuite/cargo_add/normalize_name_registry_existing/mod.rs +++ b/tests/testsuite/cargo_add/normalize_name_registry_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; diff --git a/tests/testsuite/cargo_add/normalize_name_registry_yanked/mod.rs b/tests/testsuite/cargo_add/normalize_name_registry_yanked/mod.rs index 4b3bedb34..07e091e2d 100644 --- a/tests/testsuite/cargo_add/normalize_name_registry_yanked/mod.rs +++ b/tests/testsuite/cargo_add/normalize_name_registry_yanked/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; diff --git a/tests/testsuite/cargo_add/normalize_name_workspace_dep/mod.rs b/tests/testsuite/cargo_add/normalize_name_workspace_dep/mod.rs index 27c061228..f83f68177 100644 --- a/tests/testsuite/cargo_add/normalize_name_workspace_dep/mod.rs +++ b/tests/testsuite/cargo_add/normalize_name_workspace_dep/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::registry::Package; use cargo_test_support::str; use cargo_test_support::Project; diff --git a/tests/testsuite/cargo_add/offline_empty_cache/mod.rs b/tests/testsuite/cargo_add/offline_empty_cache/mod.rs index 819e017f7..6142104d5 100644 --- a/tests/testsuite/cargo_add/offline_empty_cache/mod.rs +++ b/tests/testsuite/cargo_add/offline_empty_cache/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; diff --git a/tests/testsuite/cargo_add/optional/mod.rs b/tests/testsuite/cargo_add/optional/mod.rs index 425eceaec..ee10559fc 100644 --- a/tests/testsuite/cargo_add/optional/mod.rs +++ b/tests/testsuite/cargo_add/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; diff --git a/tests/testsuite/cargo_add/overwrite_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_default_features/mod.rs index c08a6bea9..7b471a509 100644 --- a/tests/testsuite/cargo_add/overwrite_default_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_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; diff --git a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs index 73ff19a5b..2ede55bd7 100644 --- a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_default_features_with_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; diff --git a/tests/testsuite/cargo_add/overwrite_features/mod.rs b/tests/testsuite/cargo_add/overwrite_features/mod.rs index 5a16c2416..1a2d5d9f5 100644 --- a/tests/testsuite/cargo_add/overwrite_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_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; diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs b/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs index 3729f9946..70ad8f668 100644 --- a/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_git_with_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; diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs index 86545d3f4..5e731c626 100644 --- a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/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; diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs index 86545d3f4..5e731c626 100644 --- a/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inherit_noop/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; diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs index 86545d3f4..5e731c626 100644 --- a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/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; diff --git a/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs b/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs index 212dba2ca..a9a4f56d3 100644 --- a/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inline_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; diff --git a/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs index 9ce9a97f7..14e202faa 100644 --- a/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_name_dev_noop/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; diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs index e735c848a..ea9ca55ee 100644 --- a/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_name_noop/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; diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs index 73ff19a5b..2ede55bd7 100644 --- a/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_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; diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/mod.rs index c08a6bea9..7b471a509 100644 --- a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_no_default_features_with_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; diff --git a/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs index 9f4f9e643..0045cf8dd 100644 --- a/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_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; diff --git a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs index 425eceaec..ee10559fc 100644 --- a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_no_optional_with_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; diff --git a/tests/testsuite/cargo_add/overwrite_no_public/mod.rs b/tests/testsuite/cargo_add/overwrite_no_public/mod.rs index 360bac45e..0f290913d 100644 --- a/tests/testsuite/cargo_add/overwrite_no_public/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_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; diff --git a/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs b/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs index 7bee1aa5c..0e71adfee 100644 --- a/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_no_public_with_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; diff --git a/tests/testsuite/cargo_add/overwrite_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional/mod.rs index 425eceaec..ee10559fc 100644 --- a/tests/testsuite/cargo_add/overwrite_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_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; diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs index 917125c78..2cea656ff 100644 --- a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_optional_with_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; diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs index d36043479..b096947fc 100644 --- a/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_optional_with_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; diff --git a/tests/testsuite/cargo_add/overwrite_path_base_with_version/mod.rs b/tests/testsuite/cargo_add/overwrite_path_base_with_version/mod.rs index ade44c07b..51c58b4be 100644 --- a/tests/testsuite/cargo_add/overwrite_path_base_with_version/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_path_base_with_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; diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs index 3a1c58bb5..c3363472c 100644 --- a/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_path_noop/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; diff --git a/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs b/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs index a25883cb0..0e8999c67 100644 --- a/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_path_with_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; diff --git a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs index 5a16c2416..1a2d5d9f5 100644 --- a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/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; diff --git a/tests/testsuite/cargo_add/overwrite_public/mod.rs b/tests/testsuite/cargo_add/overwrite_public/mod.rs index 7bee1aa5c..0e71adfee 100644 --- a/tests/testsuite/cargo_add/overwrite_public/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_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; diff --git a/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs b/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs index 360bac45e..0f290913d 100644 --- a/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_public_with_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; diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs index e253892b6..76bd0d150 100644 --- a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_rename_with_no_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; diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs index f38df3033..ab70f5790 100644 --- a/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_rename_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; diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs index 2708ad8c0..3c3ed9a02 100644 --- a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/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; diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs b/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs index 43ab3b667..6300c30c0 100644 --- a/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_version_with_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; diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs b/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs index 3729f9946..70ad8f668 100644 --- a/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_version_with_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; diff --git a/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs index 05f9ed762..f9bc623e2 100644 --- a/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_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; diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs b/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs index cfd8fcb62..cff5e1885 100644 --- a/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_workspace_dep/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; diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs index cfd8fcb62..cff5e1885 100644 --- a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_workspace_dep_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; diff --git a/tests/testsuite/cargo_add/path/mod.rs b/tests/testsuite/cargo_add/path/mod.rs index 3729f9946..70ad8f668 100644 --- a/tests/testsuite/cargo_add/path/mod.rs +++ b/tests/testsuite/cargo_add/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; diff --git a/tests/testsuite/cargo_add/path_base/mod.rs b/tests/testsuite/cargo_add/path_base/mod.rs index f94d96523..fb4797cf1 100644 --- a/tests/testsuite/cargo_add/path_base/mod.rs +++ b/tests/testsuite/cargo_add/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; diff --git a/tests/testsuite/cargo_add/path_base_inferred_name/mod.rs b/tests/testsuite/cargo_add/path_base_inferred_name/mod.rs index e65bca79f..b121f1020 100644 --- a/tests/testsuite/cargo_add/path_base_inferred_name/mod.rs +++ b/tests/testsuite/cargo_add/path_base_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; diff --git a/tests/testsuite/cargo_add/path_base_missing_base_path/mod.rs b/tests/testsuite/cargo_add/path_base_missing_base_path/mod.rs index 065aa1dfe..c86dd845b 100644 --- a/tests/testsuite/cargo_add/path_base_missing_base_path/mod.rs +++ b/tests/testsuite/cargo_add/path_base_missing_base_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; diff --git a/tests/testsuite/cargo_add/path_base_unstable/mod.rs b/tests/testsuite/cargo_add/path_base_unstable/mod.rs index aec0e7ce1..4bc3cad56 100644 --- a/tests/testsuite/cargo_add/path_base_unstable/mod.rs +++ b/tests/testsuite/cargo_add/path_base_unstable/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; diff --git a/tests/testsuite/cargo_add/path_dev/mod.rs b/tests/testsuite/cargo_add/path_dev/mod.rs index 49b7901c6..7d20146da 100644 --- a/tests/testsuite/cargo_add/path_dev/mod.rs +++ b/tests/testsuite/cargo_add/path_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; diff --git a/tests/testsuite/cargo_add/path_inferred_name/mod.rs b/tests/testsuite/cargo_add/path_inferred_name/mod.rs index ca77e190e..e946f7014 100644 --- a/tests/testsuite/cargo_add/path_inferred_name/mod.rs +++ b/tests/testsuite/cargo_add/path_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; diff --git a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs index 18ee86c93..a4731871f 100644 --- a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs +++ b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/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; diff --git a/tests/testsuite/cargo_add/prefixed_v_in_version/mod.rs b/tests/testsuite/cargo_add/prefixed_v_in_version/mod.rs index e36b65242..dbfa940d6 100644 --- a/tests/testsuite/cargo_add/prefixed_v_in_version/mod.rs +++ b/tests/testsuite/cargo_add/prefixed_v_in_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; diff --git a/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs b/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs index 7c3381f3e..8dcf5e554 100644 --- a/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs +++ b/tests/testsuite/cargo_add/preserve_dep_std_table/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; diff --git a/tests/testsuite/cargo_add/preserve_features_sorted/mod.rs b/tests/testsuite/cargo_add/preserve_features_sorted/mod.rs index c82c4a0a0..7da097839 100644 --- a/tests/testsuite/cargo_add/preserve_features_sorted/mod.rs +++ b/tests/testsuite/cargo_add/preserve_features_sorted/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; diff --git a/tests/testsuite/cargo_add/preserve_features_table/mod.rs b/tests/testsuite/cargo_add/preserve_features_table/mod.rs index 7c3381f3e..8dcf5e554 100644 --- a/tests/testsuite/cargo_add/preserve_features_table/mod.rs +++ b/tests/testsuite/cargo_add/preserve_features_table/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; diff --git a/tests/testsuite/cargo_add/preserve_features_unsorted/mod.rs b/tests/testsuite/cargo_add/preserve_features_unsorted/mod.rs index d78863863..53d826ef5 100644 --- a/tests/testsuite/cargo_add/preserve_features_unsorted/mod.rs +++ b/tests/testsuite/cargo_add/preserve_features_unsorted/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; diff --git a/tests/testsuite/cargo_add/preserve_sorted/mod.rs b/tests/testsuite/cargo_add/preserve_sorted/mod.rs index 40bc43e82..618056956 100644 --- a/tests/testsuite/cargo_add/preserve_sorted/mod.rs +++ b/tests/testsuite/cargo_add/preserve_sorted/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; diff --git a/tests/testsuite/cargo_add/preserve_unsorted/mod.rs b/tests/testsuite/cargo_add/preserve_unsorted/mod.rs index 40bc43e82..618056956 100644 --- a/tests/testsuite/cargo_add/preserve_unsorted/mod.rs +++ b/tests/testsuite/cargo_add/preserve_unsorted/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; diff --git a/tests/testsuite/cargo_add/public/mod.rs b/tests/testsuite/cargo_add/public/mod.rs index 7bee1aa5c..0e71adfee 100644 --- a/tests/testsuite/cargo_add/public/mod.rs +++ b/tests/testsuite/cargo_add/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; diff --git a/tests/testsuite/cargo_add/quiet/mod.rs b/tests/testsuite/cargo_add/quiet/mod.rs index 7c409b617..5c8797e6f 100644 --- a/tests/testsuite/cargo_add/quiet/mod.rs +++ b/tests/testsuite/cargo_add/quiet/mod.rs @@ -1,6 +1,6 @@ +use crate::prelude::*; use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; -use cargo_test_support::prelude::*; use cargo_test_support::str; use cargo_test_support::Project; diff --git a/tests/testsuite/cargo_add/registry/mod.rs b/tests/testsuite/cargo_add/registry/mod.rs index db8f79b8e..34452e76d 100644 --- a/tests/testsuite/cargo_add/registry/mod.rs +++ b/tests/testsuite/cargo_add/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; diff --git a/tests/testsuite/cargo_add/rename/mod.rs b/tests/testsuite/cargo_add/rename/mod.rs index c27075ae0..8a5eb9fab 100644 --- a/tests/testsuite/cargo_add/rename/mod.rs +++ b/tests/testsuite/cargo_add/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; diff --git a/tests/testsuite/cargo_add/require_weak/mod.rs b/tests/testsuite/cargo_add/require_weak/mod.rs index 7c3381f3e..8dcf5e554 100644 --- a/tests/testsuite/cargo_add/require_weak/mod.rs +++ b/tests/testsuite/cargo_add/require_weak/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; diff --git a/tests/testsuite/cargo_add/rust_version_ignore/mod.rs b/tests/testsuite/cargo_add/rust_version_ignore/mod.rs index 39ed54242..fc3c3ffd5 100644 --- a/tests/testsuite/cargo_add/rust_version_ignore/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_ignore/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; diff --git a/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs b/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs index 09d9358c8..dd624909d 100644 --- a/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_incompatible/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; diff --git a/tests/testsuite/cargo_add/rust_version_latest/mod.rs b/tests/testsuite/cargo_add/rust_version_latest/mod.rs index b84c9d339..8373934f1 100644 --- a/tests/testsuite/cargo_add/rust_version_latest/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_latest/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; diff --git a/tests/testsuite/cargo_add/rust_version_older/mod.rs b/tests/testsuite/cargo_add/rust_version_older/mod.rs index b84c9d339..8373934f1 100644 --- a/tests/testsuite/cargo_add/rust_version_older/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_older/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; diff --git a/tests/testsuite/cargo_add/rustc_ignore/mod.rs b/tests/testsuite/cargo_add/rustc_ignore/mod.rs index 4eb3ca475..0257f8f42 100644 --- a/tests/testsuite/cargo_add/rustc_ignore/mod.rs +++ b/tests/testsuite/cargo_add/rustc_ignore/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; diff --git a/tests/testsuite/cargo_add/rustc_incompatible/mod.rs b/tests/testsuite/cargo_add/rustc_incompatible/mod.rs index 6ce13b064..a9a325623 100644 --- a/tests/testsuite/cargo_add/rustc_incompatible/mod.rs +++ b/tests/testsuite/cargo_add/rustc_incompatible/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; diff --git a/tests/testsuite/cargo_add/rustc_latest/mod.rs b/tests/testsuite/cargo_add/rustc_latest/mod.rs index 289bb8cec..e50a942b7 100644 --- a/tests/testsuite/cargo_add/rustc_latest/mod.rs +++ b/tests/testsuite/cargo_add/rustc_latest/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; diff --git a/tests/testsuite/cargo_add/rustc_older/mod.rs b/tests/testsuite/cargo_add/rustc_older/mod.rs index 289bb8cec..e50a942b7 100644 --- a/tests/testsuite/cargo_add/rustc_older/mod.rs +++ b/tests/testsuite/cargo_add/rustc_older/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; diff --git a/tests/testsuite/cargo_add/script_bare/mod.rs b/tests/testsuite/cargo_add/script_bare/mod.rs index ffa6db6c6..de0df5339 100644 --- a/tests/testsuite/cargo_add/script_bare/mod.rs +++ b/tests/testsuite/cargo_add/script_bare/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; diff --git a/tests/testsuite/cargo_add/script_frontmatter/mod.rs b/tests/testsuite/cargo_add/script_frontmatter/mod.rs index ffa6db6c6..de0df5339 100644 --- a/tests/testsuite/cargo_add/script_frontmatter/mod.rs +++ b/tests/testsuite/cargo_add/script_frontmatter/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; diff --git a/tests/testsuite/cargo_add/script_shebang/mod.rs b/tests/testsuite/cargo_add/script_shebang/mod.rs index ffa6db6c6..de0df5339 100644 --- a/tests/testsuite/cargo_add/script_shebang/mod.rs +++ b/tests/testsuite/cargo_add/script_shebang/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; diff --git a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs index 2e11221b0..a21444f0a 100644 --- a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs +++ b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/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; diff --git a/tests/testsuite/cargo_add/symlink.rs b/tests/testsuite/cargo_add/symlink.rs index 6b9f92f50..37669fb97 100644 --- a/tests/testsuite/cargo_add/symlink.rs +++ b/tests/testsuite/cargo_add/symlink.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::registry; use std::fs; diff --git a/tests/testsuite/cargo_add/target/mod.rs b/tests/testsuite/cargo_add/target/mod.rs index 57618e0f8..0b7852fcd 100644 --- a/tests/testsuite/cargo_add/target/mod.rs +++ b/tests/testsuite/cargo_add/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; diff --git a/tests/testsuite/cargo_add/target_cfg/mod.rs b/tests/testsuite/cargo_add/target_cfg/mod.rs index 90acfc246..069cb3f9e 100644 --- a/tests/testsuite/cargo_add/target_cfg/mod.rs +++ b/tests/testsuite/cargo_add/target_cfg/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; diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs b/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs index 000138fdc..13bf13e0c 100644 --- a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs +++ b/tests/testsuite/cargo_add/unknown_inherited_feature/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; diff --git a/tests/testsuite/cargo_add/vers/mod.rs b/tests/testsuite/cargo_add/vers/mod.rs index 6bf38dbf1..e428a6b61 100644 --- a/tests/testsuite/cargo_add/vers/mod.rs +++ b/tests/testsuite/cargo_add/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; diff --git a/tests/testsuite/cargo_add/workspace_name/mod.rs b/tests/testsuite/cargo_add/workspace_name/mod.rs index fabd90820..5efec4fca 100644 --- a/tests/testsuite/cargo_add/workspace_name/mod.rs +++ b/tests/testsuite/cargo_add/workspace_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; diff --git a/tests/testsuite/cargo_add/workspace_path/mod.rs b/tests/testsuite/cargo_add/workspace_path/mod.rs index 3729f9946..70ad8f668 100644 --- a/tests/testsuite/cargo_add/workspace_path/mod.rs +++ b/tests/testsuite/cargo_add/workspace_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; diff --git a/tests/testsuite/cargo_add/workspace_path_dev/mod.rs b/tests/testsuite/cargo_add/workspace_path_dev/mod.rs index 49b7901c6..7d20146da 100644 --- a/tests/testsuite/cargo_add/workspace_path_dev/mod.rs +++ b/tests/testsuite/cargo_add/workspace_path_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; diff --git a/tests/testsuite/cargo_add/yanked/mod.rs b/tests/testsuite/cargo_add/yanked/mod.rs index 050943fe8..01640226b 100644 --- a/tests/testsuite/cargo_add/yanked/mod.rs +++ b/tests/testsuite/cargo_add/yanked/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; diff --git a/tests/testsuite/cargo_alias_config.rs b/tests/testsuite/cargo_alias_config.rs index 0d2074561..e3d2a27c3 100644 --- a/tests/testsuite/cargo_alias_config.rs +++ b/tests/testsuite/cargo_alias_config.rs @@ -2,8 +2,8 @@ use std::env; +use crate::prelude::*; use crate::utils::tools::echo_subcommand; -use cargo_test_support::prelude::*; use cargo_test_support::str; use cargo_test_support::{basic_bin_manifest, project}; diff --git a/tests/testsuite/cargo_bench/help/mod.rs b/tests/testsuite/cargo_bench/help/mod.rs index 36bef3f10..44e7d3853 100644 --- a/tests/testsuite/cargo_bench/help/mod.rs +++ b/tests/testsuite/cargo_bench/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] diff --git a/tests/testsuite/cargo_bench/no_keep_going/mod.rs b/tests/testsuite/cargo_bench/no_keep_going/mod.rs index 5426cc6b1..24323087f 100644 --- a/tests/testsuite/cargo_bench/no_keep_going/mod.rs +++ b/tests/testsuite/cargo_bench/no_keep_going/mod.rs @@ -1,8 +1,7 @@ +use crate::prelude::*; 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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_build/help/mod.rs b/tests/testsuite/cargo_build/help/mod.rs index 0dbecdcfe..8a699f55c 100644 --- a/tests/testsuite/cargo_build/help/mod.rs +++ b/tests/testsuite/cargo_build/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] diff --git a/tests/testsuite/cargo_check/help/mod.rs b/tests/testsuite/cargo_check/help/mod.rs index b5836078c..4339971ac 100644 --- a/tests/testsuite/cargo_check/help/mod.rs +++ b/tests/testsuite/cargo_check/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] diff --git a/tests/testsuite/cargo_clean/help/mod.rs b/tests/testsuite/cargo_clean/help/mod.rs index 2b4679ba7..bd928bb75 100644 --- a/tests/testsuite/cargo_clean/help/mod.rs +++ b/tests/testsuite/cargo_clean/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] diff --git a/tests/testsuite/cargo_command.rs b/tests/testsuite/cargo_command.rs index 3fbb975df..a84e26f3a 100644 --- a/tests/testsuite/cargo_command.rs +++ b/tests/testsuite/cargo_command.rs @@ -7,9 +7,9 @@ use std::path::{Path, PathBuf}; use std::process::Stdio; use std::str; +use crate::prelude::*; use crate::utils::tools::echo_subcommand; use cargo_test_support::basic_manifest; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::rustc_host; use cargo_test_support::str; diff --git a/tests/testsuite/cargo_config/help/mod.rs b/tests/testsuite/cargo_config/help/mod.rs index c1f51f970..d463a6a54 100644 --- a/tests/testsuite/cargo_config/help/mod.rs +++ b/tests/testsuite/cargo_config/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] diff --git a/tests/testsuite/cargo_config/mod.rs b/tests/testsuite/cargo_config/mod.rs index 174fb1841..5346a7c02 100644 --- a/tests/testsuite/cargo_config/mod.rs +++ b/tests/testsuite/cargo_config/mod.rs @@ -1,8 +1,8 @@ //! Tests for the `cargo config` command. use super::config::write_config_at; +use crate::prelude::*; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::str; use std::fs; use std::path::PathBuf; diff --git a/tests/testsuite/cargo_doc/help/mod.rs b/tests/testsuite/cargo_doc/help/mod.rs index 3f9f6a6df..294a1aa6c 100644 --- a/tests/testsuite/cargo_doc/help/mod.rs +++ b/tests/testsuite/cargo_doc/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] diff --git a/tests/testsuite/cargo_env_config.rs b/tests/testsuite/cargo_env_config.rs index 5f420d311..1a0c4bc39 100644 --- a/tests/testsuite/cargo_env_config.rs +++ b/tests/testsuite/cargo_env_config.rs @@ -1,7 +1,7 @@ //! Tests for `[env]` config. +use crate::prelude::*; use cargo_test_support::basic_manifest; -use cargo_test_support::prelude::*; use cargo_test_support::str; use cargo_test_support::{basic_bin_manifest, project}; diff --git a/tests/testsuite/cargo_features.rs b/tests/testsuite/cargo_features.rs index ac99a603e..ba649b3d4 100644 --- a/tests/testsuite/cargo_features.rs +++ b/tests/testsuite/cargo_features.rs @@ -1,6 +1,6 @@ //! Tests for `cargo-features` definitions. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; use cargo_test_support::{project, registry}; diff --git a/tests/testsuite/cargo_fetch/help/mod.rs b/tests/testsuite/cargo_fetch/help/mod.rs index 1f341daf5..26aec6c66 100644 --- a/tests/testsuite/cargo_fetch/help/mod.rs +++ b/tests/testsuite/cargo_fetch/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] diff --git a/tests/testsuite/cargo_fix/help/mod.rs b/tests/testsuite/cargo_fix/help/mod.rs index 22b3fdf14..32089b393 100644 --- a/tests/testsuite/cargo_fix/help/mod.rs +++ b/tests/testsuite/cargo_fix/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] diff --git a/tests/testsuite/cargo_generate_lockfile/help/mod.rs b/tests/testsuite/cargo_generate_lockfile/help/mod.rs index c2fbbfa6a..3f305a378 100644 --- a/tests/testsuite/cargo_generate_lockfile/help/mod.rs +++ b/tests/testsuite/cargo_generate_lockfile/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] diff --git a/tests/testsuite/cargo_git_checkout/help/mod.rs b/tests/testsuite/cargo_git_checkout/help/mod.rs index 5828fcadf..352bae86a 100644 --- a/tests/testsuite/cargo_git_checkout/help/mod.rs +++ b/tests/testsuite/cargo_git_checkout/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] diff --git a/tests/testsuite/cargo_help/help/mod.rs b/tests/testsuite/cargo_help/help/mod.rs index f5db7e12b..cd633c9e9 100644 --- a/tests/testsuite/cargo_help/help/mod.rs +++ b/tests/testsuite/cargo_help/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] diff --git a/tests/testsuite/cargo_info/basic/mod.rs b/tests/testsuite/cargo_info/basic/mod.rs index dd10058db..b14cfd331 100644 --- a/tests/testsuite/cargo_info/basic/mod.rs +++ b/tests/testsuite/cargo_info/basic/mod.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo_test_support::file; -use cargo_test_support::prelude::*; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/features/mod.rs b/tests/testsuite/cargo_info/features/mod.rs index 303b589a8..7b4592e57 100644 --- a/tests/testsuite/cargo_info/features/mod.rs +++ b/tests/testsuite/cargo_info/features/mod.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo_test_support::file; -use cargo_test_support::prelude::*; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/features_activated_over_limit/mod.rs b/tests/testsuite/cargo_info/features_activated_over_limit/mod.rs index 49fadef3e..d11621588 100644 --- a/tests/testsuite/cargo_info/features_activated_over_limit/mod.rs +++ b/tests/testsuite/cargo_info/features_activated_over_limit/mod.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo_test_support::file; -use cargo_test_support::prelude::*; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/features_activated_over_limit_verbose/mod.rs b/tests/testsuite/cargo_info/features_activated_over_limit_verbose/mod.rs index 95b4dfdb7..13357424c 100644 --- a/tests/testsuite/cargo_info/features_activated_over_limit_verbose/mod.rs +++ b/tests/testsuite/cargo_info/features_activated_over_limit_verbose/mod.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo_test_support::file; -use cargo_test_support::prelude::*; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/features_deactivated_over_limit/mod.rs b/tests/testsuite/cargo_info/features_deactivated_over_limit/mod.rs index ad6bfa03c..f5b73b529 100644 --- a/tests/testsuite/cargo_info/features_deactivated_over_limit/mod.rs +++ b/tests/testsuite/cargo_info/features_deactivated_over_limit/mod.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo_test_support::file; -use cargo_test_support::prelude::*; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/git_dependency/mod.rs b/tests/testsuite/cargo_info/git_dependency/mod.rs index 5872aee30..eaf5c800d 100644 --- a/tests/testsuite/cargo_info/git_dependency/mod.rs +++ b/tests/testsuite/cargo_info/git_dependency/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{basic_manifest, file, git, project}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/help/mod.rs b/tests/testsuite/cargo_info/help/mod.rs index edaa377d5..8b1959634 100644 --- a/tests/testsuite/cargo_info/help/mod.rs +++ b/tests/testsuite/cargo_info/help/mod.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo_test_support::file; -use cargo_test_support::prelude::*; #[cargo_test] fn case() { diff --git a/tests/testsuite/cargo_info/not_found/mod.rs b/tests/testsuite/cargo_info/not_found/mod.rs index bccfe0345..d229b5c1b 100644 --- a/tests/testsuite/cargo_info/not_found/mod.rs +++ b/tests/testsuite/cargo_info/not_found/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{compare::assert_ui, current_dir, file, Project}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/path_dependency/mod.rs b/tests/testsuite/cargo_info/path_dependency/mod.rs index 3c0868953..5e8e87857 100644 --- a/tests/testsuite/cargo_info/path_dependency/mod.rs +++ b/tests/testsuite/cargo_info/path_dependency/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{compare::assert_ui, current_dir, file, Project}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/pick_msrv_compatible_package/mod.rs b/tests/testsuite/cargo_info/pick_msrv_compatible_package/mod.rs index 87f9f2aa4..6b9e6dc62 100644 --- a/tests/testsuite/cargo_info/pick_msrv_compatible_package/mod.rs +++ b/tests/testsuite/cargo_info/pick_msrv_compatible_package/mod.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo_test_support::file; -use cargo_test_support::prelude::*; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/pick_msrv_compatible_package_within_ws/mod.rs b/tests/testsuite/cargo_info/pick_msrv_compatible_package_within_ws/mod.rs index b662a8fd5..65562125b 100644 --- a/tests/testsuite/cargo_info/pick_msrv_compatible_package_within_ws/mod.rs +++ b/tests/testsuite/cargo_info/pick_msrv_compatible_package_within_ws/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{compare::assert_ui, current_dir, file, Project}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/pick_msrv_compatible_package_within_ws_and_use_msrv_from_ws/mod.rs b/tests/testsuite/cargo_info/pick_msrv_compatible_package_within_ws_and_use_msrv_from_ws/mod.rs index 0a57bb395..99931b4be 100644 --- a/tests/testsuite/cargo_info/pick_msrv_compatible_package_within_ws_and_use_msrv_from_ws/mod.rs +++ b/tests/testsuite/cargo_info/pick_msrv_compatible_package_within_ws_and_use_msrv_from_ws/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{compare::assert_ui, current_dir, file, Project}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/specify_empty_version_with_url/mod.rs b/tests/testsuite/cargo_info/specify_empty_version_with_url/mod.rs index 0e3a6b84b..3e8ccb829 100644 --- a/tests/testsuite/cargo_info/specify_empty_version_with_url/mod.rs +++ b/tests/testsuite/cargo_info/specify_empty_version_with_url/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{file, registry::RegistryBuilder}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/specify_version_outside_ws/mod.rs b/tests/testsuite/cargo_info/specify_version_outside_ws/mod.rs index bfc36dfd7..f6067eee8 100644 --- a/tests/testsuite/cargo_info/specify_version_outside_ws/mod.rs +++ b/tests/testsuite/cargo_info/specify_version_outside_ws/mod.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo_test_support::file; -use cargo_test_support::prelude::*; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/specify_version_with_url_but_registry_is_not_matched/mod.rs b/tests/testsuite/cargo_info/specify_version_with_url_but_registry_is_not_matched/mod.rs index 706f2d9da..74c5a8464 100644 --- a/tests/testsuite/cargo_info/specify_version_with_url_but_registry_is_not_matched/mod.rs +++ b/tests/testsuite/cargo_info/specify_version_with_url_but_registry_is_not_matched/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{file, registry::RegistryBuilder}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/specify_version_within_ws_and_conflict_with_lockfile/mod.rs b/tests/testsuite/cargo_info/specify_version_within_ws_and_conflict_with_lockfile/mod.rs index a433b78e6..bf1048c30 100644 --- a/tests/testsuite/cargo_info/specify_version_within_ws_and_conflict_with_lockfile/mod.rs +++ b/tests/testsuite/cargo_info/specify_version_within_ws_and_conflict_with_lockfile/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{compare::assert_ui, current_dir, file, Project}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/specify_version_within_ws_and_match_with_lockfile/mod.rs b/tests/testsuite/cargo_info/specify_version_within_ws_and_match_with_lockfile/mod.rs index 736a99286..8ac9a828c 100644 --- a/tests/testsuite/cargo_info/specify_version_within_ws_and_match_with_lockfile/mod.rs +++ b/tests/testsuite/cargo_info/specify_version_within_ws_and_match_with_lockfile/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{compare::assert_ui, current_dir, file, Project}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/transitive_dependency_within_ws/mod.rs b/tests/testsuite/cargo_info/transitive_dependency_within_ws/mod.rs index 345f6944a..19e3a755e 100644 --- a/tests/testsuite/cargo_info/transitive_dependency_within_ws/mod.rs +++ b/tests/testsuite/cargo_info/transitive_dependency_within_ws/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{compare::assert_ui, current_dir, file, Project}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/verbose/mod.rs b/tests/testsuite/cargo_info/verbose/mod.rs index 2afb5c199..caf97d885 100644 --- a/tests/testsuite/cargo_info/verbose/mod.rs +++ b/tests/testsuite/cargo_info/verbose/mod.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo_test_support::file; -use cargo_test_support::prelude::*; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/with_frozen_outside_ws/mod.rs b/tests/testsuite/cargo_info/with_frozen_outside_ws/mod.rs index c04f6934e..db18a8be6 100644 --- a/tests/testsuite/cargo_info/with_frozen_outside_ws/mod.rs +++ b/tests/testsuite/cargo_info/with_frozen_outside_ws/mod.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo_test_support::file; -use cargo_test_support::prelude::*; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/with_frozen_within_ws/mod.rs b/tests/testsuite/cargo_info/with_frozen_within_ws/mod.rs index 3881f64a8..c0104c118 100644 --- a/tests/testsuite/cargo_info/with_frozen_within_ws/mod.rs +++ b/tests/testsuite/cargo_info/with_frozen_within_ws/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{compare::assert_ui, current_dir, file, Project}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/with_locked_outside_ws/mod.rs b/tests/testsuite/cargo_info/with_locked_outside_ws/mod.rs index 6678ac7a3..7de858097 100644 --- a/tests/testsuite/cargo_info/with_locked_outside_ws/mod.rs +++ b/tests/testsuite/cargo_info/with_locked_outside_ws/mod.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo_test_support::file; -use cargo_test_support::prelude::*; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/with_locked_within_ws/mod.rs b/tests/testsuite/cargo_info/with_locked_within_ws/mod.rs index 4f958d75e..5dd3e20e6 100644 --- a/tests/testsuite/cargo_info/with_locked_within_ws/mod.rs +++ b/tests/testsuite/cargo_info/with_locked_within_ws/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{compare::assert_ui, current_dir, file, Project}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/with_locked_within_ws_and_pick_the_package/mod.rs b/tests/testsuite/cargo_info/with_locked_within_ws_and_pick_the_package/mod.rs index a04d9ec01..b29d5f29b 100644 --- a/tests/testsuite/cargo_info/with_locked_within_ws_and_pick_the_package/mod.rs +++ b/tests/testsuite/cargo_info/with_locked_within_ws_and_pick_the_package/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{compare::assert_ui, current_dir, file, Project}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/with_offline/mod.rs b/tests/testsuite/cargo_info/with_offline/mod.rs index 1b0b71610..dd5c22336 100644 --- a/tests/testsuite/cargo_info/with_offline/mod.rs +++ b/tests/testsuite/cargo_info/with_offline/mod.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo_test_support::file; -use cargo_test_support::prelude::*; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/with_quiet/mod.rs b/tests/testsuite/cargo_info/with_quiet/mod.rs index 9c5d0cdb9..fbe73edf2 100644 --- a/tests/testsuite/cargo_info/with_quiet/mod.rs +++ b/tests/testsuite/cargo_info/with_quiet/mod.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo_test_support::file; -use cargo_test_support::prelude::*; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/within_ws/mod.rs b/tests/testsuite/cargo_info/within_ws/mod.rs index f057b5821..5bed4d687 100644 --- a/tests/testsuite/cargo_info/within_ws/mod.rs +++ b/tests/testsuite/cargo_info/within_ws/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{compare::assert_ui, current_dir, file, Project}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/within_ws_and_pick_ws_package/mod.rs b/tests/testsuite/cargo_info/within_ws_and_pick_ws_package/mod.rs index cc93e23f6..38cfcfd0c 100644 --- a/tests/testsuite/cargo_info/within_ws_and_pick_ws_package/mod.rs +++ b/tests/testsuite/cargo_info/within_ws_and_pick_ws_package/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{compare::assert_ui, current_dir, file, Project}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/within_ws_with_alternative_registry/mod.rs b/tests/testsuite/cargo_info/within_ws_with_alternative_registry/mod.rs index 4c504f901..3599060f9 100644 --- a/tests/testsuite/cargo_info/within_ws_with_alternative_registry/mod.rs +++ b/tests/testsuite/cargo_info/within_ws_with_alternative_registry/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{compare::assert_ui, registry::RegistryBuilder, Project}; use cargo_test_support::{current_dir, file}; diff --git a/tests/testsuite/cargo_info/within_ws_without_lockfile/mod.rs b/tests/testsuite/cargo_info/within_ws_without_lockfile/mod.rs index 6236c4495..7bc8ef920 100644 --- a/tests/testsuite/cargo_info/within_ws_without_lockfile/mod.rs +++ b/tests/testsuite/cargo_info/within_ws_without_lockfile/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{compare::assert_ui, current_dir, file, Project}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_info/without_requiring_registry_auth/mod.rs b/tests/testsuite/cargo_info/without_requiring_registry_auth/mod.rs index 20cafe523..4fddf5644 100644 --- a/tests/testsuite/cargo_info/without_requiring_registry_auth/mod.rs +++ b/tests/testsuite/cargo_info/without_requiring_registry_auth/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{compare::assert_ui, current_dir, file, Project}; use super::init_registry_without_token; diff --git a/tests/testsuite/cargo_init/auto_git/mod.rs b/tests/testsuite/cargo_init/auto_git/mod.rs index 06cb1eb44..1a65662fa 100644 --- a/tests/testsuite/cargo_init/auto_git/mod.rs +++ b/tests/testsuite/cargo_init/auto_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; diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs index d2855639b..041e79623 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_explicit/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; diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs index db152a15e..f7b0e0c19 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/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; diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs index 5a9603a5f..ec1062a4f 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit/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; diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs index 018fe73c3..a56619388 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/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; diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs index 219b54534..f2bb65d36 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/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; diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs index 018fe73c3..a56619388 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/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; diff --git a/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs b/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs index 81d1c791f..20ebffce9 100644 --- a/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs +++ b/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs @@ -1,6 +1,6 @@ +use crate::prelude::*; use cargo_test_support::file; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::str; #[cargo_test] diff --git a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs index 2b34486bf..cb47aad0b 100644 --- a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs +++ b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/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::str; use cargo_test_support::Project; diff --git a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs index f1d364258..250c7b9a5 100644 --- a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs +++ b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/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; diff --git a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs index d2855639b..041e79623 100644 --- a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs +++ b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/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; diff --git a/tests/testsuite/cargo_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 index d2855639b..041e79623 100644 --- a/tests/testsuite/cargo_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 @@ -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; diff --git a/tests/testsuite/cargo_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 index 4e3cb8b70..f20383943 100644 --- a/tests/testsuite/cargo_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 @@ -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; diff --git a/tests/testsuite/cargo_init/empty_dir/mod.rs b/tests/testsuite/cargo_init/empty_dir/mod.rs index 074954f01..70af1a524 100644 --- a/tests/testsuite/cargo_init/empty_dir/mod.rs +++ b/tests/testsuite/cargo_init/empty_dir/mod.rs @@ -1,5 +1,5 @@ use cargo_test_support::compare::assert_ui; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{command_is_available, paths, Project}; use std::fs; use std::process::Command; diff --git a/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs b/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs index c0d70abe4..fe3c3286f 100644 --- a/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs +++ b/tests/testsuite/cargo_init/explicit_bin_with_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; diff --git a/tests/testsuite/cargo_init/formats_source/mod.rs b/tests/testsuite/cargo_init/formats_source/mod.rs index b35ce6093..397ab039a 100644 --- a/tests/testsuite/cargo_init/formats_source/mod.rs +++ b/tests/testsuite/cargo_init/formats_source/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::{process, Project}; diff --git a/tests/testsuite/cargo_init/fossil_autodetect/mod.rs b/tests/testsuite/cargo_init/fossil_autodetect/mod.rs index 132ea3eb9..9246f5214 100644 --- a/tests/testsuite/cargo_init/fossil_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/fossil_autodetect/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; diff --git a/tests/testsuite/cargo_init/git_autodetect/mod.rs b/tests/testsuite/cargo_init/git_autodetect/mod.rs index f0a78ed3d..e348b7dac 100644 --- a/tests/testsuite/cargo_init/git_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/git_autodetect/mod.rs @@ -1,8 +1,8 @@ +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::paths; -use cargo_test_support::prelude::*; use cargo_test_support::str; use std::fs; diff --git a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs index 013db91ca..cad651e21 100644 --- a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs +++ b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/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; diff --git a/tests/testsuite/cargo_init/help/mod.rs b/tests/testsuite/cargo_init/help/mod.rs index fd1930fd4..6a04ac619 100644 --- a/tests/testsuite/cargo_init/help/mod.rs +++ b/tests/testsuite/cargo_init/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] diff --git a/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs b/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs index d42e5a9e0..74ccb5c9b 100644 --- a/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs +++ b/tests/testsuite/cargo_init/ignores_failure_to_format_source/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; diff --git a/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs b/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs index 7b59af809..5c2ab0f26 100644 --- a/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs +++ b/tests/testsuite/cargo_init/inferred_bin_with_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; diff --git a/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs b/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs index 7b59af809..5c2ab0f26 100644 --- a/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs +++ b/tests/testsuite/cargo_init/inferred_lib_with_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; diff --git a/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs b/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs index 99dd923c0..21030e799 100644 --- a/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs +++ b/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_init/invalid_dir_name/mod.rs b/tests/testsuite/cargo_init/invalid_dir_name/mod.rs index b6e4100c9..12cc85c67 100644 --- a/tests/testsuite/cargo_init/invalid_dir_name/mod.rs +++ b/tests/testsuite/cargo_init/invalid_dir_name/mod.rs @@ -1,6 +1,6 @@ +use crate::prelude::*; use cargo_test_support::file; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::str; use std::fs; diff --git a/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs b/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs index 219b54534..f2bb65d36 100644 --- a/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs +++ b/tests/testsuite/cargo_init/lib_already_exists_nosrc/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; diff --git a/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs b/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs index 219b54534..f2bb65d36 100644 --- a/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs +++ b/tests/testsuite/cargo_init/lib_already_exists_src/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; diff --git a/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs b/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs index 132ea3eb9..9246f5214 100644 --- a/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/mercurial_autodetect/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; diff --git a/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs b/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs index 7f87da08d..eabe91dca 100644 --- a/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs +++ b/tests/testsuite/cargo_init/multibin_project_name_clash/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; diff --git a/tests/testsuite/cargo_init/no_filename/mod.rs b/tests/testsuite/cargo_init/no_filename/mod.rs index 92b3bba71..993b7d898 100644 --- a/tests/testsuite/cargo_init/no_filename/mod.rs +++ b/tests/testsuite/cargo_init/no_filename/mod.rs @@ -1,6 +1,6 @@ +use crate::prelude::*; use cargo_test_support::file; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::str; #[cfg(not(windows))] diff --git a/tests/testsuite/cargo_init/path_contains_separator/mod.rs b/tests/testsuite/cargo_init/path_contains_separator/mod.rs index ad361e103..5e4e00c07 100644 --- a/tests/testsuite/cargo_init/path_contains_separator/mod.rs +++ b/tests/testsuite/cargo_init/path_contains_separator/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::{t, Project}; diff --git a/tests/testsuite/cargo_init/pijul_autodetect/mod.rs b/tests/testsuite/cargo_init/pijul_autodetect/mod.rs index 132ea3eb9..9246f5214 100644 --- a/tests/testsuite/cargo_init/pijul_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/pijul_autodetect/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; diff --git a/tests/testsuite/cargo_init/reserved_name/mod.rs b/tests/testsuite/cargo_init/reserved_name/mod.rs index 1c06c9401..229b8b8e6 100644 --- a/tests/testsuite/cargo_init/reserved_name/mod.rs +++ b/tests/testsuite/cargo_init/reserved_name/mod.rs @@ -1,8 +1,8 @@ use std::fs; +use crate::prelude::*; use cargo_test_support::file; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::str; #[cargo_test] diff --git a/tests/testsuite/cargo_init/simple_bin/mod.rs b/tests/testsuite/cargo_init/simple_bin/mod.rs index 6706742ff..cb6dfa7cb 100644 --- a/tests/testsuite/cargo_init/simple_bin/mod.rs +++ b/tests/testsuite/cargo_init/simple_bin/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; diff --git a/tests/testsuite/cargo_init/simple_git/mod.rs b/tests/testsuite/cargo_init/simple_git/mod.rs index e8af27f46..c5ef56412 100644 --- a/tests/testsuite/cargo_init/simple_git/mod.rs +++ b/tests/testsuite/cargo_init/simple_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; diff --git a/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs b/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs index c8242fa42..32daa4074 100644 --- a/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs +++ b/tests/testsuite/cargo_init/simple_git_ignore_exists/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; diff --git a/tests/testsuite/cargo_init/simple_hg/mod.rs b/tests/testsuite/cargo_init/simple_hg/mod.rs index aa95f8065..00f4a87c8 100644 --- a/tests/testsuite/cargo_init/simple_hg/mod.rs +++ b/tests/testsuite/cargo_init/simple_hg/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; diff --git a/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs b/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs index 132ea3eb9..9246f5214 100644 --- a/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs +++ b/tests/testsuite/cargo_init/simple_hg_ignore_exists/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; diff --git a/tests/testsuite/cargo_init/simple_lib/mod.rs b/tests/testsuite/cargo_init/simple_lib/mod.rs index 9c19bcd52..51ce7dd0a 100644 --- a/tests/testsuite/cargo_init/simple_lib/mod.rs +++ b/tests/testsuite/cargo_init/simple_lib/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; diff --git a/tests/testsuite/cargo_init/unknown_flags/mod.rs b/tests/testsuite/cargo_init/unknown_flags/mod.rs index 9df19a755..32c8d410f 100644 --- a/tests/testsuite/cargo_init/unknown_flags/mod.rs +++ b/tests/testsuite/cargo_init/unknown_flags/mod.rs @@ -1,6 +1,6 @@ +use crate::prelude::*; use cargo_test_support::file; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::str; #[cargo_test] diff --git a/tests/testsuite/cargo_init/with_argument/mod.rs b/tests/testsuite/cargo_init/with_argument/mod.rs index 21862402e..b76db4212 100644 --- a/tests/testsuite/cargo_init/with_argument/mod.rs +++ b/tests/testsuite/cargo_init/with_argument/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; diff --git a/tests/testsuite/cargo_init/workspace_add_member/mod.rs b/tests/testsuite/cargo_init/workspace_add_member/mod.rs index 57d49dcb4..fa714ac31 100644 --- a/tests/testsuite/cargo_init/workspace_add_member/mod.rs +++ b/tests/testsuite/cargo_init/workspace_add_member/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; diff --git a/tests/testsuite/cargo_install/help/mod.rs b/tests/testsuite/cargo_install/help/mod.rs index 00dc6f7c4..51628955b 100644 --- a/tests/testsuite/cargo_install/help/mod.rs +++ b/tests/testsuite/cargo_install/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] diff --git a/tests/testsuite/cargo_locate_project/help/mod.rs b/tests/testsuite/cargo_locate_project/help/mod.rs index 6bede7a42..5f94d1d5f 100644 --- a/tests/testsuite/cargo_locate_project/help/mod.rs +++ b/tests/testsuite/cargo_locate_project/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] diff --git a/tests/testsuite/cargo_login/help/mod.rs b/tests/testsuite/cargo_login/help/mod.rs index 5416ec105..9ae2393d0 100644 --- a/tests/testsuite/cargo_login/help/mod.rs +++ b/tests/testsuite/cargo_login/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] diff --git a/tests/testsuite/cargo_logout/help/mod.rs b/tests/testsuite/cargo_logout/help/mod.rs index 5bbb986bc..82730645d 100644 --- a/tests/testsuite/cargo_logout/help/mod.rs +++ b/tests/testsuite/cargo_logout/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] diff --git a/tests/testsuite/cargo_metadata/help/mod.rs b/tests/testsuite/cargo_metadata/help/mod.rs index 7d42b9e62..d722e5450 100644 --- a/tests/testsuite/cargo_metadata/help/mod.rs +++ b/tests/testsuite/cargo_metadata/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] diff --git a/tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs b/tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs index ddf2ba97a..de5c989ea 100644 --- a/tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs index 696aeca70..7cb081c6b 100644 --- a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs index 696aeca70..7cb081c6b 100644 --- a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs index aa0e31f72..ec5e4f027 100644 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs index 696aeca70..7cb081c6b 100644 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs index 696aeca70..7cb081c6b 100644 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs index 696aeca70..7cb081c6b 100644 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs index ddf2ba97a..de5c989ea 100644 --- a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs +++ b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_new/empty_name/mod.rs b/tests/testsuite/cargo_new/empty_name/mod.rs index 78eeb7ae9..9e4a767aa 100644 --- a/tests/testsuite/cargo_new/empty_name/mod.rs +++ b/tests/testsuite/cargo_new/empty_name/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_new/help/mod.rs b/tests/testsuite/cargo_new/help/mod.rs index 55eeac516..c7ffaca84 100644 --- a/tests/testsuite/cargo_new/help/mod.rs +++ b/tests/testsuite/cargo_new/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] diff --git a/tests/testsuite/cargo_new/ignore_current_dir_workspace/mod.rs b/tests/testsuite/cargo_new/ignore_current_dir_workspace/mod.rs index d1316c16b..938ea7d3d 100644 --- a/tests/testsuite/cargo_new/ignore_current_dir_workspace/mod.rs +++ b/tests/testsuite/cargo_new/ignore_current_dir_workspace/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs index 696aeca70..7cb081c6b 100644 --- a/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs +++ b/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs index 696aeca70..7cb081c6b 100644 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs index 8fd9b2592..b4d8f706d 100644 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs index d4907c560..5702e692a 100644 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs index 696aeca70..7cb081c6b 100644 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs index 14434b45c..72df288cf 100644 --- a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs +++ b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_owner/help/mod.rs b/tests/testsuite/cargo_owner/help/mod.rs index 8b7669a0c..d3310b95e 100644 --- a/tests/testsuite/cargo_owner/help/mod.rs +++ b/tests/testsuite/cargo_owner/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] diff --git a/tests/testsuite/cargo_package/help/mod.rs b/tests/testsuite/cargo_package/help/mod.rs index 73ff8b7bc..cd8deb334 100644 --- a/tests/testsuite/cargo_package/help/mod.rs +++ b/tests/testsuite/cargo_package/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] diff --git a/tests/testsuite/cargo_pkgid/help/mod.rs b/tests/testsuite/cargo_pkgid/help/mod.rs index fb8d622db..0972ef064 100644 --- a/tests/testsuite/cargo_pkgid/help/mod.rs +++ b/tests/testsuite/cargo_pkgid/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] diff --git a/tests/testsuite/cargo_publish/help/mod.rs b/tests/testsuite/cargo_publish/help/mod.rs index ef7802b5c..44303c62c 100644 --- a/tests/testsuite/cargo_publish/help/mod.rs +++ b/tests/testsuite/cargo_publish/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] diff --git a/tests/testsuite/cargo_read_manifest/help/mod.rs b/tests/testsuite/cargo_read_manifest/help/mod.rs index 7308a92bc..8af9bda75 100644 --- a/tests/testsuite/cargo_read_manifest/help/mod.rs +++ b/tests/testsuite/cargo_read_manifest/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] diff --git a/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs b/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs index bfc3b8a29..0c8e68dcf 100644 --- a/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs +++ b/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/build/mod.rs b/tests/testsuite/cargo_remove/build/mod.rs index 46e7b94fa..2116c44e3 100644 --- a/tests/testsuite/cargo_remove/build/mod.rs +++ b/tests/testsuite/cargo_remove/build/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/dev/mod.rs b/tests/testsuite/cargo_remove/dev/mod.rs index 8a0de7ebe..605aa1b4a 100644 --- a/tests/testsuite/cargo_remove/dev/mod.rs +++ b/tests/testsuite/cargo_remove/dev/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/dry_run/mod.rs b/tests/testsuite/cargo_remove/dry_run/mod.rs index 19278d586..f56766d2e 100644 --- a/tests/testsuite/cargo_remove/dry_run/mod.rs +++ b/tests/testsuite/cargo_remove/dry_run/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs b/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs index c90110b79..cf63bd121 100644 --- a/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs +++ b/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/gc_patch/mod.rs b/tests/testsuite/cargo_remove/gc_patch/mod.rs index 8e19d068d..8bcad50c4 100644 --- a/tests/testsuite/cargo_remove/gc_patch/mod.rs +++ b/tests/testsuite/cargo_remove/gc_patch/mod.rs @@ -1,12 +1,11 @@ +use crate::prelude::*; use cargo_test_support::basic_manifest; use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::git; -use cargo_test_support::prelude::*; use cargo_test_support::project; use cargo_test_support::str; -use cargo_test_support::CargoCommandExt; #[cargo_test] fn case() { diff --git a/tests/testsuite/cargo_remove/gc_profile/mod.rs b/tests/testsuite/cargo_remove/gc_profile/mod.rs index 1f6f963ae..7c4cb093a 100644 --- a/tests/testsuite/cargo_remove/gc_profile/mod.rs +++ b/tests/testsuite/cargo_remove/gc_profile/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/gc_replace/mod.rs b/tests/testsuite/cargo_remove/gc_replace/mod.rs index f2a3cbae1..e96ac8bbc 100644 --- a/tests/testsuite/cargo_remove/gc_replace/mod.rs +++ b/tests/testsuite/cargo_remove/gc_replace/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/help/mod.rs b/tests/testsuite/cargo_remove/help/mod.rs index 4cad3dda3..449eb3d13 100644 --- a/tests/testsuite/cargo_remove/help/mod.rs +++ b/tests/testsuite/cargo_remove/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] diff --git a/tests/testsuite/cargo_remove/invalid_arg/mod.rs b/tests/testsuite/cargo_remove/invalid_arg/mod.rs index 28ba8ea36..8c1ca6bc5 100644 --- a/tests/testsuite/cargo_remove/invalid_arg/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_arg/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/invalid_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_dep/mod.rs index 40da29842..0ea04b698 100644 --- a/tests/testsuite/cargo_remove/invalid_dep/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_dep/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/invalid_package/mod.rs b/tests/testsuite/cargo_remove/invalid_package/mod.rs index a349d20ad..e544584a5 100644 --- a/tests/testsuite/cargo_remove/invalid_package/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_package/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs b/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs index 137a71c0b..cbb3ab444 100644 --- a/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/invalid_section/mod.rs b/tests/testsuite/cargo_remove/invalid_section/mod.rs index 26a9c12db..2f42ce4fb 100644 --- a/tests/testsuite/cargo_remove/invalid_section/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_section/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs index a61b3b47b..581c7cf83 100644 --- a/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/invalid_target/mod.rs b/tests/testsuite/cargo_remove/invalid_target/mod.rs index c4f41d19e..eba301028 100644 --- a/tests/testsuite/cargo_remove/invalid_target/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_target/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs index 2286e56ec..100259b59 100644 --- a/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/last_dep/mod.rs b/tests/testsuite/cargo_remove/last_dep/mod.rs index 6e287f223..effcdefd2 100644 --- a/tests/testsuite/cargo_remove/last_dep/mod.rs +++ b/tests/testsuite/cargo_remove/last_dep/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/multiple_deps/mod.rs b/tests/testsuite/cargo_remove/multiple_deps/mod.rs index 5fc96eb49..8ee6a9b7f 100644 --- a/tests/testsuite/cargo_remove/multiple_deps/mod.rs +++ b/tests/testsuite/cargo_remove/multiple_deps/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/multiple_dev/mod.rs b/tests/testsuite/cargo_remove/multiple_dev/mod.rs index e1594650f..26c62d16e 100644 --- a/tests/testsuite/cargo_remove/multiple_dev/mod.rs +++ b/tests/testsuite/cargo_remove/multiple_dev/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/no_arg/mod.rs b/tests/testsuite/cargo_remove/no_arg/mod.rs index 70619f2dc..9d133ba5b 100644 --- a/tests/testsuite/cargo_remove/no_arg/mod.rs +++ b/tests/testsuite/cargo_remove/no_arg/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/offline/mod.rs b/tests/testsuite/cargo_remove/offline/mod.rs index 48b3fc919..0c0de9153 100644 --- a/tests/testsuite/cargo_remove/offline/mod.rs +++ b/tests/testsuite/cargo_remove/offline/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs b/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs index 493a60b5b..d36cb8b81 100644 --- a/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs +++ b/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs index 21b758ceb..1286bad9c 100644 --- a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs +++ b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/optional_feature/mod.rs b/tests/testsuite/cargo_remove/optional_feature/mod.rs index 30f3e337c..2e37b11f0 100644 --- a/tests/testsuite/cargo_remove/optional_feature/mod.rs +++ b/tests/testsuite/cargo_remove/optional_feature/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/package/mod.rs b/tests/testsuite/cargo_remove/package/mod.rs index e3f26e7a5..423ac86df 100644 --- a/tests/testsuite/cargo_remove/package/mod.rs +++ b/tests/testsuite/cargo_remove/package/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/remove_basic/mod.rs b/tests/testsuite/cargo_remove/remove_basic/mod.rs index a1aebd4a8..ea1c39b19 100644 --- a/tests/testsuite/cargo_remove/remove_basic/mod.rs +++ b/tests/testsuite/cargo_remove/remove_basic/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/script/mod.rs b/tests/testsuite/cargo_remove/script/mod.rs index 03207eb26..84c8b4298 100644 --- a/tests/testsuite/cargo_remove/script/mod.rs +++ b/tests/testsuite/cargo_remove/script/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/script_last/mod.rs b/tests/testsuite/cargo_remove/script_last/mod.rs index 1b7ec0403..cff0426c9 100644 --- a/tests/testsuite/cargo_remove/script_last/mod.rs +++ b/tests/testsuite/cargo_remove/script_last/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs b/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs index 025b031c3..5be1701b0 100644 --- a/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs +++ b/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/target/mod.rs b/tests/testsuite/cargo_remove/target/mod.rs index 3d971f861..d681b33ba 100644 --- a/tests/testsuite/cargo_remove/target/mod.rs +++ b/tests/testsuite/cargo_remove/target/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/target_build/mod.rs b/tests/testsuite/cargo_remove/target_build/mod.rs index 1f4d176eb..048b95e7d 100644 --- a/tests/testsuite/cargo_remove/target_build/mod.rs +++ b/tests/testsuite/cargo_remove/target_build/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/target_dev/mod.rs b/tests/testsuite/cargo_remove/target_dev/mod.rs index 168e5ef6c..ccf192a61 100644 --- a/tests/testsuite/cargo_remove/target_dev/mod.rs +++ b/tests/testsuite/cargo_remove/target_dev/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/update_lock_file/mod.rs b/tests/testsuite/cargo_remove/update_lock_file/mod.rs index b5aa3b96b..88bc36251 100644 --- a/tests/testsuite/cargo_remove/update_lock_file/mod.rs +++ b/tests/testsuite/cargo_remove/update_lock_file/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/workspace/mod.rs b/tests/testsuite/cargo_remove/workspace/mod.rs index 4d4610fdb..014792b77 100644 --- a/tests/testsuite/cargo_remove/workspace/mod.rs +++ b/tests/testsuite/cargo_remove/workspace/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs b/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs index 4d4610fdb..014792b77 100644 --- a/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs +++ b/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_remove/workspace_preserved/mod.rs b/tests/testsuite/cargo_remove/workspace_preserved/mod.rs index 4d4610fdb..014792b77 100644 --- a/tests/testsuite/cargo_remove/workspace_preserved/mod.rs +++ b/tests/testsuite/cargo_remove/workspace_preserved/mod.rs @@ -1,9 +1,8 @@ +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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_report/help/mod.rs b/tests/testsuite/cargo_report/help/mod.rs index c05e9e337..d4e241e69 100644 --- a/tests/testsuite/cargo_report/help/mod.rs +++ b/tests/testsuite/cargo_report/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] diff --git a/tests/testsuite/cargo_run/help/mod.rs b/tests/testsuite/cargo_run/help/mod.rs index 212ed276c..979407b8d 100644 --- a/tests/testsuite/cargo_run/help/mod.rs +++ b/tests/testsuite/cargo_run/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] diff --git a/tests/testsuite/cargo_rustc/help/mod.rs b/tests/testsuite/cargo_rustc/help/mod.rs index 87b66e825..134d0b8ac 100644 --- a/tests/testsuite/cargo_rustc/help/mod.rs +++ b/tests/testsuite/cargo_rustc/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] diff --git a/tests/testsuite/cargo_rustdoc/help/mod.rs b/tests/testsuite/cargo_rustdoc/help/mod.rs index a1b2a0193..c051656db 100644 --- a/tests/testsuite/cargo_rustdoc/help/mod.rs +++ b/tests/testsuite/cargo_rustdoc/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] diff --git a/tests/testsuite/cargo_search/help/mod.rs b/tests/testsuite/cargo_search/help/mod.rs index 2b96bd572..a3f646e0d 100644 --- a/tests/testsuite/cargo_search/help/mod.rs +++ b/tests/testsuite/cargo_search/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] diff --git a/tests/testsuite/cargo_targets.rs b/tests/testsuite/cargo_targets.rs index beec558d9..fe736372f 100644 --- a/tests/testsuite/cargo_targets.rs +++ b/tests/testsuite/cargo_targets.rs @@ -1,6 +1,6 @@ //! Tests specifically related to target handling (lib, bins, examples, tests, benches). -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::str; diff --git a/tests/testsuite/cargo_test/help/mod.rs b/tests/testsuite/cargo_test/help/mod.rs index a643dfdbe..38ca53ad4 100644 --- a/tests/testsuite/cargo_test/help/mod.rs +++ b/tests/testsuite/cargo_test/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] diff --git a/tests/testsuite/cargo_test/no_keep_going/mod.rs b/tests/testsuite/cargo_test/no_keep_going/mod.rs index 330e3690b..bf747b189 100644 --- a/tests/testsuite/cargo_test/no_keep_going/mod.rs +++ b/tests/testsuite/cargo_test/no_keep_going/mod.rs @@ -1,8 +1,7 @@ +use crate::prelude::*; 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::CargoCommandExt; use cargo_test_support::Project; #[cargo_test] diff --git a/tests/testsuite/cargo_tree/deps.rs b/tests/testsuite/cargo_tree/deps.rs index 574d543aa..466c47fed 100644 --- a/tests/testsuite/cargo_tree/deps.rs +++ b/tests/testsuite/cargo_tree/deps.rs @@ -1,8 +1,8 @@ //! Tests for the `cargo tree` command. +use crate::prelude::*; use crate::utils::cross_compile::disabled as cross_compile_disabled; use cargo_test_support::cross_compile::alternate; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{Dependency, Package}; use cargo_test_support::str; use cargo_test_support::{basic_manifest, git, project, rustc_host, Project}; diff --git a/tests/testsuite/cargo_tree/dupe/mod.rs b/tests/testsuite/cargo_tree/dupe/mod.rs index fe0aa4271..165d1f8e9 100644 --- a/tests/testsuite/cargo_tree/dupe/mod.rs +++ b/tests/testsuite/cargo_tree/dupe/mod.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo_test_support::file; -use cargo_test_support::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::Package; diff --git a/tests/testsuite/cargo_tree/edge_kind/mod.rs b/tests/testsuite/cargo_tree/edge_kind/mod.rs index 6693e8bfb..233cb23b0 100644 --- a/tests/testsuite/cargo_tree/edge_kind/mod.rs +++ b/tests/testsuite/cargo_tree/edge_kind/mod.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo_test_support::file; -use cargo_test_support::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::Package; diff --git a/tests/testsuite/cargo_tree/features.rs b/tests/testsuite/cargo_tree/features.rs index 038a8ddb7..d297a9211 100644 --- a/tests/testsuite/cargo_tree/features.rs +++ b/tests/testsuite/cargo_tree/features.rs @@ -1,6 +1,6 @@ //! Tests for the `cargo tree` command with -e features option. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::{Dependency, Package}; use cargo_test_support::str; diff --git a/tests/testsuite/cargo_tree/help/mod.rs b/tests/testsuite/cargo_tree/help/mod.rs index 6b10af23a..161578e20 100644 --- a/tests/testsuite/cargo_tree/help/mod.rs +++ b/tests/testsuite/cargo_tree/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] diff --git a/tests/testsuite/cargo_uninstall/help/mod.rs b/tests/testsuite/cargo_uninstall/help/mod.rs index 48c84da1b..fe948729f 100644 --- a/tests/testsuite/cargo_uninstall/help/mod.rs +++ b/tests/testsuite/cargo_uninstall/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] diff --git a/tests/testsuite/cargo_update/help/mod.rs b/tests/testsuite/cargo_update/help/mod.rs index 7bc15484c..246ea8eca 100644 --- a/tests/testsuite/cargo_update/help/mod.rs +++ b/tests/testsuite/cargo_update/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] diff --git a/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs b/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs index 32055ac0a..1a68f4e5f 100644 --- a/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs +++ b/tests/testsuite/cargo_update/toolchain_pkgname/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::str; use cargo_test_support::Project; diff --git a/tests/testsuite/cargo_vendor/help/mod.rs b/tests/testsuite/cargo_vendor/help/mod.rs index ede93a8f8..9c83d3cfe 100644 --- a/tests/testsuite/cargo_vendor/help/mod.rs +++ b/tests/testsuite/cargo_vendor/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] diff --git a/tests/testsuite/cargo_verify_project/help/mod.rs b/tests/testsuite/cargo_verify_project/help/mod.rs index b5103db60..89db7b3fe 100644 --- a/tests/testsuite/cargo_verify_project/help/mod.rs +++ b/tests/testsuite/cargo_verify_project/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] diff --git a/tests/testsuite/cargo_version/help/mod.rs b/tests/testsuite/cargo_version/help/mod.rs index a86d204ae..45baf15b3 100644 --- a/tests/testsuite/cargo_version/help/mod.rs +++ b/tests/testsuite/cargo_version/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] diff --git a/tests/testsuite/cargo_yank/help/mod.rs b/tests/testsuite/cargo_yank/help/mod.rs index 93b5af05e..929decb51 100644 --- a/tests/testsuite/cargo_yank/help/mod.rs +++ b/tests/testsuite/cargo_yank/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] diff --git a/tests/testsuite/cfg.rs b/tests/testsuite/cfg.rs index 4e7832ad5..878020d2b 100644 --- a/tests/testsuite/cfg.rs +++ b/tests/testsuite/cfg.rs @@ -1,6 +1,6 @@ //! Tests for `cfg()` expressions. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::rustc_host; use cargo_test_support::{basic_manifest, project, str}; diff --git a/tests/testsuite/check.rs b/tests/testsuite/check.rs index 43fe1f8ad..3459b701e 100644 --- a/tests/testsuite/check.rs +++ b/tests/testsuite/check.rs @@ -2,10 +2,10 @@ use std::fmt::{self, Write}; +use crate::prelude::*; use crate::utils::tools; use cargo_test_support::compare::assert_e2e; use cargo_test_support::install::exe; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; use cargo_test_support::{basic_bin_manifest, basic_manifest, git, project}; diff --git a/tests/testsuite/check_cfg.rs b/tests/testsuite/check_cfg.rs index 2e0325433..f2dd61c0d 100644 --- a/tests/testsuite/check_cfg.rs +++ b/tests/testsuite/check_cfg.rs @@ -1,6 +1,6 @@ //! Tests for Cargo usage of rustc `--check-cfg`. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{basic_manifest, project, str}; macro_rules! x { diff --git a/tests/testsuite/clean.rs b/tests/testsuite/clean.rs index 5a510f664..db2e91ba6 100644 --- a/tests/testsuite/clean.rs +++ b/tests/testsuite/clean.rs @@ -1,7 +1,7 @@ //! Tests for the `cargo clean` command. +use crate::prelude::*; use cargo_test_support::compare::assert_e2e; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; use cargo_test_support::{ diff --git a/tests/testsuite/collisions.rs b/tests/testsuite/collisions.rs index 59214d4a1..72eb1bbe6 100644 --- a/tests/testsuite/collisions.rs +++ b/tests/testsuite/collisions.rs @@ -3,8 +3,8 @@ //! Ideally these should never happen, but I don't think we'll ever be able to //! prevent all collisions. +use crate::prelude::*; use crate::utils::cross_compile::disabled as cross_compile_disabled; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; use cargo_test_support::{basic_manifest, cross_compile, project}; diff --git a/tests/testsuite/compile_time_deps.rs b/tests/testsuite/compile_time_deps.rs index 9adc3067c..bc07695d0 100644 --- a/tests/testsuite/compile_time_deps.rs +++ b/tests/testsuite/compile_time_deps.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{project, str}; #[cargo_test] diff --git a/tests/testsuite/concurrent.rs b/tests/testsuite/concurrent.rs index 3d48c39b6..5fb6dc157 100644 --- a/tests/testsuite/concurrent.rs +++ b/tests/testsuite/concurrent.rs @@ -7,11 +7,11 @@ use std::sync::mpsc::channel; use std::thread; use std::{env, str}; +use crate::prelude::*; use cargo_test_support::cargo_process; use cargo_test_support::git; use cargo_test_support::install::assert_has_installed_exe; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; use cargo_test_support::{basic_manifest, execs, project, slow_cpu_multiplier}; diff --git a/tests/testsuite/config.rs b/tests/testsuite/config.rs index e590889b3..7db7462d3 100644 --- a/tests/testsuite/config.rs +++ b/tests/testsuite/config.rs @@ -7,6 +7,7 @@ use std::io; use std::os; use std::path::{Path, PathBuf}; +use crate::prelude::*; use cargo::core::features::{GitFeatures, GitoxideFeatures}; use cargo::core::{PackageIdSpec, Shell}; use cargo::util::auth::RegistryConfig; @@ -15,7 +16,6 @@ use cargo::util::context::{ }; use cargo::CargoResult; use cargo_test_support::compare::assert_e2e; -use cargo_test_support::prelude::*; use cargo_test_support::str; use cargo_test_support::{paths, project, project_in_home, symlink_supported, t}; use cargo_util_schemas::manifest::TomlTrimPaths; diff --git a/tests/testsuite/config_cli.rs b/tests/testsuite/config_cli.rs index c9eed19fd..9e6d51525 100644 --- a/tests/testsuite/config_cli.rs +++ b/tests/testsuite/config_cli.rs @@ -2,10 +2,10 @@ use std::{collections::HashMap, fs}; +use crate::prelude::*; use cargo::util::context::Definition; use cargo_test_support::compare::assert_e2e; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::str; use super::config::{ diff --git a/tests/testsuite/config_include.rs b/tests/testsuite/config_include.rs index 468115dd5..548ab81b6 100644 --- a/tests/testsuite/config_include.rs +++ b/tests/testsuite/config_include.rs @@ -1,6 +1,6 @@ //! Tests for `include` config field. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::str; diff --git a/tests/testsuite/corrupt_git.rs b/tests/testsuite/corrupt_git.rs index ee4c720fb..c44500b66 100644 --- a/tests/testsuite/corrupt_git.rs +++ b/tests/testsuite/corrupt_git.rs @@ -3,8 +3,8 @@ use std::fs; use std::path::{Path, PathBuf}; +use crate::prelude::*; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::{basic_manifest, git, project}; use cargo_util::paths as cargopaths; diff --git a/tests/testsuite/credential_process.rs b/tests/testsuite/credential_process.rs index 68810baff..a373ea0a2 100644 --- a/tests/testsuite/credential_process.rs +++ b/tests/testsuite/credential_process.rs @@ -1,6 +1,6 @@ //! Tests for credential-process. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::{Package, TestRegistry}; use cargo_test_support::{basic_manifest, cargo_process, paths, project, registry, str, Project}; diff --git a/tests/testsuite/cross_compile.rs b/tests/testsuite/cross_compile.rs index 33aa149ed..22cc0cab2 100644 --- a/tests/testsuite/cross_compile.rs +++ b/tests/testsuite/cross_compile.rs @@ -2,7 +2,7 @@ //! //! See `cargo_test_support::cross_compile` for more detail. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::rustc_host; use cargo_test_support::str; use cargo_test_support::{basic_bin_manifest, basic_manifest, cross_compile, project}; diff --git a/tests/testsuite/cross_publish.rs b/tests/testsuite/cross_publish.rs index dffd0abc0..0624a0cd9 100644 --- a/tests/testsuite/cross_publish.rs +++ b/tests/testsuite/cross_publish.rs @@ -2,8 +2,8 @@ use std::fs::File; +use crate::prelude::*; use crate::utils::cross_compile::disabled as cross_compile_disabled; -use cargo_test_support::prelude::*; use cargo_test_support::{cross_compile, project, publish, registry, str}; #[cargo_test] diff --git a/tests/testsuite/custom_target.rs b/tests/testsuite/custom_target.rs index 602a574d9..0e7b2dcc9 100644 --- a/tests/testsuite/custom_target.rs +++ b/tests/testsuite/custom_target.rs @@ -2,7 +2,7 @@ use std::fs; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{basic_manifest, project, str}; const MINIMAL_LIB: &str = r#" diff --git a/tests/testsuite/death.rs b/tests/testsuite/death.rs index f57b74de5..23383f265 100644 --- a/tests/testsuite/death.rs +++ b/tests/testsuite/death.rs @@ -6,7 +6,7 @@ use std::net::TcpListener; use std::process::{Child, Stdio}; use std::thread; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{project, slow_cpu_multiplier}; #[cargo_test] diff --git a/tests/testsuite/dep_info.rs b/tests/testsuite/dep_info.rs index 8104f62ba..3d8a01d99 100644 --- a/tests/testsuite/dep_info.rs +++ b/tests/testsuite/dep_info.rs @@ -3,9 +3,9 @@ use std::path::Path; +use crate::prelude::*; use cargo_test_support::compare::assert_e2e; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; use cargo_test_support::{assert_deps, assert_deps_contains}; diff --git a/tests/testsuite/diagnostics.rs b/tests/testsuite/diagnostics.rs index 8bbebf0b7..3e8202c87 100644 --- a/tests/testsuite/diagnostics.rs +++ b/tests/testsuite/diagnostics.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::str; diff --git a/tests/testsuite/direct_minimal_versions.rs b/tests/testsuite/direct_minimal_versions.rs index ec5e5f53e..8f870e001 100644 --- a/tests/testsuite/direct_minimal_versions.rs +++ b/tests/testsuite/direct_minimal_versions.rs @@ -2,7 +2,7 @@ //! //! Note: Some tests are located in the resolver-tests package. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/directory.rs b/tests/testsuite/directory.rs index 9e3f4fed5..2406e7e98 100644 --- a/tests/testsuite/directory.rs +++ b/tests/testsuite/directory.rs @@ -4,10 +4,10 @@ use std::collections::HashMap; use std::fs; use std::str; +use crate::prelude::*; use cargo_test_support::cargo_process; use cargo_test_support::git; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{cksum, Package}; use cargo_test_support::str; use cargo_test_support::{basic_manifest, project, t, ProjectBuilder}; diff --git a/tests/testsuite/doc.rs b/tests/testsuite/doc.rs index 1d0d0ad25..e1f4ece6e 100644 --- a/tests/testsuite/doc.rs +++ b/tests/testsuite/doc.rs @@ -3,9 +3,9 @@ use std::fs; use std::str; +use crate::prelude::*; use crate::utils::tools; use cargo::core::compiler::RustDocFingerprint; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; use cargo_test_support::{basic_lib_manifest, basic_manifest, git, project}; diff --git a/tests/testsuite/docscrape.rs b/tests/testsuite/docscrape.rs index eb9ad9f70..c9b45ffe0 100644 --- a/tests/testsuite/docscrape.rs +++ b/tests/testsuite/docscrape.rs @@ -1,6 +1,6 @@ //! Tests for the `cargo doc` command with `-Zrustdoc-scrape-examples`. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::str; diff --git a/tests/testsuite/edition.rs b/tests/testsuite/edition.rs index 9b4bf4816..c845207e2 100644 --- a/tests/testsuite/edition.rs +++ b/tests/testsuite/edition.rs @@ -1,7 +1,7 @@ //! Tests for edition setting. +use crate::prelude::*; use cargo::core::Edition; -use cargo_test_support::prelude::*; use cargo_test_support::{basic_lib_manifest, project, str}; #[cargo_test] diff --git a/tests/testsuite/error.rs b/tests/testsuite/error.rs index 2d64c73e7..e948ba226 100644 --- a/tests/testsuite/error.rs +++ b/tests/testsuite/error.rs @@ -1,7 +1,7 @@ //! General error tests that don't belong anywhere else. +use crate::prelude::*; use cargo_test_support::cargo_process; -use cargo_test_support::prelude::*; #[cargo_test] fn internal_error() { diff --git a/tests/testsuite/feature_unification.rs b/tests/testsuite/feature_unification.rs index 59a9dd17e..278788a93 100644 --- a/tests/testsuite/feature_unification.rs +++ b/tests/testsuite/feature_unification.rs @@ -1,6 +1,6 @@ //! Tests for workspace feature unification. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{basic_manifest, cargo_process, project, str}; #[cargo_test] diff --git a/tests/testsuite/features.rs b/tests/testsuite/features.rs index da39e16bc..f71766637 100644 --- a/tests/testsuite/features.rs +++ b/tests/testsuite/features.rs @@ -1,6 +1,6 @@ //! Tests for `[features]` table. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::{Dependency, Package}; use cargo_test_support::str; use cargo_test_support::{basic_manifest, project}; diff --git a/tests/testsuite/features2.rs b/tests/testsuite/features2.rs index e97d6a410..8216f4055 100644 --- a/tests/testsuite/features2.rs +++ b/tests/testsuite/features2.rs @@ -2,10 +2,10 @@ use std::fs::File; +use crate::prelude::*; use crate::utils::cross_compile::disabled as cross_compile_disabled; use cargo_test_support::cross_compile::alternate; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::publish::validate_crate_contents; use cargo_test_support::registry::{Dependency, Package}; use cargo_test_support::str; diff --git a/tests/testsuite/features_namespaced.rs b/tests/testsuite/features_namespaced.rs index dc9d832a0..133013f66 100644 --- a/tests/testsuite/features_namespaced.rs +++ b/tests/testsuite/features_namespaced.rs @@ -1,6 +1,6 @@ //! Tests for namespaced features. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::{Dependency, Package, RegistryBuilder}; use cargo_test_support::str; use cargo_test_support::{project, publish}; diff --git a/tests/testsuite/fetch.rs b/tests/testsuite/fetch.rs index 417c67a3a..a6bc32f0d 100644 --- a/tests/testsuite/fetch.rs +++ b/tests/testsuite/fetch.rs @@ -1,7 +1,7 @@ //! Tests for the `cargo fetch` command. +use crate::prelude::*; use crate::utils::cross_compile::disabled as cross_compile_disabled; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::rustc_host; use cargo_test_support::{basic_manifest, cross_compile, project, str}; diff --git a/tests/testsuite/fix.rs b/tests/testsuite/fix.rs index 656189158..50ec09dec 100644 --- a/tests/testsuite/fix.rs +++ b/tests/testsuite/fix.rs @@ -1,11 +1,11 @@ //! Tests for the `cargo fix` command. +use crate::prelude::*; use crate::utils::tools; use cargo::core::Edition; use cargo_test_support::compare::assert_e2e; use cargo_test_support::git::{self, init}; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{Dependency, Package}; use cargo_test_support::str; use cargo_test_support::{basic_manifest, is_nightly, project}; diff --git a/tests/testsuite/fix_n_times.rs b/tests/testsuite/fix_n_times.rs index d1d422d6b..55d0d5d0b 100644 --- a/tests/testsuite/fix_n_times.rs +++ b/tests/testsuite/fix_n_times.rs @@ -17,8 +17,8 @@ use std::path::PathBuf; use std::sync::{Mutex, OnceLock}; +use crate::prelude::*; use crate::utils::tools; -use cargo_test_support::prelude::*; use cargo_test_support::{basic_manifest, paths, project, str, Execs}; /// The action that the `rustc` shim should take in the current sequence of diff --git a/tests/testsuite/freshness.rs b/tests/testsuite/freshness.rs index a930e81fe..29b269938 100644 --- a/tests/testsuite/freshness.rs +++ b/tests/testsuite/freshness.rs @@ -9,8 +9,8 @@ use std::process::Stdio; use std::thread; use std::time::SystemTime; +use crate::prelude::*; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{ basic_lib_manifest, basic_manifest, is_coarse_mtime, project, rustc_host, rustc_host_env, diff --git a/tests/testsuite/freshness_checksum.rs b/tests/testsuite/freshness_checksum.rs index 997a6151c..ffc94abb7 100644 --- a/tests/testsuite/freshness_checksum.rs +++ b/tests/testsuite/freshness_checksum.rs @@ -6,8 +6,8 @@ use std::net::TcpListener; use std::process::Stdio; use std::thread; +use crate::prelude::*; use cargo_test_support::assert_deps_contains; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{ basic_lib_manifest, basic_manifest, project, rustc_host, rustc_host_env, str, diff --git a/tests/testsuite/future_incompat_report.rs b/tests/testsuite/future_incompat_report.rs index 6e6f8c7ca..48a92a346 100644 --- a/tests/testsuite/future_incompat_report.rs +++ b/tests/testsuite/future_incompat_report.rs @@ -7,7 +7,7 @@ //! So we pick some random lint that will likely always be the same //! over time. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{basic_manifest, project, str, Project}; diff --git a/tests/testsuite/generate_lockfile.rs b/tests/testsuite/generate_lockfile.rs index 640cf5dc5..87a008559 100644 --- a/tests/testsuite/generate_lockfile.rs +++ b/tests/testsuite/generate_lockfile.rs @@ -2,7 +2,7 @@ use std::fs; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::{Package, RegistryBuilder}; use cargo_test_support::{basic_manifest, paths, project, str, ProjectBuilder}; diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs index e4572ead8..8fbcb0d26 100644 --- a/tests/testsuite/git.rs +++ b/tests/testsuite/git.rs @@ -9,10 +9,9 @@ use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; use std::thread; +use crate::prelude::*; use cargo_test_support::git::{add_submodule, cargo_uses_gitoxide}; use cargo_test_support::paths; -use cargo_test_support::prelude::IntoData; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{basic_lib_manifest, basic_manifest, git, main_file, project}; use cargo_test_support::{sleep_ms, str, t, Project}; diff --git a/tests/testsuite/git_auth.rs b/tests/testsuite/git_auth.rs index f0af4f226..5bd4e8393 100644 --- a/tests/testsuite/git_auth.rs +++ b/tests/testsuite/git_auth.rs @@ -8,10 +8,10 @@ use std::sync::atomic::{AtomicUsize, Ordering::SeqCst}; use std::sync::Arc; use std::thread::{self, JoinHandle}; +use crate::prelude::*; use cargo_test_support::basic_manifest; use cargo_test_support::git::cargo_uses_gitoxide; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::project; fn setup_failed_auth_test() -> (SocketAddr, JoinHandle<()>, Arc) { diff --git a/tests/testsuite/git_gc.rs b/tests/testsuite/git_gc.rs index 5b2cce78f..f8d20cb90 100644 --- a/tests/testsuite/git_gc.rs +++ b/tests/testsuite/git_gc.rs @@ -4,10 +4,10 @@ use std::env; use std::ffi::OsStr; use std::path::PathBuf; +use crate::prelude::*; use cargo_test_support::git; use cargo_test_support::git::cargo_uses_gitoxide; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::Package; use url::Url; diff --git a/tests/testsuite/git_shallow.rs b/tests/testsuite/git_shallow.rs index 86291714c..6ef1e00fd 100644 --- a/tests/testsuite/git_shallow.rs +++ b/tests/testsuite/git_shallow.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{basic_manifest, git, paths, project}; diff --git a/tests/testsuite/glob_targets.rs b/tests/testsuite/glob_targets.rs index ed292de31..2b11edad2 100644 --- a/tests/testsuite/glob_targets.rs +++ b/tests/testsuite/glob_targets.rs @@ -1,6 +1,6 @@ //! Tests for target filter flags with glob patterns. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{project, str, Project}; #[cargo_test] diff --git a/tests/testsuite/global_cache_tracker.rs b/tests/testsuite/global_cache_tracker.rs index 66ebdcaa2..1b7730d28 100644 --- a/tests/testsuite/global_cache_tracker.rs +++ b/tests/testsuite/global_cache_tracker.rs @@ -14,12 +14,12 @@ use std::process::Stdio; use std::sync::OnceLock; use std::time::{Duration, SystemTime}; +use crate::prelude::*; use cargo::core::global_cache_tracker::{self, DeferredGlobalLastUse, GlobalCacheTracker}; use cargo::util::cache_lock::CacheLockMode; use cargo::GlobalContext; use cargo_test_support::compare::assert_e2e; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{Package, RegistryBuilder}; use cargo_test_support::{ basic_manifest, cargo_process, execs, git, process, project, retry, sleep_ms, str, diff --git a/tests/testsuite/help.rs b/tests/testsuite/help.rs index 0ba497e41..ae3a95a03 100644 --- a/tests/testsuite/help.rs +++ b/tests/testsuite/help.rs @@ -4,7 +4,7 @@ use std::fs; use std::path::Path; use std::str::from_utf8; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; use cargo_test_support::{basic_manifest, cargo_process, paths, project}; diff --git a/tests/testsuite/https.rs b/tests/testsuite/https.rs index d81a51ee4..c49351e39 100644 --- a/tests/testsuite/https.rs +++ b/tests/testsuite/https.rs @@ -3,8 +3,8 @@ //! Note that these tests will generally require setting `CARGO_CONTAINER_TESTS` //! or `CARGO_PUBLIC_NETWORK_TESTS`. +use crate::prelude::*; use cargo_test_support::containers::Container; -use cargo_test_support::prelude::*; use cargo_test_support::project; use cargo_test_support::str; diff --git a/tests/testsuite/inheritable_workspace_fields.rs b/tests/testsuite/inheritable_workspace_fields.rs index 82aa7fcfc..893e853f6 100644 --- a/tests/testsuite/inheritable_workspace_fields.rs +++ b/tests/testsuite/inheritable_workspace_fields.rs @@ -1,6 +1,6 @@ //! Tests for inheriting Cargo.toml fields with field.workspace = true -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::{Dependency, Package, RegistryBuilder}; use cargo_test_support::{ basic_lib_manifest, basic_manifest, git, paths, project, publish, registry, str, diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs index da4166d05..e0ce5294e 100644 --- a/tests/testsuite/install.rs +++ b/tests/testsuite/install.rs @@ -7,10 +7,10 @@ use std::path::Path; use std::path::PathBuf; use std::thread; +use crate::prelude::*; use cargo_test_support::compare::assert_e2e; use cargo_test_support::cross_compile; use cargo_test_support::git; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{self, Package}; use cargo_test_support::str; use cargo_test_support::{ diff --git a/tests/testsuite/install_upgrade.rs b/tests/testsuite/install_upgrade.rs index fe0aaea80..037b4a4d8 100644 --- a/tests/testsuite/install_upgrade.rs +++ b/tests/testsuite/install_upgrade.rs @@ -6,11 +6,11 @@ use std::fs; use std::path::PathBuf; use std::sync::atomic::{AtomicUsize, Ordering}; +use crate::prelude::*; use crate::utils::cross_compile::disabled as cross_compile_disabled; use cargo::core::PackageId; use cargo_test_support::install::exe; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{self, Package}; use cargo_test_support::{ basic_manifest, cargo_process, cross_compile, execs, git, process, project, str, Execs, diff --git a/tests/testsuite/jobserver.rs b/tests/testsuite/jobserver.rs index 360c894af..295040322 100644 --- a/tests/testsuite/jobserver.rs +++ b/tests/testsuite/jobserver.rs @@ -5,11 +5,11 @@ use std::net::TcpListener; use std::process::Command; use std::thread; +use crate::prelude::*; use cargo_test_support::basic_bin_manifest; use cargo_test_support::cargo_exe; use cargo_test_support::install::assert_has_installed_exe; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::{project, rustc_host, str}; use cargo_util::is_ci; diff --git a/tests/testsuite/lints/error/mod.rs b/tests/testsuite/lints/error/mod.rs index bb4ff319a..6f6411e24 100644 --- a/tests/testsuite/lints/error/mod.rs +++ b/tests/testsuite/lints/error/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::str; use cargo_test_support::{file, project}; diff --git a/tests/testsuite/lints/inherited/mod.rs b/tests/testsuite/lints/inherited/mod.rs index 81f4ffc66..7d0611837 100644 --- a/tests/testsuite/lints/inherited/mod.rs +++ b/tests/testsuite/lints/inherited/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::str; use cargo_test_support::{file, project}; diff --git a/tests/testsuite/lints/mod.rs b/tests/testsuite/lints/mod.rs index 70dd35265..62f420465 100644 --- a/tests/testsuite/lints/mod.rs +++ b/tests/testsuite/lints/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/lints/unknown_lints.rs b/tests/testsuite/lints/unknown_lints.rs index f8b3e9d6f..99bf9a22e 100644 --- a/tests/testsuite/lints/unknown_lints.rs +++ b/tests/testsuite/lints/unknown_lints.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::str; diff --git a/tests/testsuite/lints/warning/mod.rs b/tests/testsuite/lints/warning/mod.rs index f1ec40f76..a5fa99672 100644 --- a/tests/testsuite/lints/warning/mod.rs +++ b/tests/testsuite/lints/warning/mod.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::str; use cargo_test_support::{file, project}; diff --git a/tests/testsuite/lints_table.rs b/tests/testsuite/lints_table.rs index c2e232c50..d3b82dfb8 100644 --- a/tests/testsuite/lints_table.rs +++ b/tests/testsuite/lints_table.rs @@ -1,6 +1,6 @@ //! Tests for `[lints]` -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/list_availables.rs b/tests/testsuite/list_availables.rs index a2aa80e9a..162eadc52 100644 --- a/tests/testsuite/list_availables.rs +++ b/tests/testsuite/list_availables.rs @@ -1,7 +1,7 @@ //! Tests for packages/target filter flags giving suggestions on which //! packages/targets are available. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::str; use snapbox::IntoData; diff --git a/tests/testsuite/local_registry.rs b/tests/testsuite/local_registry.rs index a5ddcb48d..9c9c11051 100644 --- a/tests/testsuite/local_registry.rs +++ b/tests/testsuite/local_registry.rs @@ -2,8 +2,8 @@ use std::fs; +use crate::prelude::*; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{registry_path, Package}; use cargo_test_support::{basic_manifest, project, str, t}; diff --git a/tests/testsuite/locate_project.rs b/tests/testsuite/locate_project.rs index de01210d1..867f977f7 100644 --- a/tests/testsuite/locate_project.rs +++ b/tests/testsuite/locate_project.rs @@ -1,6 +1,6 @@ //! Tests for the `cargo locate-project` command. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::str; diff --git a/tests/testsuite/lockfile_compat.rs b/tests/testsuite/lockfile_compat.rs index 4a24993b1..cc8961a1e 100644 --- a/tests/testsuite/lockfile_compat.rs +++ b/tests/testsuite/lockfile_compat.rs @@ -1,8 +1,8 @@ //! Tests for supporting older versions of the Cargo.lock file format. +use crate::prelude::*; use cargo_test_support::compare::assert_e2e; use cargo_test_support::git; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; use cargo_test_support::{basic_lib_manifest, basic_manifest, project}; diff --git a/tests/testsuite/lockfile_path.rs b/tests/testsuite/lockfile_path.rs index 67a26c8d1..2718553e2 100644 --- a/tests/testsuite/lockfile_path.rs +++ b/tests/testsuite/lockfile_path.rs @@ -4,6 +4,7 @@ use std::fs; use snapbox::str; +use crate::prelude::*; use cargo_test_support::compare::assert_e2e; use cargo_test_support::install::assert_has_installed_exe; use cargo_test_support::registry::{Package, RegistryBuilder}; diff --git a/tests/testsuite/login.rs b/tests/testsuite/login.rs index cac0e718a..2cfcc8f86 100644 --- a/tests/testsuite/login.rs +++ b/tests/testsuite/login.rs @@ -3,9 +3,9 @@ use std::fs; use std::path::PathBuf; +use crate::prelude::*; use cargo_test_support::cargo_process; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{self, RegistryBuilder}; use cargo_test_support::str; use cargo_test_support::t; diff --git a/tests/testsuite/logout.rs b/tests/testsuite/logout.rs index aa2ac38fc..23cf1b9a7 100644 --- a/tests/testsuite/logout.rs +++ b/tests/testsuite/logout.rs @@ -1,8 +1,8 @@ //! Tests for the `cargo logout` command. use super::login::check_token; +use crate::prelude::*; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::TestRegistry; use cargo_test_support::{cargo_process, registry, str}; diff --git a/tests/testsuite/lto.rs b/tests/testsuite/lto.rs index 21b96f956..726c81eda 100644 --- a/tests/testsuite/lto.rs +++ b/tests/testsuite/lto.rs @@ -1,5 +1,5 @@ +use crate::prelude::*; use cargo::core::compiler::Lto; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::RawOutput; use cargo_test_support::{basic_manifest, project, str, Project}; diff --git a/tests/testsuite/member_discovery.rs b/tests/testsuite/member_discovery.rs index c04e79427..5a123140d 100644 --- a/tests/testsuite/member_discovery.rs +++ b/tests/testsuite/member_discovery.rs @@ -1,9 +1,9 @@ //! Tests for workspace member discovery. +use crate::prelude::*; use cargo::core::{Shell, Workspace}; use cargo::util::context::GlobalContext; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::project; use cargo_test_support::registry; diff --git a/tests/testsuite/member_errors.rs b/tests/testsuite/member_errors.rs index be8b84293..72b2e0060 100644 --- a/tests/testsuite/member_errors.rs +++ b/tests/testsuite/member_errors.rs @@ -1,5 +1,6 @@ //! Tests for workspace member errors. +use crate::prelude::*; use cargo::core::compiler::UserIntent; use cargo::core::resolver::ResolveError; use cargo::core::Shell; @@ -7,7 +8,6 @@ use cargo::core::Workspace; use cargo::ops::{self, CompileOptions}; use cargo::util::{context::GlobalContext, errors::ManifestError}; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::project; use cargo_test_support::registry; use cargo_test_support::str; diff --git a/tests/testsuite/message_format.rs b/tests/testsuite/message_format.rs index 16947c394..7aefa6899 100644 --- a/tests/testsuite/message_format.rs +++ b/tests/testsuite/message_format.rs @@ -1,6 +1,6 @@ //! Tests for --message-format flag. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{basic_lib_manifest, basic_manifest, project, str}; #[cargo_test] diff --git a/tests/testsuite/messages.rs b/tests/testsuite/messages.rs index c00f88be0..a23694870 100644 --- a/tests/testsuite/messages.rs +++ b/tests/testsuite/messages.rs @@ -2,8 +2,8 @@ //! //! Tests for message caching can be found in `cache_messages`. +use crate::prelude::*; use cargo_test_support::compare::assert_e2e; -use cargo_test_support::prelude::*; use cargo_test_support::{process, project, Project}; use cargo_util::ProcessError; diff --git a/tests/testsuite/metabuild.rs b/tests/testsuite/metabuild.rs index 51f0fa959..beae9759a 100644 --- a/tests/testsuite/metabuild.rs +++ b/tests/testsuite/metabuild.rs @@ -2,7 +2,7 @@ use std::str; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{ basic_lib_manifest, basic_manifest, is_coarse_mtime, project, registry::Package, rustc_host, str, Project, diff --git a/tests/testsuite/metadata.rs b/tests/testsuite/metadata.rs index 6d422676f..8321fd05a 100644 --- a/tests/testsuite/metadata.rs +++ b/tests/testsuite/metadata.rs @@ -1,7 +1,7 @@ //! Tests for the `cargo metadata` command. +use crate::prelude::*; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{ basic_bin_manifest, basic_lib_manifest, main_file, project, rustc_host, str, diff --git a/tests/testsuite/minimal_versions.rs b/tests/testsuite/minimal_versions.rs index ef565b0f6..b3edffd4d 100644 --- a/tests/testsuite/minimal_versions.rs +++ b/tests/testsuite/minimal_versions.rs @@ -2,7 +2,7 @@ //! //! Note: Some tests are located in the resolver-tests package. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/multitarget.rs b/tests/testsuite/multitarget.rs index 56a4de1a0..9b4a91dd1 100644 --- a/tests/testsuite/multitarget.rs +++ b/tests/testsuite/multitarget.rs @@ -1,9 +1,9 @@ //! Tests for multiple `--target` flags to subcommands +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::prelude::*; use cargo_test_support::{basic_manifest, cross_compile, project, rustc_host, str}; #[cargo_test] diff --git a/tests/testsuite/net_config.rs b/tests/testsuite/net_config.rs index 487cc83cf..f1be9b2b0 100644 --- a/tests/testsuite/net_config.rs +++ b/tests/testsuite/net_config.rs @@ -1,6 +1,6 @@ //! Tests for network configuration. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::str; diff --git a/tests/testsuite/new.rs b/tests/testsuite/new.rs index 4c02c4575..43eccb062 100644 --- a/tests/testsuite/new.rs +++ b/tests/testsuite/new.rs @@ -3,9 +3,9 @@ use std::env; use std::fs::{self, File}; +use crate::prelude::*; use cargo_test_support::cargo_process; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::str; fn create_default_gitconfig() { diff --git a/tests/testsuite/offline.rs b/tests/testsuite/offline.rs index 55632e88e..64d72273d 100644 --- a/tests/testsuite/offline.rs +++ b/tests/testsuite/offline.rs @@ -2,7 +2,7 @@ use std::fs; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{ basic_manifest, git, main_file, project, registry::{Package, RegistryBuilder}, diff --git a/tests/testsuite/old_cargos.rs b/tests/testsuite/old_cargos.rs index d0d5d9cb3..64d4ba054 100644 --- a/tests/testsuite/old_cargos.rs +++ b/tests/testsuite/old_cargos.rs @@ -12,8 +12,8 @@ use std::fs; +use crate::prelude::*; use cargo::CargoResult; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{self, Dependency, Package}; use cargo_test_support::{cargo_exe, execs, paths, process, project, rustc_host, str}; use cargo_util::{ProcessBuilder, ProcessError}; diff --git a/tests/testsuite/open_namespaces.rs b/tests/testsuite/open_namespaces.rs index 85377bf2c..3914a2af7 100644 --- a/tests/testsuite/open_namespaces.rs +++ b/tests/testsuite/open_namespaces.rs @@ -1,4 +1,4 @@ -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::str; diff --git a/tests/testsuite/owner.rs b/tests/testsuite/owner.rs index ec473183f..dcb631d40 100644 --- a/tests/testsuite/owner.rs +++ b/tests/testsuite/owner.rs @@ -2,7 +2,7 @@ use std::fs; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::{self, api_path}; use cargo_test_support::str; diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs index 4d70f5bd7..244477707 100644 --- a/tests/testsuite/package.rs +++ b/tests/testsuite/package.rs @@ -3,7 +3,7 @@ use std::fs::{self, read_to_string, File}; use std::path::Path; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::publish::validate_crate_contents; use cargo_test_support::registry::{self, Package}; use cargo_test_support::{ diff --git a/tests/testsuite/package_features.rs b/tests/testsuite/package_features.rs index 23a7402d2..d3f0882a2 100644 --- a/tests/testsuite/package_features.rs +++ b/tests/testsuite/package_features.rs @@ -2,7 +2,7 @@ use std::fmt::Write; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::{Dependency, Package}; use cargo_test_support::{basic_manifest, project, str}; diff --git a/tests/testsuite/package_message_format.rs b/tests/testsuite/package_message_format.rs index 503295db1..1a30919e7 100644 --- a/tests/testsuite/package_message_format.rs +++ b/tests/testsuite/package_message_format.rs @@ -1,6 +1,6 @@ //! Tests for the `--message-format` flag for `cargo package`. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::str; diff --git a/tests/testsuite/patch.rs b/tests/testsuite/patch.rs index ff46b3240..b5918e3ae 100644 --- a/tests/testsuite/patch.rs +++ b/tests/testsuite/patch.rs @@ -2,9 +2,9 @@ use std::fs; +use crate::prelude::*; use cargo_test_support::git; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{self, Package}; use cargo_test_support::{basic_manifest, project, str}; diff --git a/tests/testsuite/path.rs b/tests/testsuite/path.rs index 131f4fa98..098afb5d3 100644 --- a/tests/testsuite/path.rs +++ b/tests/testsuite/path.rs @@ -2,8 +2,8 @@ use std::fs; +use crate::prelude::*; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; use cargo_test_support::{basic_lib_manifest, basic_manifest, main_file, project}; diff --git a/tests/testsuite/paths.rs b/tests/testsuite/paths.rs index 8df1263f6..2fe242fc6 100644 --- a/tests/testsuite/paths.rs +++ b/tests/testsuite/paths.rs @@ -1,6 +1,6 @@ //! Tests for `paths` overrides. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; use cargo_test_support::{basic_manifest, project}; diff --git a/tests/testsuite/pgo.rs b/tests/testsuite/pgo.rs index 8676e73f5..14444c0f3 100644 --- a/tests/testsuite/pgo.rs +++ b/tests/testsuite/pgo.rs @@ -3,7 +3,7 @@ use std::path::PathBuf; use std::process::Command; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::str; diff --git a/tests/testsuite/pkgid.rs b/tests/testsuite/pkgid.rs index 9e51c59c7..4c878d9fa 100644 --- a/tests/testsuite/pkgid.rs +++ b/tests/testsuite/pkgid.rs @@ -1,9 +1,9 @@ //! Tests for the `cargo pkgid` command. +use crate::prelude::*; use cargo_test_support::basic_lib_manifest; use cargo_test_support::compare::assert_e2e; use cargo_test_support::git; -use cargo_test_support::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/precise_pre_release.rs b/tests/testsuite/precise_pre_release.rs index 71c9a3a78..fde98866a 100644 --- a/tests/testsuite/precise_pre_release.rs +++ b/tests/testsuite/precise_pre_release.rs @@ -1,6 +1,6 @@ //! Tests for selecting pre-release versions with `update --precise`. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{project, str}; #[cargo_test] diff --git a/tests/testsuite/proc_macro.rs b/tests/testsuite/proc_macro.rs index 73dd121b9..ab754459c 100644 --- a/tests/testsuite/proc_macro.rs +++ b/tests/testsuite/proc_macro.rs @@ -1,6 +1,6 @@ //! Tests for proc-macros. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::str; diff --git a/tests/testsuite/profile_config.rs b/tests/testsuite/profile_config.rs index d51c0ce69..f9c4f0dd0 100644 --- a/tests/testsuite/profile_config.rs +++ b/tests/testsuite/profile_config.rs @@ -1,6 +1,6 @@ //! Tests for profiles defined in config files. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{basic_lib_manifest, paths, project, str}; use cargo_util_schemas::manifest::TomlDebugInfo; diff --git a/tests/testsuite/profile_custom.rs b/tests/testsuite/profile_custom.rs index 393f6bb04..0d1f3f8dd 100644 --- a/tests/testsuite/profile_custom.rs +++ b/tests/testsuite/profile_custom.rs @@ -1,6 +1,6 @@ //! Tests for named profiles. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{basic_lib_manifest, project, str}; #[cargo_test] diff --git a/tests/testsuite/profile_overrides.rs b/tests/testsuite/profile_overrides.rs index d0bc44bc3..650d040d7 100644 --- a/tests/testsuite/profile_overrides.rs +++ b/tests/testsuite/profile_overrides.rs @@ -1,6 +1,6 @@ //! Tests for profile overrides (build-override and per-package overrides). -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{basic_lib_manifest, basic_manifest, project, str}; diff --git a/tests/testsuite/profile_targets.rs b/tests/testsuite/profile_targets.rs index c95369966..501ee64aa 100644 --- a/tests/testsuite/profile_targets.rs +++ b/tests/testsuite/profile_targets.rs @@ -2,7 +2,7 @@ //! example, the `test` profile applying to test targets, but not other //! targets, etc. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{basic_manifest, project, str, Project}; fn all_target_project() -> Project { diff --git a/tests/testsuite/profile_trim_paths.rs b/tests/testsuite/profile_trim_paths.rs index 978896669..dfe1d98dc 100644 --- a/tests/testsuite/profile_trim_paths.rs +++ b/tests/testsuite/profile_trim_paths.rs @@ -1,9 +1,9 @@ //! Tests for `-Ztrim-paths`. +use crate::prelude::*; use cargo_test_support::basic_manifest; use cargo_test_support::git; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/profiles.rs b/tests/testsuite/profiles.rs index 73a140395..3dd4dc522 100644 --- a/tests/testsuite/profiles.rs +++ b/tests/testsuite/profiles.rs @@ -2,7 +2,7 @@ use std::env; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{project, rustc_host, str}; diff --git a/tests/testsuite/progress.rs b/tests/testsuite/progress.rs index 68b140f4a..d068b2c3c 100644 --- a/tests/testsuite/progress.rs +++ b/tests/testsuite/progress.rs @@ -1,6 +1,6 @@ //! Tests for progress bar. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/pub_priv.rs b/tests/testsuite/pub_priv.rs index b97698097..c8536e0dd 100644 --- a/tests/testsuite/pub_priv.rs +++ b/tests/testsuite/pub_priv.rs @@ -1,6 +1,6 @@ //! Tests for public/private dependencies. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::{Dependency, Package}; use cargo_test_support::str; diff --git a/tests/testsuite/publish.rs b/tests/testsuite/publish.rs index f2a612f5e..ca76e9ac2 100644 --- a/tests/testsuite/publish.rs +++ b/tests/testsuite/publish.rs @@ -3,8 +3,8 @@ use std::fs; use std::sync::{Arc, Mutex}; +use crate::prelude::*; use cargo_test_support::git::{self, repo}; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{self, Package, RegistryBuilder, Response}; use cargo_test_support::{basic_manifest, project, publish, str}; use cargo_test_support::{paths, Project}; diff --git a/tests/testsuite/publish_lockfile.rs b/tests/testsuite/publish_lockfile.rs index 51f376ef7..7d32bf038 100644 --- a/tests/testsuite/publish_lockfile.rs +++ b/tests/testsuite/publish_lockfile.rs @@ -2,7 +2,7 @@ use std::fs::File; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{ basic_manifest, cargo_process, git, paths, project, publish::validate_crate_contents, str, diff --git a/tests/testsuite/read_manifest.rs b/tests/testsuite/read_manifest.rs index 3fbf6dfb3..30b2d455a 100644 --- a/tests/testsuite/read_manifest.rs +++ b/tests/testsuite/read_manifest.rs @@ -1,6 +1,6 @@ //! Tests for the `cargo read-manifest` command. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{basic_bin_manifest, main_file, project, str}; pub fn basic_bin_manifest_with_readme(name: &str, readme_filename: &str) -> String { diff --git a/tests/testsuite/registry.rs b/tests/testsuite/registry.rs index adf2d3cd0..16e47e5f1 100644 --- a/tests/testsuite/registry.rs +++ b/tests/testsuite/registry.rs @@ -6,10 +6,10 @@ use std::path::{Path, PathBuf}; use std::sync::Arc; use std::sync::Mutex; +use crate::prelude::*; use cargo::core::SourceId; use cargo_test_support::cargo_process; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{ self, registry_path, Dependency, Package, RegistryBuilder, Response, TestRegistry, }; diff --git a/tests/testsuite/registry_auth.rs b/tests/testsuite/registry_auth.rs index 360402965..706390b60 100644 --- a/tests/testsuite/registry_auth.rs +++ b/tests/testsuite/registry_auth.rs @@ -1,7 +1,7 @@ //! Tests for registry authentication. +use crate::prelude::*; use cargo_test_support::compare::assert_e2e; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{Package, RegistryBuilder, Token}; use cargo_test_support::str; use cargo_test_support::{project, Execs, Project}; diff --git a/tests/testsuite/registry_overlay.rs b/tests/testsuite/registry_overlay.rs index 3733fb826..6f97296da 100644 --- a/tests/testsuite/registry_overlay.rs +++ b/tests/testsuite/registry_overlay.rs @@ -1,6 +1,6 @@ //! Tests for local-registry sources. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::{Package, RegistryBuilder, TestRegistry}; use cargo_test_support::str; diff --git a/tests/testsuite/rename_deps.rs b/tests/testsuite/rename_deps.rs index a31641f94..94d5698a8 100644 --- a/tests/testsuite/rename_deps.rs +++ b/tests/testsuite/rename_deps.rs @@ -1,8 +1,8 @@ //! Tests for renaming dependencies. +use crate::prelude::*; use cargo_test_support::git; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{self, Package}; use cargo_test_support::{basic_manifest, project, str}; diff --git a/tests/testsuite/replace.rs b/tests/testsuite/replace.rs index e80341d93..8f9b3eb0f 100644 --- a/tests/testsuite/replace.rs +++ b/tests/testsuite/replace.rs @@ -1,8 +1,8 @@ //! Tests for `[replace]` table source replacement. +use crate::prelude::*; use cargo_test_support::git; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{basic_manifest, project, str}; diff --git a/tests/testsuite/required_features.rs b/tests/testsuite/required_features.rs index ea6357250..8cab2a9a2 100644 --- a/tests/testsuite/required_features.rs +++ b/tests/testsuite/required_features.rs @@ -1,9 +1,9 @@ //! Tests for targets with `required-features`. +use crate::prelude::*; use cargo_test_support::install::{assert_has_installed_exe, 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; diff --git a/tests/testsuite/run.rs b/tests/testsuite/run.rs index 271b8e7ac..c464f206c 100644 --- a/tests/testsuite/run.rs +++ b/tests/testsuite/run.rs @@ -1,6 +1,6 @@ //! Tests for the `cargo run` command. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{ basic_bin_manifest, basic_lib_manifest, basic_manifest, project, str, Project, }; diff --git a/tests/testsuite/rust_version.rs b/tests/testsuite/rust_version.rs index 24c539a9c..0063e18cc 100644 --- a/tests/testsuite/rust_version.rs +++ b/tests/testsuite/rust_version.rs @@ -1,6 +1,6 @@ //! Tests for targets with `rust-version`. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{cargo_process, project, registry::Package, str}; #[cargo_test] diff --git a/tests/testsuite/rustc.rs b/tests/testsuite/rustc.rs index da32f20ac..d06e80451 100644 --- a/tests/testsuite/rustc.rs +++ b/tests/testsuite/rustc.rs @@ -1,6 +1,6 @@ //! Tests for the `cargo rustc` 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] diff --git a/tests/testsuite/rustc_info_cache.rs b/tests/testsuite/rustc_info_cache.rs index 2ef7da92c..8fa729aeb 100644 --- a/tests/testsuite/rustc_info_cache.rs +++ b/tests/testsuite/rustc_info_cache.rs @@ -2,8 +2,8 @@ use std::env; +use crate::prelude::*; use cargo_test_support::basic_bin_manifest; -use cargo_test_support::prelude::*; use cargo_test_support::{basic_manifest, project}; const MISS: &str = "[..] rustc info cache miss[..]"; diff --git a/tests/testsuite/rustdoc.rs b/tests/testsuite/rustdoc.rs index 8289b2612..be24516e1 100644 --- a/tests/testsuite/rustdoc.rs +++ b/tests/testsuite/rustdoc.rs @@ -1,6 +1,6 @@ //! Tests for the `cargo rustdoc` command. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::str; use cargo_test_support::{basic_manifest, cross_compile, project}; diff --git a/tests/testsuite/rustdoc_extern_html.rs b/tests/testsuite/rustdoc_extern_html.rs index 10856fd87..121ac2710 100644 --- a/tests/testsuite/rustdoc_extern_html.rs +++ b/tests/testsuite/rustdoc_extern_html.rs @@ -1,6 +1,6 @@ //! Tests for the -Zrustdoc-map feature. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::{self, Package}; use cargo_test_support::{paths, project, str, Project}; diff --git a/tests/testsuite/rustdocflags.rs b/tests/testsuite/rustdocflags.rs index c06920231..b12298aec 100644 --- a/tests/testsuite/rustdocflags.rs +++ b/tests/testsuite/rustdocflags.rs @@ -1,6 +1,6 @@ //! Tests for setting custom rustdoc flags. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::rustc_host; use cargo_test_support::rustc_host_env; diff --git a/tests/testsuite/rustflags.rs b/tests/testsuite/rustflags.rs index 195d7a07f..2f161c1e7 100644 --- a/tests/testsuite/rustflags.rs +++ b/tests/testsuite/rustflags.rs @@ -2,7 +2,7 @@ use std::fs; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{ basic_manifest, paths, project, project_in_home, rustc_host, str, RawOutput, diff --git a/tests/testsuite/rustup.rs b/tests/testsuite/rustup.rs index c9fda4566..7d47ca774 100644 --- a/tests/testsuite/rustup.rs +++ b/tests/testsuite/rustup.rs @@ -6,8 +6,8 @@ use std::ffi::OsString; use std::fs; use std::path::{Path, PathBuf}; +use crate::prelude::*; use cargo_test_support::paths::{home, root}; -use cargo_test_support::prelude::*; use cargo_test_support::{cargo_process, process, project, str}; /// Helper to generate an executable. diff --git a/tests/testsuite/sbom.rs b/tests/testsuite/sbom.rs index b8ebca06d..8c272a767 100644 --- a/tests/testsuite/sbom.rs +++ b/tests/testsuite/sbom.rs @@ -2,6 +2,7 @@ use std::path::PathBuf; +use crate::prelude::*; use cargo_test_support::basic_bin_manifest; use cargo_test_support::cargo_test; use cargo_test_support::compare::assert_e2e; diff --git a/tests/testsuite/script.rs b/tests/testsuite/script.rs index 27603af0c..a02a45f10 100644 --- a/tests/testsuite/script.rs +++ b/tests/testsuite/script.rs @@ -1,8 +1,8 @@ use std::fs; +use crate::prelude::*; use cargo_test_support::basic_manifest; use cargo_test_support::paths::cargo_home; -use cargo_test_support::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/search.rs b/tests/testsuite/search.rs index 872036067..a7ab0d988 100644 --- a/tests/testsuite/search.rs +++ b/tests/testsuite/search.rs @@ -2,10 +2,10 @@ use std::collections::HashSet; +use crate::prelude::*; use cargo::util::cache_lock::CacheLockMode; use cargo_test_support::cargo_process; use cargo_test_support::paths; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{RegistryBuilder, Response}; use cargo_test_support::str; diff --git a/tests/testsuite/shell_quoting.rs b/tests/testsuite/shell_quoting.rs index d5d6800d5..64b5464eb 100644 --- a/tests/testsuite/shell_quoting.rs +++ b/tests/testsuite/shell_quoting.rs @@ -2,7 +2,7 @@ //! in the output, their arguments are quoted properly //! so that the command can be run in a terminal. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::str; diff --git a/tests/testsuite/source_replacement.rs b/tests/testsuite/source_replacement.rs index 520d72d41..aeee72bff 100644 --- a/tests/testsuite/source_replacement.rs +++ b/tests/testsuite/source_replacement.rs @@ -2,7 +2,7 @@ use std::fs; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::{Package, RegistryBuilder, TestRegistry}; use cargo_test_support::{cargo_process, paths, project, str, t}; diff --git a/tests/testsuite/ssh.rs b/tests/testsuite/ssh.rs index ac2b9596c..0240da3d1 100644 --- a/tests/testsuite/ssh.rs +++ b/tests/testsuite/ssh.rs @@ -9,9 +9,9 @@ use std::fs; use std::io::Write; use std::path::PathBuf; +use crate::prelude::*; use cargo_test_support::containers::{Container, ContainerHandle, MkFile}; use cargo_test_support::git::cargo_uses_gitoxide; -use cargo_test_support::prelude::*; use cargo_test_support::{paths, process, project, str, Project}; fn ssh_repo_url(container: &ContainerHandle, name: &str) -> String { diff --git a/tests/testsuite/standard_lib.rs b/tests/testsuite/standard_lib.rs index 099a5fe6f..1b785de14 100644 --- a/tests/testsuite/standard_lib.rs +++ b/tests/testsuite/standard_lib.rs @@ -6,8 +6,8 @@ use std::path::{Path, PathBuf}; +use crate::prelude::*; use cargo_test_support::cross_compile; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{Dependency, Package}; use cargo_test_support::ProjectBuilder; use cargo_test_support::{paths, project, rustc_host, str, Execs}; diff --git a/tests/testsuite/test.rs b/tests/testsuite/test.rs index ef9601595..17bc6f7f5 100644 --- a/tests/testsuite/test.rs +++ b/tests/testsuite/test.rs @@ -2,7 +2,7 @@ use std::fs; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{ basic_bin_manifest, basic_lib_manifest, basic_manifest, cargo_exe, project, str, diff --git a/tests/testsuite/timings.rs b/tests/testsuite/timings.rs index cea0e2887..5fbb7dffb 100644 --- a/tests/testsuite/timings.rs +++ b/tests/testsuite/timings.rs @@ -1,6 +1,6 @@ //! Tests for --timings. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/tool_paths.rs b/tests/testsuite/tool_paths.rs index b733d6f9b..1321e4d78 100644 --- a/tests/testsuite/tool_paths.rs +++ b/tests/testsuite/tool_paths.rs @@ -1,6 +1,6 @@ //! Tests for configuration values that point to programs. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{basic_lib_manifest, project, rustc_host, rustc_host_env, str}; #[cargo_test] diff --git a/tests/testsuite/unit_graph.rs b/tests/testsuite/unit_graph.rs index 3b1318167..b338806ae 100644 --- a/tests/testsuite/unit_graph.rs +++ b/tests/testsuite/unit_graph.rs @@ -1,6 +1,6 @@ //! Tests for --unit-graph option. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::Package; use cargo_test_support::str; diff --git a/tests/testsuite/update.rs b/tests/testsuite/update.rs index 047567a27..2f0cc183c 100644 --- a/tests/testsuite/update.rs +++ b/tests/testsuite/update.rs @@ -1,7 +1,7 @@ //! Tests for the `cargo update` command. +use crate::prelude::*; use cargo_test_support::compare::assert_e2e; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{self}; use cargo_test_support::registry::{Dependency, Package}; use cargo_test_support::{basic_lib_manifest, basic_manifest, git, project, str}; diff --git a/tests/testsuite/utils/cross_compile.rs b/tests/testsuite/utils/cross_compile.rs index 8d94a6ae8..1ae1a06e8 100644 --- a/tests/testsuite/utils/cross_compile.rs +++ b/tests/testsuite/utils/cross_compile.rs @@ -9,6 +9,7 @@ //! //! These tests are all disabled on rust-lang/rust's CI, but run in Cargo's CI. +use crate::prelude::*; use cargo_test_support::{basic_manifest, cross_compile::alternate, main_file, project}; use cargo_util::ProcessError; use std::fmt::Write; diff --git a/tests/testsuite/utils/tools.rs b/tests/testsuite/utils/tools.rs index 7384a136f..634567d4e 100644 --- a/tests/testsuite/utils/tools.rs +++ b/tests/testsuite/utils/tools.rs @@ -1,5 +1,6 @@ //! Common executables that can be reused by various tests. +use crate::prelude::*; use cargo_test_support::{basic_manifest, paths, project, Project}; use std::path::{Path, PathBuf}; use std::sync::Mutex; diff --git a/tests/testsuite/vendor.rs b/tests/testsuite/vendor.rs index 04872aa0b..9e7fcdca4 100644 --- a/tests/testsuite/vendor.rs +++ b/tests/testsuite/vendor.rs @@ -6,9 +6,9 @@ use std::fs; +use crate::prelude::*; use cargo_test_support::compare::assert_e2e; use cargo_test_support::git; -use cargo_test_support::prelude::*; use cargo_test_support::registry::{self, Package, RegistryBuilder}; use cargo_test_support::str; use cargo_test_support::{basic_lib_manifest, basic_manifest, paths, project, Project}; diff --git a/tests/testsuite/verify_project.rs b/tests/testsuite/verify_project.rs index a02994da4..3864072e2 100644 --- a/tests/testsuite/verify_project.rs +++ b/tests/testsuite/verify_project.rs @@ -1,6 +1,6 @@ //! Tests for the `cargo verify-project` command. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{basic_bin_manifest, main_file, project, str}; #[cargo_test] diff --git a/tests/testsuite/version.rs b/tests/testsuite/version.rs index 83f2d2b78..8ec5765f2 100644 --- a/tests/testsuite/version.rs +++ b/tests/testsuite/version.rs @@ -1,6 +1,6 @@ //! Tests for displaying the cargo version. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::{cargo_process, project}; #[cargo_test] diff --git a/tests/testsuite/warn_on_failure.rs b/tests/testsuite/warn_on_failure.rs index f5b91597e..27c66a1e7 100644 --- a/tests/testsuite/warn_on_failure.rs +++ b/tests/testsuite/warn_on_failure.rs @@ -1,6 +1,6 @@ //! Tests for whether or not warnings are displayed for build scripts. -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::{project, str, Project}; diff --git a/tests/testsuite/warning_override.rs b/tests/testsuite/warning_override.rs index e34063b2c..5d9d19ae9 100644 --- a/tests/testsuite/warning_override.rs +++ b/tests/testsuite/warning_override.rs @@ -1,5 +1,6 @@ //! Tests for overriding warning behavior using `build.warnings` config option. +use crate::prelude::*; use crate::utils::tools; use cargo_test_support::{cargo_test, project, str, Project}; diff --git a/tests/testsuite/weak_dep_features.rs b/tests/testsuite/weak_dep_features.rs index 80882fcef..992251b30 100644 --- a/tests/testsuite/weak_dep_features.rs +++ b/tests/testsuite/weak_dep_features.rs @@ -2,7 +2,7 @@ use std::fmt::Write; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::{Dependency, Package, RegistryBuilder}; use cargo_test_support::str; use cargo_test_support::{project, publish}; diff --git a/tests/testsuite/workspaces.rs b/tests/testsuite/workspaces.rs index 8ae6bc37a..90ba4ee11 100644 --- a/tests/testsuite/workspaces.rs +++ b/tests/testsuite/workspaces.rs @@ -3,7 +3,7 @@ use std::env; use std::fs; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::registry::Package; use cargo_test_support::str; use cargo_test_support::{basic_lib_manifest, basic_manifest, git, project, sleep_ms}; diff --git a/tests/testsuite/yank.rs b/tests/testsuite/yank.rs index f97c36bf1..4c18fe2a9 100644 --- a/tests/testsuite/yank.rs +++ b/tests/testsuite/yank.rs @@ -2,7 +2,7 @@ use std::fs; -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::project; use cargo_test_support::registry; use cargo_test_support::str;