From 47312c446d6e850f2549dcd82b761639b7df4e5b Mon Sep 17 00:00:00 2001 From: Ross Sullivan Date: Sat, 21 Jun 2025 18:54:24 +0900 Subject: [PATCH 1/6] chore: Moved tools and some cross compiling logic into testsuite --- .../cargo-test-support/src/cross_compile.rs | 206 +--------------- crates/cargo-test-support/src/lib.rs | 3 +- tests/testsuite/artifact_dep.rs | 33 +-- tests/testsuite/build.rs | 3 +- tests/testsuite/build_script.rs | 13 +- tests/testsuite/cache_messages.rs | 2 +- tests/testsuite/cargo_alias_config.rs | 2 +- tests/testsuite/cargo_command.rs | 2 +- tests/testsuite/cargo_tree/deps.rs | 9 +- tests/testsuite/check.rs | 2 +- tests/testsuite/collisions.rs | 3 +- tests/testsuite/cross_compile.rs | 50 ++-- tests/testsuite/cross_publish.rs | 5 +- tests/testsuite/doc.rs | 3 +- tests/testsuite/features2.rs | 7 +- tests/testsuite/fetch.rs | 5 +- tests/testsuite/fix.rs | 2 +- tests/testsuite/fix_n_times.rs | 3 +- tests/testsuite/install.rs | 3 +- tests/testsuite/install_upgrade.rs | 3 +- tests/testsuite/main.rs | 3 +- tests/testsuite/multitarget.rs | 21 +- tests/testsuite/rustdoc.rs | 4 +- tests/testsuite/test.rs | 6 +- tests/testsuite/utils/cross_compile.rs | 219 ++++++++++++++++++ tests/testsuite/utils/mod.rs | 2 + .../src => tests/testsuite/utils}/tools.rs | 2 +- tests/testsuite/warning_override.rs | 3 +- 28 files changed, 332 insertions(+), 287 deletions(-) create mode 100644 tests/testsuite/utils/cross_compile.rs create mode 100644 tests/testsuite/utils/mod.rs rename {crates/cargo-test-support/src => tests/testsuite/utils}/tools.rs (98%) diff --git a/crates/cargo-test-support/src/cross_compile.rs b/crates/cargo-test-support/src/cross_compile.rs index f52dfcc0694..d7b2a831e67 100644 --- a/crates/cargo-test-support/src/cross_compile.rs +++ b/crates/cargo-test-support/src/cross_compile.rs @@ -9,189 +9,7 @@ //! //! These tests are all disabled on rust-lang/rust's CI, but run in Cargo's CI. -use crate::{basic_manifest, main_file, project}; -use cargo_util::ProcessError; use std::env; -use std::fmt::Write; -use std::process::{Command, Output}; -use std::sync::atomic::{AtomicBool, Ordering}; -use std::sync::Once; - -/// Whether or not the resulting cross binaries can run on the host. -static CAN_RUN_ON_HOST: AtomicBool = AtomicBool::new(false); - -pub fn disabled() -> bool { - // First, disable if requested. - match env::var("CFG_DISABLE_CROSS_TESTS") { - Ok(ref s) if *s == "1" => return true, - _ => {} - } - - // It requires setting `target.linker` for cross-compilation to work on aarch64, - // so not going to bother now. - if cfg!(all(target_arch = "aarch64", target_os = "linux")) { - return true; - } - - // Cross tests are only tested to work on macos, linux, and MSVC windows. - if !(cfg!(target_os = "macos") || cfg!(target_os = "linux") || cfg!(target_env = "msvc")) { - return true; - } - - // It's not particularly common to have a cross-compilation setup, so - // try to detect that before we fail a bunch of tests through no fault - // of the user. - static CAN_BUILD_CROSS_TESTS: AtomicBool = AtomicBool::new(false); - static CHECK: Once = Once::new(); - - let cross_target = alternate(); - - let run_cross_test = || -> anyhow::Result { - let p = project() - .at("cross_test") - .file("Cargo.toml", &basic_manifest("cross_test", "1.0.0")) - .file("src/main.rs", &main_file(r#""testing!""#, &[])) - .build(); - - let build_result = p - .cargo("build --target") - .arg(&cross_target) - .exec_with_output(); - - if build_result.is_ok() { - CAN_BUILD_CROSS_TESTS.store(true, Ordering::SeqCst); - } - - let result = p - .cargo("run --target") - .arg(&cross_target) - .exec_with_output(); - - if result.is_ok() { - CAN_RUN_ON_HOST.store(true, Ordering::SeqCst); - } - build_result - }; - - CHECK.call_once(|| { - drop(run_cross_test()); - }); - - if CAN_BUILD_CROSS_TESTS.load(Ordering::SeqCst) { - // We were able to compile a simple project, so the user has the - // necessary `std::` bits installed. Therefore, tests should not - // be disabled. - return false; - } - - // We can't compile a simple cross project. We want to warn the user - // by failing a single test and having the remainder of the cross tests - // pass. We don't use `std::sync::Once` here because panicking inside its - // `call_once` method would poison the `Once` instance, which is not what - // we want. - static HAVE_WARNED: AtomicBool = AtomicBool::new(false); - - if HAVE_WARNED.swap(true, Ordering::SeqCst) { - // We are some other test and somebody else is handling the warning. - // Just disable the current test. - return true; - } - - // We are responsible for warning the user, which we do by panicking. - let mut message = format!( - " -Cannot cross compile to {}. - -This failure can be safely ignored. If you would prefer to not see this -failure, you can set the environment variable CFG_DISABLE_CROSS_TESTS to \"1\". - -Alternatively, you can install the necessary libraries to enable cross -compilation tests. Cross compilation tests depend on your host platform. -", - cross_target - ); - - if cfg!(target_os = "linux") { - message.push_str( - " -Linux cross tests target i686-unknown-linux-gnu, which requires the ability to -build and run 32-bit targets. This requires the 32-bit libraries to be -installed. For example, on Ubuntu, run `sudo apt install gcc-multilib` to -install the necessary libraries. -", - ); - } else if cfg!(all(target_os = "macos", target_arch = "aarch64")) { - message.push_str( - " -macOS on aarch64 cross tests to target x86_64-apple-darwin. -This should be natively supported via Xcode, nothing additional besides the -rustup target should be needed. -", - ); - } else if cfg!(target_os = "macos") { - message.push_str( - " -macOS on x86_64 cross tests to target x86_64-apple-ios, which requires the iOS -SDK to be installed. This should be included with Xcode automatically. If you -are using the Xcode command line tools, you'll need to install the full Xcode -app (from the Apple App Store), and switch to it with this command: - - sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer - -Some cross-tests want to *run* the executables on the host. These tests will -be ignored if this is not possible. On macOS, this means you need an iOS -simulator installed to run these tests. To install a simulator, open Xcode, go -to preferences > Components, and download the latest iOS simulator. -", - ); - } else if cfg!(target_os = "windows") { - message.push_str( - " -Windows cross tests target i686-pc-windows-msvc, which requires the ability -to build and run 32-bit targets. This should work automatically if you have -properly installed Visual Studio build tools. -", - ); - } else { - // The check at the top should prevent this. - panic!("platform should have been skipped"); - } - - let rustup_available = Command::new("rustup").output().is_ok(); - if rustup_available { - write!( - message, - " -Make sure that the appropriate `rustc` target is installed with rustup: - - rustup target add {} -", - cross_target - ) - .unwrap(); - } else { - write!( - message, - " -rustup does not appear to be installed. Make sure that the appropriate -`rustc` target is installed for the target `{}`. -", - cross_target - ) - .unwrap(); - } - - // Show the actual error message. - match run_cross_test() { - Ok(_) => message.push_str("\nUh oh, second run succeeded?\n"), - Err(err) => match err.downcast_ref::() { - Some(proc_err) => write!(message, "\nTest error: {}\n", proc_err).unwrap(), - None => write!(message, "\nUnexpected non-process error: {}\n", err).unwrap(), - }, - } - - panic!("{}", message); -} /// The arch triple of the test-running host. pub fn native() -> &'static str { @@ -252,31 +70,9 @@ pub fn unused() -> &'static str { "wasm32-unknown-unknown" } -/// Whether or not the host can run cross-compiled executables. -pub fn can_run_on_host() -> bool { - if disabled() { - return false; - } - // macos is currently configured to cross compile to x86_64-apple-ios - // which requires a simulator to run. Azure's CI image appears to have the - // SDK installed, but are not configured to launch iOS images with a - // simulator. - if cfg!(target_os = "macos") { - if CAN_RUN_ON_HOST.load(Ordering::SeqCst) { - return true; - } else { - println!("Note: Cannot run on host, skipping."); - return false; - } - } else { - assert!(CAN_RUN_ON_HOST.load(Ordering::SeqCst)); - return true; - } -} - /// Check if the given target has been installed. /// -/// Generally [`disabled`] should be used to check if cross-compilation is allowed. +/// Generally `testsuite::utils::cross_compile::disabled` should be used to check if cross-compilation is allowed. /// And [`alternate`] to get the cross target. /// /// You should only use this as a last resort to skip tests, diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs index 9c1a96f54b1..37abd9f5253 100644 --- a/crates/cargo-test-support/src/lib.rs +++ b/crates/cargo-test-support/src/lib.rs @@ -110,7 +110,6 @@ pub mod install; pub mod paths; pub mod publish; pub mod registry; -pub mod tools; pub mod prelude { pub use crate::cargo_test; @@ -643,8 +642,8 @@ pub struct RawOutput { /// /// Construct with /// - [`execs`] -/// - [`cargo_process`] /// - [`Project`] methods +/// - `cargo_process` in testsuite #[must_use] #[derive(Clone)] pub struct Execs { diff --git a/tests/testsuite/artifact_dep.rs b/tests/testsuite/artifact_dep.rs index c3f9f1e3559..8ec39d74822 100644 --- a/tests/testsuite/artifact_dep.rs +++ b/tests/testsuite/artifact_dep.rs @@ -1,6 +1,9 @@ //! Tests specific to artifact dependencies, designated using //! the new `dep = { artifact = "bin", … }` syntax in manifests. +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}; @@ -340,7 +343,7 @@ fn features_are_unified_among_lib_and_bin_dep_of_same_target() { #[cargo_test] fn features_are_not_unified_among_lib_and_bin_dep_of_different_target() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let target = cross_compile::alternate(); @@ -455,7 +458,7 @@ For more information about this error, try `rustc --explain E0425`. #[cargo_test] fn feature_resolution_works_for_cfg_target_specification() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let target = cross_compile::alternate(); @@ -1079,7 +1082,7 @@ fn allow_artifact_and_non_artifact_dependency_to_same_crate() { #[cargo_test] fn build_script_deps_adopt_specified_target_unconditionally() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -1137,7 +1140,7 @@ fn build_script_deps_adopt_specified_target_unconditionally() { /// inverse RFC-3176 #[cargo_test] fn build_script_deps_adopt_do_not_allow_multiple_targets_under_different_name_and_same_version() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -1196,7 +1199,7 @@ fn build_script_deps_adopt_do_not_allow_multiple_targets_under_different_name_an #[cargo_test] fn non_build_script_deps_adopt_specified_target_unconditionally() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -1247,7 +1250,7 @@ fn non_build_script_deps_adopt_specified_target_unconditionally() { #[cargo_test] fn cross_doctests_works_with_artifacts() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -1302,7 +1305,7 @@ fn cross_doctests_works_with_artifacts() { println!("c"); let target = cross_compile::alternate(); - if !cross_compile::can_run_on_host() { + if !cross_compile_can_run_on_host() { return; } @@ -1327,7 +1330,7 @@ fn cross_doctests_works_with_artifacts() { #[cargo_test] fn build_script_deps_adopts_target_platform_if_target_equals_target() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -1498,7 +1501,7 @@ foo v0.0.0 ([ROOT]/foo) #[cargo_test] fn artifact_dep_target_specified() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let target = cross_compile::alternate(); @@ -1554,7 +1557,7 @@ foo v0.0.0 ([ROOT]/foo) /// * the target is not activated. #[cargo_test] fn dep_of_artifact_dep_same_target_specified() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let target = cross_compile::alternate(); @@ -1629,7 +1632,7 @@ foo v0.1.0 ([ROOT]/foo) #[cargo_test] fn targets_are_picked_up_from_non_workspace_artifact_deps() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let target = cross_compile::alternate(); @@ -1675,7 +1678,7 @@ fn targets_are_picked_up_from_non_workspace_artifact_deps() { #[cargo_test] fn index_version_filtering() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let target = cross_compile::alternate(); @@ -1748,7 +1751,7 @@ required by package `foo v0.1.0 ([ROOT]/foo)` fn proc_macro_in_artifact_dep() { // Forcing FeatureResolver to check a proc-macro for a dependency behind a // target dependency. - if cross_compile::disabled() { + if cross_compile_disabled() { return; } Package::new("pm", "1.0.0") @@ -2563,7 +2566,7 @@ fn build_script_features_for_shared_dependency() { // // When common is built as a dependency of foo, it should have features // `f1` (for the library and the build script). - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let target = cross_compile::alternate(); @@ -2728,7 +2731,7 @@ fn calc_bin_artifact_fingerprint() { #[cargo_test] fn with_target_and_optional() { // See rust-lang/cargo#10526 - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let target = cross_compile::alternate(); diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs index 2732107637e..0ead9eb5082 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::utils::tools; use cargo::core::compiler::UserIntent; use cargo::core::Shell; use cargo::core::Workspace; @@ -18,7 +19,7 @@ use cargo_test_support::str; use cargo_test_support::{ basic_bin_manifest, basic_lib_manifest, basic_manifest, cargo_exe, cargo_process, git, is_nightly, main_file, paths, process, project, rustc_host, sleep_ms, symlink_supported, t, - tools, Execs, ProjectBuilder, + Execs, ProjectBuilder, }; use cargo_util::paths::dylib_path_envvar; diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs index fd945b8b60f..c8766c95858 100644 --- a/tests/testsuite/build_script.rs +++ b/tests/testsuite/build_script.rs @@ -5,12 +5,15 @@ use std::fs; use std::io; use std::thread; +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::tools; use cargo_test_support::{ basic_manifest, cargo_exe, cross_compile, is_coarse_mtime, project, project_in, }; @@ -427,7 +430,7 @@ fn custom_build_env_var_rustc_workspace_wrapper() { #[cargo_test] fn custom_build_env_var_rustc_linker() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let target = cross_compile::alternate(); @@ -466,7 +469,7 @@ fn custom_build_env_var_rustc_linker() { #[cargo_test] #[cfg(target_os = "linux")] fn custom_build_env_var_rustc_linker_with_target_cfg() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -4795,7 +4798,7 @@ fn rename_with_link_search_path() { ignore = "don't have a cdylib cross target on macos" )] fn rename_with_link_search_path_cross() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -5515,7 +5518,7 @@ fn duplicate_script_with_extra_env() { // Test where a build script is run twice, that emits different rustc-env // and rustc-cfg values. In this case, one is run for host, the other for // target. - if !cross_compile::can_run_on_host() { + if !cross_compile_can_run_on_host() { return; } diff --git a/tests/testsuite/cache_messages.rs b/tests/testsuite/cache_messages.rs index f5f11a11813..ed2a12083b6 100644 --- a/tests/testsuite/cache_messages.rs +++ b/tests/testsuite/cache_messages.rs @@ -1,8 +1,8 @@ //! Tests for caching compiler diagnostics. +use crate::utils::tools; use cargo_test_support::prelude::*; use cargo_test_support::str; -use cargo_test_support::tools; use cargo_test_support::{basic_manifest, is_coarse_mtime, project, registry::Package, sleep_ms}; use super::messages::raw_rustc_output; diff --git a/tests/testsuite/cargo_alias_config.rs b/tests/testsuite/cargo_alias_config.rs index 2ad9d99c388..0d20745616c 100644 --- a/tests/testsuite/cargo_alias_config.rs +++ b/tests/testsuite/cargo_alias_config.rs @@ -2,9 +2,9 @@ use std::env; +use crate::utils::tools::echo_subcommand; use cargo_test_support::prelude::*; use cargo_test_support::str; -use cargo_test_support::tools::echo_subcommand; use cargo_test_support::{basic_bin_manifest, project}; #[cargo_test] diff --git a/tests/testsuite/cargo_command.rs b/tests/testsuite/cargo_command.rs index 0208eb7c42b..3fbb975dff8 100644 --- a/tests/testsuite/cargo_command.rs +++ b/tests/testsuite/cargo_command.rs @@ -7,12 +7,12 @@ use std::path::{Path, PathBuf}; use std::process::Stdio; use std::str; +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; -use cargo_test_support::tools::echo_subcommand; use cargo_test_support::{ basic_bin_manifest, cargo_exe, cargo_process, paths, project, project_in_home, }; diff --git a/tests/testsuite/cargo_tree/deps.rs b/tests/testsuite/cargo_tree/deps.rs index bdd01f9cdb0..574d543aadd 100644 --- a/tests/testsuite/cargo_tree/deps.rs +++ b/tests/testsuite/cargo_tree/deps.rs @@ -1,6 +1,7 @@ //! Tests for the `cargo tree` command. -use cargo_test_support::cross_compile::{self, alternate}; +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; @@ -352,7 +353,7 @@ a v0.1.0 ([ROOT]/foo) #[cargo_test] fn filters_target() { // --target flag - if cross_compile::disabled() { + if cross_compile_disabled() { return; } Package::new("targetdep", "1.0.0").publish(); @@ -481,7 +482,7 @@ foo v0.1.0 ([ROOT]/foo) #[cargo_test] fn no_selected_target_dependency() { // --target flag - if cross_compile::disabled() { + if cross_compile_disabled() { return; } Package::new("targetdep", "1.0.0").publish(); @@ -1008,7 +1009,7 @@ cat v2.0.0 #[cargo_test] fn duplicates_with_target() { // --target flag - if cross_compile::disabled() { + if cross_compile_disabled() { return; } Package::new("a", "1.0.0").publish(); diff --git a/tests/testsuite/check.rs b/tests/testsuite/check.rs index cff23929cf6..43fe1f8ad54 100644 --- a/tests/testsuite/check.rs +++ b/tests/testsuite/check.rs @@ -2,12 +2,12 @@ use std::fmt::{self, Write}; +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::tools; use cargo_test_support::{basic_bin_manifest, basic_manifest, git, project}; #[cargo_test] diff --git a/tests/testsuite/collisions.rs b/tests/testsuite/collisions.rs index 1f69f3e7f44..59214d4a1fa 100644 --- a/tests/testsuite/collisions.rs +++ b/tests/testsuite/collisions.rs @@ -3,6 +3,7 @@ //! Ideally these should never happen, but I don't think we'll ever be able to //! prevent all collisions. +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; @@ -470,7 +471,7 @@ the same path; see . #[cargo_test] fn collision_doc_target() { // collision in doc with --target, doesn't fail due to orphans - if cross_compile::disabled() { + if cross_compile_disabled() { return; } diff --git a/tests/testsuite/cross_compile.rs b/tests/testsuite/cross_compile.rs index af557d67249..33aa149ed36 100644 --- a/tests/testsuite/cross_compile.rs +++ b/tests/testsuite/cross_compile.rs @@ -7,9 +7,13 @@ use cargo_test_support::rustc_host; use cargo_test_support::str; use cargo_test_support::{basic_bin_manifest, basic_manifest, cross_compile, project}; +use crate::utils::cross_compile::{ + can_run_on_host as cross_compile_can_run_on_host, disabled as cross_compile_disabled, +}; + #[cargo_test] fn simple_cross() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -54,14 +58,14 @@ fn simple_cross() { p.cargo("build -v --target").arg(&target).run(); assert!(p.target_bin(target, "foo").is_file()); - if cross_compile::can_run_on_host() { + if cross_compile_can_run_on_host() { p.process(&p.target_bin(target, "foo")).run(); } } #[cargo_test] fn simple_cross_config() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -116,14 +120,14 @@ fn simple_cross_config() { p.cargo("build -v").run(); assert!(p.target_bin(target, "foo").is_file()); - if cross_compile::can_run_on_host() { + if cross_compile_can_run_on_host() { p.process(&p.target_bin(target, "foo")).run(); } } #[cargo_test] fn simple_deps() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -153,7 +157,7 @@ fn simple_deps() { p.cargo("build --target").arg(&target).run(); assert!(p.target_bin(target, "foo").is_file()); - if cross_compile::can_run_on_host() { + if cross_compile_can_run_on_host() { p.process(&p.target_bin(target, "foo")).run(); } } @@ -165,7 +169,7 @@ fn per_crate_target_test( forced_target: Option<&'static str>, arg_target: Option<&'static str>, ) { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -226,7 +230,7 @@ fn per_crate_target_test( .run(); assert!(p.target_bin(cross_compile::alternate(), "foo").is_file()); - if cross_compile::can_run_on_host() { + if cross_compile_can_run_on_host() { p.process(&p.target_bin(cross_compile::alternate(), "foo")) .run(); } @@ -262,7 +266,7 @@ fn per_crate_forced_target_does_not_get_overridden() { #[cargo_test] fn workspace_with_multiple_targets() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -360,7 +364,7 @@ fn workspace_with_multiple_targets() { assert!(p.target_bin(cross_compile::alternate(), "cross").is_file()); p.process(&p.bin("native")).run(); - if cross_compile::can_run_on_host() { + if cross_compile_can_run_on_host() { p.process(&p.target_bin(cross_compile::alternate(), "cross")) .run(); } @@ -368,7 +372,7 @@ fn workspace_with_multiple_targets() { #[cargo_test] fn linker() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -415,7 +419,7 @@ please set bin.path in Cargo.toml #[cargo_test] fn cross_tests() { - if !cross_compile::can_run_on_host() { + if !cross_compile_can_run_on_host() { return; } @@ -503,7 +507,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini #[cargo_test] fn simple_cargo_run() { - if !cross_compile::can_run_on_host() { + if !cross_compile_can_run_on_host() { return; } @@ -528,7 +532,7 @@ fn simple_cargo_run() { #[cargo_test] fn cross_with_a_build_script() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -589,7 +593,7 @@ fn cross_with_a_build_script() { #[cargo_test] fn build_script_needed_for_host_and_target() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -700,7 +704,7 @@ fn build_script_needed_for_host_and_target() { #[cargo_test] fn build_deps_for_the_right_arch() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -745,7 +749,7 @@ fn build_deps_for_the_right_arch() { #[cargo_test] fn build_script_only_host() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -798,7 +802,7 @@ fn build_script_only_host() { #[cargo_test] fn build_script_with_platform_specific_dependencies() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -872,7 +876,7 @@ fn build_script_with_platform_specific_dependencies() { #[cargo_test] fn platform_specific_dependencies_do_not_leak() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -932,7 +936,7 @@ error[E0463]: can't find crate for `d2` #[cargo_test] fn platform_specific_variables_reflected_in_build_scripts() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -1031,7 +1035,7 @@ fn platform_specific_variables_reflected_in_build_scripts() { ignore = "don't have a dylib cross target on macos" )] fn cross_test_dylib() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -1137,7 +1141,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini reason = "waiting for 1.88 to be stable for doctest xcompile flags" )] fn doctest_xcompile_linker() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -1183,7 +1187,7 @@ fn doctest_xcompile_linker() { #[cargo_test] fn always_emit_warnings_as_warnings_when_learning_target_info() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } diff --git a/tests/testsuite/cross_publish.rs b/tests/testsuite/cross_publish.rs index 4390f738b83..dffd0abc08e 100644 --- a/tests/testsuite/cross_publish.rs +++ b/tests/testsuite/cross_publish.rs @@ -2,12 +2,13 @@ use std::fs::File; +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] fn simple_cross_package() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let p = project() @@ -64,7 +65,7 @@ fn simple_cross_package() { #[cargo_test] fn publish_with_target() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } diff --git a/tests/testsuite/doc.rs b/tests/testsuite/doc.rs index 882568ea7e2..1d0d0ad25ac 100644 --- a/tests/testsuite/doc.rs +++ b/tests/testsuite/doc.rs @@ -3,12 +3,13 @@ use std::fs; use std::str; +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}; -use cargo_test_support::{rustc_host, symlink_supported, tools}; +use cargo_test_support::{rustc_host, symlink_supported}; #[cargo_test] fn simple() { diff --git a/tests/testsuite/features2.rs b/tests/testsuite/features2.rs index fef62079404..e97d6a4103b 100644 --- a/tests/testsuite/features2.rs +++ b/tests/testsuite/features2.rs @@ -2,7 +2,8 @@ use std::fs::File; -use cargo_test_support::cross_compile::{self, alternate}; +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; @@ -263,7 +264,7 @@ common #[cargo_test] fn itarget_proc_macro() { // itarget inside a proc-macro while cross-compiling - if cross_compile::disabled() { + if cross_compile_disabled() { return; } Package::new("hostdep", "1.0.0").publish(); @@ -1312,7 +1313,7 @@ fn has_dev_dep_for_test() { #[cargo_test] fn build_dep_activated() { // Build dependencies always match the host for [target.*.build-dependencies]. - if cross_compile::disabled() { + if cross_compile_disabled() { return; } Package::new("somedep", "1.0.0") diff --git a/tests/testsuite/fetch.rs b/tests/testsuite/fetch.rs index ba5c3a136f3..417c67a3a62 100644 --- a/tests/testsuite/fetch.rs +++ b/tests/testsuite/fetch.rs @@ -1,5 +1,6 @@ //! Tests for the `cargo fetch` command. +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; @@ -17,7 +18,7 @@ fn no_deps() { #[cargo_test] fn fetch_all_platform_dependencies_when_no_target_is_given() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } @@ -69,7 +70,7 @@ fn fetch_all_platform_dependencies_when_no_target_is_given() { #[cargo_test] fn fetch_platform_specific_dependencies() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } diff --git a/tests/testsuite/fix.rs b/tests/testsuite/fix.rs index f6fe7993471..656189158c0 100644 --- a/tests/testsuite/fix.rs +++ b/tests/testsuite/fix.rs @@ -1,5 +1,6 @@ //! Tests for the `cargo fix` command. +use crate::utils::tools; use cargo::core::Edition; use cargo_test_support::compare::assert_e2e; use cargo_test_support::git::{self, init}; @@ -7,7 +8,6 @@ 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::tools; use cargo_test_support::{basic_manifest, is_nightly, project}; #[cargo_test] diff --git a/tests/testsuite/fix_n_times.rs b/tests/testsuite/fix_n_times.rs index 179602ff01a..d1d422d6b0b 100644 --- a/tests/testsuite/fix_n_times.rs +++ b/tests/testsuite/fix_n_times.rs @@ -17,8 +17,9 @@ use std::path::PathBuf; use std::sync::{Mutex, OnceLock}; +use crate::utils::tools; use cargo_test_support::prelude::*; -use cargo_test_support::{basic_manifest, paths, project, str, tools, Execs}; +use cargo_test_support::{basic_manifest, paths, project, str, Execs}; /// The action that the `rustc` shim should take in the current sequence of /// events. diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs index 69e43b3d748..da4166d05fb 100644 --- a/tests/testsuite/install.rs +++ b/tests/testsuite/install.rs @@ -18,6 +18,7 @@ use cargo_test_support::{ }; use cargo_util::{ProcessBuilder, ProcessError}; +use crate::utils::cross_compile::disabled as cross_compile_disabled; use cargo_test_support::install::{assert_has_installed_exe, assert_has_not_installed_exe, exe}; use cargo_test_support::paths; @@ -1604,7 +1605,7 @@ fn install_target_native() { #[cargo_test] fn install_target_foreign() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } diff --git a/tests/testsuite/install_upgrade.rs b/tests/testsuite/install_upgrade.rs index fb52e38447e..fe0aaea8086 100644 --- a/tests/testsuite/install_upgrade.rs +++ b/tests/testsuite/install_upgrade.rs @@ -6,6 +6,7 @@ use std::fs; use std::path::PathBuf; use std::sync::atomic::{AtomicUsize, Ordering}; +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; @@ -468,7 +469,7 @@ fn change_profile_rebuilds() { #[cargo_test] fn change_target_rebuilds() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } pkg("foo", "1.0.0"); diff --git a/tests/testsuite/main.rs b/tests/testsuite/main.rs index d841cd38544..d692ce1aeef 100644 --- a/tests/testsuite/main.rs +++ b/tests/testsuite/main.rs @@ -183,6 +183,7 @@ mod timings; mod tool_paths; mod unit_graph; mod update; +mod utils; mod vendor; mod verify_project; mod version; @@ -197,5 +198,5 @@ use cargo_test_support::prelude::*; #[cargo_test] fn aaa_trigger_cross_compile_disabled_check() { // This triggers the cross compile disabled check to run ASAP, see #5141 - cargo_test_support::cross_compile::disabled(); + crate::utils::cross_compile::disabled(); } diff --git a/tests/testsuite/multitarget.rs b/tests/testsuite/multitarget.rs index f159a3ecbf1..56a4de1a05b 100644 --- a/tests/testsuite/multitarget.rs +++ b/tests/testsuite/multitarget.rs @@ -1,11 +1,14 @@ //! Tests for multiple `--target` flags to subcommands +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] fn simple_build() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let t1 = cross_compile::alternate(); @@ -28,7 +31,7 @@ fn simple_build() { #[cargo_test] fn simple_build_with_config() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let t1 = cross_compile::alternate(); @@ -55,7 +58,7 @@ fn simple_build_with_config() { #[cargo_test] fn simple_test() { - if !cross_compile::can_run_on_host() { + if !cross_compile_can_run_on_host() { return; } let t1 = cross_compile::alternate(); @@ -100,7 +103,7 @@ fn simple_run() { #[cargo_test] fn simple_doc() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let t1 = cross_compile::alternate(); @@ -123,7 +126,7 @@ fn simple_doc() { #[cargo_test] fn simple_doc_open() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let t1 = cross_compile::alternate(); @@ -151,7 +154,7 @@ fn simple_doc_open() { #[cargo_test] fn simple_check() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let t1 = cross_compile::alternate(); @@ -171,7 +174,7 @@ fn simple_check() { #[cargo_test] fn same_value_twice() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let t = rustc_host(); @@ -192,7 +195,7 @@ fn same_value_twice() { #[cargo_test] fn same_value_twice_with_config() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let t = rustc_host(); @@ -217,7 +220,7 @@ fn same_value_twice_with_config() { #[cargo_test] fn works_with_config_in_both_string_or_list() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } let t = rustc_host(); diff --git a/tests/testsuite/rustdoc.rs b/tests/testsuite/rustdoc.rs index a502dd27222..8289b261266 100644 --- a/tests/testsuite/rustdoc.rs +++ b/tests/testsuite/rustdoc.rs @@ -4,6 +4,8 @@ use cargo_test_support::prelude::*; use cargo_test_support::str; use cargo_test_support::{basic_manifest, cross_compile, project}; +use crate::utils::cross_compile::disabled as cross_compile_disabled; + #[cargo_test] fn rustdoc_simple() { let p = project().file("src/lib.rs", "").build(); @@ -280,7 +282,7 @@ fn proc_macro_crate_type() { #[cargo_test] fn rustdoc_target() { - if cross_compile::disabled() { + if cross_compile_disabled() { return; } diff --git a/tests/testsuite/test.rs b/tests/testsuite/test.rs index d28a0d1999c..ef96015953d 100644 --- a/tests/testsuite/test.rs +++ b/tests/testsuite/test.rs @@ -11,6 +11,8 @@ use cargo_test_support::{cross_compile, paths}; use cargo_test_support::{rustc_host, rustc_host_env, sleep_ms}; use cargo_util::paths::dylib_path_envvar; +use crate::utils::cross_compile::can_run_on_host as cross_compile_can_run_on_host; + #[cargo_test] fn cargo_test_simple() { let p = project() @@ -4786,7 +4788,7 @@ test result: ok. 0 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; fini reason = "waiting for 1.88 to be stable for doctest xcompile flags" )] fn cargo_test_doctest_xcompile_runner() { - if !cross_compile::can_run_on_host() { + if !cross_compile_can_run_on_host() { return; } @@ -4872,7 +4874,7 @@ this is a runner reason = "waiting for 1.88 to be stable for doctest xcompile flags" )] fn cargo_test_doctest_xcompile_no_runner() { - if !cross_compile::can_run_on_host() { + if !cross_compile_can_run_on_host() { return; } diff --git a/tests/testsuite/utils/cross_compile.rs b/tests/testsuite/utils/cross_compile.rs new file mode 100644 index 00000000000..8d94a6ae805 --- /dev/null +++ b/tests/testsuite/utils/cross_compile.rs @@ -0,0 +1,219 @@ +//! Support for cross-compile tests with the `--target` flag. +//! +//! Note that cross-testing is very limited. You need to install the +//! "alternate" target to the host (32-bit for 64-bit hosts or vice-versa). +//! +//! Set `CFG_DISABLE_CROSS_TESTS=1` environment variable to disable these tests +//! if you are unable to use the alternate target. Unfortunately 32-bit +//! support on macOS is going away, so macOS users are out of luck. +//! +//! These tests are all disabled on rust-lang/rust's CI, but run in Cargo's CI. + +use cargo_test_support::{basic_manifest, cross_compile::alternate, main_file, project}; +use cargo_util::ProcessError; +use std::fmt::Write; +use std::{ + process::{Command, Output}, + sync::{ + atomic::{AtomicBool, Ordering}, + Once, + }, +}; + +/// Whether or not the resulting cross binaries can run on the host. +static CAN_RUN_ON_HOST: AtomicBool = AtomicBool::new(false); + +pub fn disabled() -> bool { + // First, disable if requested. + match std::env::var("CFG_DISABLE_CROSS_TESTS") { + Ok(ref s) if *s == "1" => return true, + _ => {} + } + + // It requires setting `target.linker` for cross-compilation to work on aarch64, + // so not going to bother now. + if cfg!(all(target_arch = "aarch64", target_os = "linux")) { + return true; + } + + // Cross tests are only tested to work on macos, linux, and MSVC windows. + if !(cfg!(target_os = "macos") || cfg!(target_os = "linux") || cfg!(target_env = "msvc")) { + return true; + } + + // It's not particularly common to have a cross-compilation setup, so + // try to detect that before we fail a bunch of tests through no fault + // of the user. + static CAN_BUILD_CROSS_TESTS: AtomicBool = AtomicBool::new(false); + static CHECK: Once = Once::new(); + + let cross_target = alternate(); + + let run_cross_test = || -> anyhow::Result { + let p = project() + .at("cross_test") + .file("Cargo.toml", &basic_manifest("cross_test", "1.0.0")) + .file("src/main.rs", &main_file(r#""testing!""#, &[])) + .build(); + + let build_result = p + .cargo("build --target") + .arg(&cross_target) + .exec_with_output(); + + if build_result.is_ok() { + CAN_BUILD_CROSS_TESTS.store(true, Ordering::SeqCst); + } + + let result = p + .cargo("run --target") + .arg(&cross_target) + .exec_with_output(); + + if result.is_ok() { + CAN_RUN_ON_HOST.store(true, Ordering::SeqCst); + } + build_result + }; + + CHECK.call_once(|| { + drop(run_cross_test()); + }); + + if CAN_BUILD_CROSS_TESTS.load(Ordering::SeqCst) { + // We were able to compile a simple project, so the user has the + // necessary `std::` bits installed. Therefore, tests should not + // be disabled. + return false; + } + + // We can't compile a simple cross project. We want to warn the user + // by failing a single test and having the remainder of the cross tests + // pass. We don't use `std::sync::Once` here because panicking inside its + // `call_once` method would poison the `Once` instance, which is not what + // we want. + static HAVE_WARNED: AtomicBool = AtomicBool::new(false); + + if HAVE_WARNED.swap(true, Ordering::SeqCst) { + // We are some other test and somebody else is handling the warning. + // Just disable the current test. + return true; + } + + // We are responsible for warning the user, which we do by panicking. + let mut message = format!( + " + Cannot cross compile to {}. + + This failure can be safely ignored. If you would prefer to not see this + failure, you can set the environment variable CFG_DISABLE_CROSS_TESTS to \"1\". + + Alternatively, you can install the necessary libraries to enable cross + compilation tests. Cross compilation tests depend on your host platform. + ", + cross_target + ); + + if cfg!(target_os = "linux") { + message.push_str( + " + Linux cross tests target i686-unknown-linux-gnu, which requires the ability to + build and run 32-bit targets. This requires the 32-bit libraries to be + installed. For example, on Ubuntu, run `sudo apt install gcc-multilib` to + install the necessary libraries. + ", + ); + } else if cfg!(all(target_os = "macos", target_arch = "aarch64")) { + message.push_str( + " + macOS on aarch64 cross tests to target x86_64-apple-darwin. + This should be natively supported via Xcode, nothing additional besides the + rustup target should be needed. + ", + ); + } else if cfg!(target_os = "macos") { + message.push_str( + " + macOS on x86_64 cross tests to target x86_64-apple-ios, which requires the iOS + SDK to be installed. This should be included with Xcode automatically. If you + are using the Xcode command line tools, you'll need to install the full Xcode + app (from the Apple App Store), and switch to it with this command: + + sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer + + Some cross-tests want to *run* the executables on the host. These tests will + be ignored if this is not possible. On macOS, this means you need an iOS + simulator installed to run these tests. To install a simulator, open Xcode, go + to preferences > Components, and download the latest iOS simulator. + ", + ); + } else if cfg!(target_os = "windows") { + message.push_str( + " + Windows cross tests target i686-pc-windows-msvc, which requires the ability + to build and run 32-bit targets. This should work automatically if you have + properly installed Visual Studio build tools. + ", + ); + } else { + // The check at the top should prevent this. + panic!("platform should have been skipped"); + } + + let rustup_available = Command::new("rustup").output().is_ok(); + if rustup_available { + write!( + message, + " + Make sure that the appropriate `rustc` target is installed with rustup: + + rustup target add {} + ", + cross_target + ) + .unwrap(); + } else { + write!( + message, + " + rustup does not appear to be installed. Make sure that the appropriate + `rustc` target is installed for the target `{}`. + ", + cross_target + ) + .unwrap(); + } + + // Show the actual error message. + match run_cross_test() { + Ok(_) => message.push_str("\nUh oh, second run succeeded?\n"), + Err(err) => match err.downcast_ref::() { + Some(proc_err) => write!(message, "\nTest error: {}\n", proc_err).unwrap(), + None => write!(message, "\nUnexpected non-process error: {}\n", err).unwrap(), + }, + } + + panic!("{}", message); +} + +/// Whether or not the host can run cross-compiled executables. +pub fn can_run_on_host() -> bool { + if disabled() { + return false; + } + // macos is currently configured to cross compile to x86_64-apple-ios + // which requires a simulator to run. Azure's CI image appears to have the + // SDK installed, but are not configured to launch iOS images with a + // simulator. + if cfg!(target_os = "macos") { + if CAN_RUN_ON_HOST.load(Ordering::SeqCst) { + return true; + } else { + println!("Note: Cannot run on host, skipping."); + return false; + } + } else { + assert!(CAN_RUN_ON_HOST.load(Ordering::SeqCst)); + return true; + } +} diff --git a/tests/testsuite/utils/mod.rs b/tests/testsuite/utils/mod.rs new file mode 100644 index 00000000000..2ea9e4febfb --- /dev/null +++ b/tests/testsuite/utils/mod.rs @@ -0,0 +1,2 @@ +pub mod cross_compile; +pub mod tools; diff --git a/crates/cargo-test-support/src/tools.rs b/tests/testsuite/utils/tools.rs similarity index 98% rename from crates/cargo-test-support/src/tools.rs rename to tests/testsuite/utils/tools.rs index b6fa4092f88..7384a136f50 100644 --- a/crates/cargo-test-support/src/tools.rs +++ b/tests/testsuite/utils/tools.rs @@ -1,6 +1,6 @@ //! Common executables that can be reused by various tests. -use crate::{basic_manifest, paths, project, Project}; +use cargo_test_support::{basic_manifest, paths, project, Project}; use std::path::{Path, PathBuf}; use std::sync::Mutex; use std::sync::OnceLock; diff --git a/tests/testsuite/warning_override.rs b/tests/testsuite/warning_override.rs index f78f7368fd2..e34063b2ce0 100644 --- a/tests/testsuite/warning_override.rs +++ b/tests/testsuite/warning_override.rs @@ -1,6 +1,7 @@ //! Tests for overriding warning behavior using `build.warnings` config option. -use cargo_test_support::{cargo_test, project, str, tools, Project}; +use crate::utils::tools; +use cargo_test_support::{cargo_test, project, str, Project}; fn make_project_with_rustc_warning() -> Project { project() From 66fc1055a7fec1221f06fa439f2259d0489c2f5b Mon Sep 17 00:00:00 2001 From: Ross Sullivan Date: Wed, 25 Jun 2025 21:37:11 +0900 Subject: [PATCH 2/6] chore: Created testsuite prelude --- tests/testsuite/main.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/testsuite/main.rs b/tests/testsuite/main.rs index d692ce1aeef..f8af20f3a11 100644 --- a/tests/testsuite/main.rs +++ b/tests/testsuite/main.rs @@ -193,7 +193,12 @@ mod weak_dep_features; mod workspaces; mod yank; -use cargo_test_support::prelude::*; +use crate::prelude::*; + +pub mod prelude { + pub use cargo_test_support::prelude::*; + pub use cargo_test_support::CargoCommandExt; +} #[cargo_test] fn aaa_trigger_cross_compile_disabled_check() { From 92d9a94d0267714170827d8f1967115a6f0a4490 Mon Sep 17 00:00:00 2001 From: Ross Sullivan Date: Wed, 25 Jun 2025 21:48:24 +0900 Subject: [PATCH 3/6] chore: Migrated testsuite to testsuite::prelude --- tests/testsuite/advanced_env.rs | 2 +- tests/testsuite/alt_registry.rs | 2 +- tests/testsuite/artifact_dep.rs | 2 +- tests/testsuite/artifact_dir.rs | 2 +- tests/testsuite/bad_config.rs | 2 +- tests/testsuite/bad_manifest_path.rs | 2 +- tests/testsuite/bench.rs | 2 +- tests/testsuite/binary_name.rs | 2 +- tests/testsuite/build.rs | 2 +- tests/testsuite/build_dir.rs | 1 + tests/testsuite/build_plan.rs | 2 +- tests/testsuite/build_script.rs | 2 +- tests/testsuite/build_script_env.rs | 2 +- tests/testsuite/build_script_extra_link_arg.rs | 2 +- tests/testsuite/build_scripts_multiple.rs | 2 +- tests/testsuite/cache_lock.rs | 2 +- tests/testsuite/cache_messages.rs | 2 +- tests/testsuite/cargo/help/mod.rs | 2 +- tests/testsuite/cargo/z_help/mod.rs | 2 +- tests/testsuite/cargo_add/add_basic/mod.rs | 2 +- tests/testsuite/cargo_add/add_multiple/mod.rs | 2 +- .../add_no_vendored_package_with_alter_registry/mod.rs | 2 +- .../cargo_add/add_no_vendored_package_with_vendor/mod.rs | 2 +- tests/testsuite/cargo_add/add_toolchain/mod.rs | 2 +- tests/testsuite/cargo_add/build/mod.rs | 2 +- tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs | 2 +- tests/testsuite/cargo_add/change_rename_target/mod.rs | 2 +- tests/testsuite/cargo_add/cyclic_features/mod.rs | 2 +- tests/testsuite/cargo_add/default_features/mod.rs | 2 +- tests/testsuite/cargo_add/deprecated_default_features/mod.rs | 2 +- tests/testsuite/cargo_add/deprecated_section/mod.rs | 2 +- tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs | 2 +- .../cargo_add/detect_workspace_inherit_features/mod.rs | 2 +- .../cargo_add/detect_workspace_inherit_optional/mod.rs | 2 +- .../cargo_add/detect_workspace_inherit_path_base/mod.rs | 2 +- .../testsuite/cargo_add/detect_workspace_inherit_public/mod.rs | 2 +- tests/testsuite/cargo_add/dev/mod.rs | 2 +- tests/testsuite/cargo_add/dev_build_conflict/mod.rs | 2 +- tests/testsuite/cargo_add/dev_existing_path_base/mod.rs | 2 +- tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs | 2 +- tests/testsuite/cargo_add/dry_run/mod.rs | 2 +- tests/testsuite/cargo_add/empty_dep_name/mod.rs | 2 +- tests/testsuite/cargo_add/feature_suggestion_multiple/mod.rs | 2 +- tests/testsuite/cargo_add/feature_suggestion_none/mod.rs | 2 +- tests/testsuite/cargo_add/feature_suggestion_single/mod.rs | 2 +- tests/testsuite/cargo_add/features/mod.rs | 2 +- tests/testsuite/cargo_add/features_activated_over_limit/mod.rs | 2 +- .../testsuite/cargo_add/features_deactivated_over_limit/mod.rs | 2 +- tests/testsuite/cargo_add/features_empty/mod.rs | 2 +- .../cargo_add/features_error_activated_over_limit/mod.rs | 2 +- .../cargo_add/features_error_deactivated_over_limit/mod.rs | 2 +- tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs | 2 +- tests/testsuite/cargo_add/features_preserve/mod.rs | 2 +- tests/testsuite/cargo_add/features_spaced_values/mod.rs | 2 +- tests/testsuite/cargo_add/features_unknown/mod.rs | 2 +- tests/testsuite/cargo_add/features_unknown_no_features/mod.rs | 2 +- tests/testsuite/cargo_add/git/mod.rs | 2 +- tests/testsuite/cargo_add/git_branch/mod.rs | 2 +- tests/testsuite/cargo_add/git_conflicts_namever/mod.rs | 2 +- tests/testsuite/cargo_add/git_dev/mod.rs | 2 +- tests/testsuite/cargo_add/git_inferred_name/mod.rs | 2 +- tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs | 2 +- tests/testsuite/cargo_add/git_multiple_names/mod.rs | 2 +- .../testsuite/cargo_add/git_multiple_packages_features/mod.rs | 2 +- tests/testsuite/cargo_add/git_registry/mod.rs | 2 +- tests/testsuite/cargo_add/git_rev/mod.rs | 2 +- tests/testsuite/cargo_add/git_tag/mod.rs | 2 +- tests/testsuite/cargo_add/help/mod.rs | 2 +- tests/testsuite/cargo_add/infer_prerelease/mod.rs | 2 +- tests/testsuite/cargo_add/invalid_arg/mod.rs | 2 +- tests/testsuite/cargo_add/invalid_git_name/mod.rs | 2 +- .../testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs | 2 +- .../cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs | 2 +- .../cargo_add/invalid_key_rename_inherit_dependency/mod.rs | 2 +- tests/testsuite/cargo_add/invalid_manifest/mod.rs | 2 +- tests/testsuite/cargo_add/invalid_name_external/mod.rs | 2 +- tests/testsuite/cargo_add/invalid_path/mod.rs | 2 +- tests/testsuite/cargo_add/invalid_path_name/mod.rs | 2 +- tests/testsuite/cargo_add/invalid_path_self/mod.rs | 2 +- tests/testsuite/cargo_add/invalid_target_empty/mod.rs | 2 +- tests/testsuite/cargo_add/invalid_vers/mod.rs | 2 +- tests/testsuite/cargo_add/list_features/mod.rs | 2 +- tests/testsuite/cargo_add/list_features_path/mod.rs | 2 +- tests/testsuite/cargo_add/list_features_path_no_default/mod.rs | 2 +- tests/testsuite/cargo_add/locked_changed/mod.rs | 2 +- tests/testsuite/cargo_add/locked_unchanged/mod.rs | 2 +- tests/testsuite/cargo_add/lockfile_updated/mod.rs | 2 +- tests/testsuite/cargo_add/manifest_path_package/mod.rs | 2 +- tests/testsuite/cargo_add/merge_activated_features/mod.rs | 2 +- tests/testsuite/cargo_add/missing_at_in_crate_spec/mod.rs | 2 +- .../cargo_add/multiple_conflicts_with_features/mod.rs | 2 +- .../testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs | 2 +- tests/testsuite/cargo_add/namever/mod.rs | 2 +- tests/testsuite/cargo_add/no_args/mod.rs | 2 +- tests/testsuite/cargo_add/no_default_features/mod.rs | 2 +- tests/testsuite/cargo_add/no_optional/mod.rs | 2 +- tests/testsuite/cargo_add/no_public/mod.rs | 2 +- tests/testsuite/cargo_add/normalize_name_git/mod.rs | 2 +- tests/testsuite/cargo_add/normalize_name_path/mod.rs | 2 +- tests/testsuite/cargo_add/normalize_name_path_existing/mod.rs | 2 +- tests/testsuite/cargo_add/normalize_name_registry/mod.rs | 2 +- .../cargo_add/normalize_name_registry_existing/mod.rs | 2 +- .../testsuite/cargo_add/normalize_name_registry_yanked/mod.rs | 2 +- tests/testsuite/cargo_add/normalize_name_workspace_dep/mod.rs | 2 +- tests/testsuite/cargo_add/offline_empty_cache/mod.rs | 2 +- tests/testsuite/cargo_add/optional/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_default_features/mod.rs | 2 +- .../overwrite_default_features_with_no_default_features/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_features/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs | 2 +- .../testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs | 2 +- .../testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_inline_features/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_name_noop/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs | 2 +- .../overwrite_no_default_features_with_default_features/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_no_optional/mod.rs | 2 +- .../cargo_add/overwrite_no_optional_with_optional/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_no_public/mod.rs | 2 +- .../testsuite/cargo_add/overwrite_no_public_with_public/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_optional/mod.rs | 2 +- .../cargo_add/overwrite_optional_with_no_optional/mod.rs | 2 +- .../cargo_add/overwrite_optional_with_optional/mod.rs | 2 +- .../cargo_add/overwrite_path_base_with_version/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_path_noop/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs | 2 +- .../cargo_add/overwrite_preserves_inline_table/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_public/mod.rs | 2 +- .../testsuite/cargo_add/overwrite_public_with_no_public/mod.rs | 2 +- .../testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs | 2 +- .../cargo_add/overwrite_rename_with_rename_noop/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_with_rename/mod.rs | 2 +- tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs | 2 +- .../cargo_add/overwrite_workspace_dep_features/mod.rs | 2 +- tests/testsuite/cargo_add/path/mod.rs | 2 +- tests/testsuite/cargo_add/path_base/mod.rs | 2 +- tests/testsuite/cargo_add/path_base_inferred_name/mod.rs | 2 +- tests/testsuite/cargo_add/path_base_missing_base_path/mod.rs | 2 +- tests/testsuite/cargo_add/path_base_unstable/mod.rs | 2 +- tests/testsuite/cargo_add/path_dev/mod.rs | 2 +- tests/testsuite/cargo_add/path_inferred_name/mod.rs | 2 +- .../cargo_add/path_inferred_name_conflicts_full_feature/mod.rs | 2 +- tests/testsuite/cargo_add/prefixed_v_in_version/mod.rs | 2 +- tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs | 2 +- tests/testsuite/cargo_add/preserve_features_sorted/mod.rs | 2 +- tests/testsuite/cargo_add/preserve_features_table/mod.rs | 2 +- tests/testsuite/cargo_add/preserve_features_unsorted/mod.rs | 2 +- tests/testsuite/cargo_add/preserve_sorted/mod.rs | 2 +- tests/testsuite/cargo_add/preserve_unsorted/mod.rs | 2 +- tests/testsuite/cargo_add/public/mod.rs | 2 +- tests/testsuite/cargo_add/quiet/mod.rs | 2 +- tests/testsuite/cargo_add/registry/mod.rs | 2 +- tests/testsuite/cargo_add/rename/mod.rs | 2 +- tests/testsuite/cargo_add/require_weak/mod.rs | 2 +- tests/testsuite/cargo_add/rust_version_ignore/mod.rs | 2 +- tests/testsuite/cargo_add/rust_version_incompatible/mod.rs | 2 +- tests/testsuite/cargo_add/rust_version_latest/mod.rs | 2 +- tests/testsuite/cargo_add/rust_version_older/mod.rs | 2 +- tests/testsuite/cargo_add/rustc_ignore/mod.rs | 2 +- tests/testsuite/cargo_add/rustc_incompatible/mod.rs | 2 +- tests/testsuite/cargo_add/rustc_latest/mod.rs | 2 +- tests/testsuite/cargo_add/rustc_older/mod.rs | 2 +- tests/testsuite/cargo_add/script_bare/mod.rs | 2 +- tests/testsuite/cargo_add/script_frontmatter/mod.rs | 2 +- tests/testsuite/cargo_add/script_shebang/mod.rs | 2 +- tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs | 2 +- tests/testsuite/cargo_add/symlink.rs | 2 +- tests/testsuite/cargo_add/target/mod.rs | 2 +- tests/testsuite/cargo_add/target_cfg/mod.rs | 2 +- tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs | 2 +- tests/testsuite/cargo_add/vers/mod.rs | 2 +- tests/testsuite/cargo_add/workspace_name/mod.rs | 2 +- tests/testsuite/cargo_add/workspace_path/mod.rs | 2 +- tests/testsuite/cargo_add/workspace_path_dev/mod.rs | 2 +- tests/testsuite/cargo_add/yanked/mod.rs | 2 +- tests/testsuite/cargo_alias_config.rs | 2 +- tests/testsuite/cargo_bench/help/mod.rs | 2 +- tests/testsuite/cargo_bench/no_keep_going/mod.rs | 3 +-- tests/testsuite/cargo_build/help/mod.rs | 2 +- tests/testsuite/cargo_check/help/mod.rs | 2 +- tests/testsuite/cargo_clean/help/mod.rs | 2 +- tests/testsuite/cargo_command.rs | 2 +- tests/testsuite/cargo_config/help/mod.rs | 2 +- tests/testsuite/cargo_config/mod.rs | 2 +- tests/testsuite/cargo_doc/help/mod.rs | 2 +- tests/testsuite/cargo_env_config.rs | 2 +- tests/testsuite/cargo_features.rs | 2 +- tests/testsuite/cargo_fetch/help/mod.rs | 2 +- tests/testsuite/cargo_fix/help/mod.rs | 2 +- tests/testsuite/cargo_generate_lockfile/help/mod.rs | 2 +- tests/testsuite/cargo_git_checkout/help/mod.rs | 2 +- tests/testsuite/cargo_help/help/mod.rs | 2 +- tests/testsuite/cargo_info/basic/mod.rs | 2 +- tests/testsuite/cargo_info/features/mod.rs | 2 +- .../testsuite/cargo_info/features_activated_over_limit/mod.rs | 2 +- .../cargo_info/features_activated_over_limit_verbose/mod.rs | 2 +- .../cargo_info/features_deactivated_over_limit/mod.rs | 2 +- tests/testsuite/cargo_info/git_dependency/mod.rs | 2 +- tests/testsuite/cargo_info/help/mod.rs | 2 +- tests/testsuite/cargo_info/not_found/mod.rs | 2 +- tests/testsuite/cargo_info/path_dependency/mod.rs | 2 +- tests/testsuite/cargo_info/pick_msrv_compatible_package/mod.rs | 2 +- .../cargo_info/pick_msrv_compatible_package_within_ws/mod.rs | 2 +- .../mod.rs | 2 +- .../testsuite/cargo_info/specify_empty_version_with_url/mod.rs | 2 +- tests/testsuite/cargo_info/specify_version_outside_ws/mod.rs | 2 +- .../mod.rs | 2 +- .../mod.rs | 2 +- .../specify_version_within_ws_and_match_with_lockfile/mod.rs | 2 +- .../cargo_info/transitive_dependency_within_ws/mod.rs | 2 +- tests/testsuite/cargo_info/verbose/mod.rs | 2 +- tests/testsuite/cargo_info/with_frozen_outside_ws/mod.rs | 2 +- tests/testsuite/cargo_info/with_frozen_within_ws/mod.rs | 2 +- tests/testsuite/cargo_info/with_locked_outside_ws/mod.rs | 2 +- tests/testsuite/cargo_info/with_locked_within_ws/mod.rs | 2 +- .../with_locked_within_ws_and_pick_the_package/mod.rs | 2 +- tests/testsuite/cargo_info/with_offline/mod.rs | 2 +- tests/testsuite/cargo_info/with_quiet/mod.rs | 2 +- tests/testsuite/cargo_info/within_ws/mod.rs | 2 +- .../testsuite/cargo_info/within_ws_and_pick_ws_package/mod.rs | 2 +- .../cargo_info/within_ws_with_alternative_registry/mod.rs | 2 +- tests/testsuite/cargo_info/within_ws_without_lockfile/mod.rs | 2 +- .../cargo_info/without_requiring_registry_auth/mod.rs | 2 +- tests/testsuite/cargo_init/auto_git/mod.rs | 2 +- tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs | 2 +- .../cargo_init/bin_already_exists_explicit_nosrc/mod.rs | 2 +- tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs | 2 +- .../cargo_init/bin_already_exists_implicit_namenosrc/mod.rs | 2 +- .../cargo_init/bin_already_exists_implicit_namesrc/mod.rs | 2 +- .../cargo_init/bin_already_exists_implicit_nosrc/mod.rs | 2 +- tests/testsuite/cargo_init/both_lib_and_bin/mod.rs | 2 +- .../cant_create_library_when_both_binlib_present/mod.rs | 2 +- .../testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs | 2 +- .../cargo_init/creates_binary_when_both_binlib_present/mod.rs | 2 +- .../creates_binary_when_instructed_and_has_lib_file/mod.rs | 2 +- .../creates_library_when_instructed_and_has_bin_file/mod.rs | 2 +- tests/testsuite/cargo_init/empty_dir/mod.rs | 2 +- tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs | 2 +- tests/testsuite/cargo_init/formats_source/mod.rs | 2 +- tests/testsuite/cargo_init/fossil_autodetect/mod.rs | 2 +- tests/testsuite/cargo_init/git_autodetect/mod.rs | 2 +- .../cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs | 2 +- tests/testsuite/cargo_init/help/mod.rs | 2 +- .../cargo_init/ignores_failure_to_format_source/mod.rs | 2 +- tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs | 2 +- tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs | 2 +- .../cargo_init/inherit_workspace_package_table/mod.rs | 3 +-- tests/testsuite/cargo_init/invalid_dir_name/mod.rs | 2 +- tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs | 2 +- tests/testsuite/cargo_init/lib_already_exists_src/mod.rs | 2 +- tests/testsuite/cargo_init/mercurial_autodetect/mod.rs | 2 +- tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs | 2 +- tests/testsuite/cargo_init/no_filename/mod.rs | 2 +- tests/testsuite/cargo_init/path_contains_separator/mod.rs | 2 +- tests/testsuite/cargo_init/pijul_autodetect/mod.rs | 2 +- tests/testsuite/cargo_init/reserved_name/mod.rs | 2 +- tests/testsuite/cargo_init/simple_bin/mod.rs | 2 +- tests/testsuite/cargo_init/simple_git/mod.rs | 2 +- tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs | 2 +- tests/testsuite/cargo_init/simple_hg/mod.rs | 2 +- tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs | 2 +- tests/testsuite/cargo_init/simple_lib/mod.rs | 2 +- tests/testsuite/cargo_init/unknown_flags/mod.rs | 2 +- tests/testsuite/cargo_init/with_argument/mod.rs | 2 +- tests/testsuite/cargo_init/workspace_add_member/mod.rs | 2 +- tests/testsuite/cargo_install/help/mod.rs | 2 +- tests/testsuite/cargo_locate_project/help/mod.rs | 2 +- tests/testsuite/cargo_login/help/mod.rs | 2 +- tests/testsuite/cargo_logout/help/mod.rs | 2 +- tests/testsuite/cargo_metadata/help/mod.rs | 2 +- tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs | 3 +-- .../add_members_to_workspace_format_previous_items/mod.rs | 3 +-- .../cargo_new/add_members_to_workspace_format_sorted/mod.rs | 3 +-- .../add_members_to_workspace_with_absolute_package_path/mod.rs | 3 +-- .../add_members_to_workspace_with_empty_members/mod.rs | 3 +-- .../add_members_to_workspace_with_exclude_list/mod.rs | 3 +-- .../add_members_to_workspace_with_members_glob/mod.rs | 3 +-- .../cargo_new/add_members_to_workspace_without_members/mod.rs | 3 +-- tests/testsuite/cargo_new/empty_name/mod.rs | 3 +-- tests/testsuite/cargo_new/help/mod.rs | 2 +- tests/testsuite/cargo_new/ignore_current_dir_workspace/mod.rs | 3 +-- tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs | 3 +-- .../testsuite/cargo_new/inherit_workspace_package_table/mod.rs | 3 +-- .../inherit_workspace_package_table_with_edition/mod.rs | 3 +-- .../inherit_workspace_package_table_with_registry/mod.rs | 3 +-- .../inherit_workspace_package_table_without_version/mod.rs | 3 +-- .../not_inherit_workspace_package_table_if_not_members/mod.rs | 3 +-- tests/testsuite/cargo_owner/help/mod.rs | 2 +- tests/testsuite/cargo_package/help/mod.rs | 2 +- tests/testsuite/cargo_pkgid/help/mod.rs | 2 +- tests/testsuite/cargo_publish/help/mod.rs | 2 +- tests/testsuite/cargo_read_manifest/help/mod.rs | 2 +- tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs | 3 +-- tests/testsuite/cargo_remove/build/mod.rs | 3 +-- tests/testsuite/cargo_remove/dev/mod.rs | 3 +-- tests/testsuite/cargo_remove/dry_run/mod.rs | 3 +-- tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs | 3 +-- tests/testsuite/cargo_remove/gc_patch/mod.rs | 3 +-- tests/testsuite/cargo_remove/gc_profile/mod.rs | 3 +-- tests/testsuite/cargo_remove/gc_replace/mod.rs | 3 +-- tests/testsuite/cargo_remove/help/mod.rs | 2 +- tests/testsuite/cargo_remove/invalid_arg/mod.rs | 3 +-- tests/testsuite/cargo_remove/invalid_dep/mod.rs | 3 +-- tests/testsuite/cargo_remove/invalid_package/mod.rs | 3 +-- tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs | 3 +-- tests/testsuite/cargo_remove/invalid_section/mod.rs | 3 +-- tests/testsuite/cargo_remove/invalid_section_dep/mod.rs | 3 +-- tests/testsuite/cargo_remove/invalid_target/mod.rs | 3 +-- tests/testsuite/cargo_remove/invalid_target_dep/mod.rs | 3 +-- tests/testsuite/cargo_remove/last_dep/mod.rs | 3 +-- tests/testsuite/cargo_remove/multiple_deps/mod.rs | 3 +-- tests/testsuite/cargo_remove/multiple_dev/mod.rs | 3 +-- tests/testsuite/cargo_remove/no_arg/mod.rs | 3 +-- tests/testsuite/cargo_remove/offline/mod.rs | 3 +-- tests/testsuite/cargo_remove/optional_dep_feature/mod.rs | 3 +-- .../cargo_remove/optional_dep_feature_formatting/mod.rs | 3 +-- tests/testsuite/cargo_remove/optional_feature/mod.rs | 3 +-- tests/testsuite/cargo_remove/package/mod.rs | 3 +-- tests/testsuite/cargo_remove/remove_basic/mod.rs | 3 +-- tests/testsuite/cargo_remove/script/mod.rs | 3 +-- tests/testsuite/cargo_remove/script_last/mod.rs | 3 +-- tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs | 3 +-- tests/testsuite/cargo_remove/target/mod.rs | 3 +-- tests/testsuite/cargo_remove/target_build/mod.rs | 3 +-- tests/testsuite/cargo_remove/target_dev/mod.rs | 3 +-- tests/testsuite/cargo_remove/update_lock_file/mod.rs | 3 +-- tests/testsuite/cargo_remove/workspace/mod.rs | 3 +-- tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs | 3 +-- tests/testsuite/cargo_remove/workspace_preserved/mod.rs | 3 +-- tests/testsuite/cargo_report/help/mod.rs | 2 +- tests/testsuite/cargo_run/help/mod.rs | 2 +- tests/testsuite/cargo_rustc/help/mod.rs | 2 +- tests/testsuite/cargo_rustdoc/help/mod.rs | 2 +- tests/testsuite/cargo_search/help/mod.rs | 2 +- tests/testsuite/cargo_targets.rs | 2 +- tests/testsuite/cargo_test/help/mod.rs | 2 +- tests/testsuite/cargo_test/no_keep_going/mod.rs | 3 +-- tests/testsuite/cargo_tree/deps.rs | 2 +- tests/testsuite/cargo_tree/dupe/mod.rs | 2 +- tests/testsuite/cargo_tree/edge_kind/mod.rs | 2 +- tests/testsuite/cargo_tree/features.rs | 2 +- tests/testsuite/cargo_tree/help/mod.rs | 2 +- tests/testsuite/cargo_uninstall/help/mod.rs | 2 +- tests/testsuite/cargo_update/help/mod.rs | 2 +- tests/testsuite/cargo_update/toolchain_pkgname/mod.rs | 2 +- tests/testsuite/cargo_vendor/help/mod.rs | 2 +- tests/testsuite/cargo_verify_project/help/mod.rs | 2 +- tests/testsuite/cargo_version/help/mod.rs | 2 +- tests/testsuite/cargo_yank/help/mod.rs | 2 +- tests/testsuite/cfg.rs | 2 +- tests/testsuite/check.rs | 2 +- tests/testsuite/check_cfg.rs | 2 +- tests/testsuite/clean.rs | 2 +- tests/testsuite/collisions.rs | 2 +- tests/testsuite/compile_time_deps.rs | 2 +- tests/testsuite/concurrent.rs | 2 +- tests/testsuite/config.rs | 2 +- tests/testsuite/config_cli.rs | 2 +- tests/testsuite/config_include.rs | 2 +- tests/testsuite/corrupt_git.rs | 2 +- tests/testsuite/credential_process.rs | 2 +- tests/testsuite/cross_compile.rs | 2 +- tests/testsuite/cross_publish.rs | 2 +- tests/testsuite/custom_target.rs | 2 +- tests/testsuite/death.rs | 2 +- tests/testsuite/dep_info.rs | 2 +- tests/testsuite/diagnostics.rs | 2 +- tests/testsuite/direct_minimal_versions.rs | 2 +- tests/testsuite/directory.rs | 2 +- tests/testsuite/doc.rs | 2 +- tests/testsuite/docscrape.rs | 2 +- tests/testsuite/edition.rs | 2 +- tests/testsuite/error.rs | 2 +- tests/testsuite/feature_unification.rs | 2 +- tests/testsuite/features.rs | 2 +- tests/testsuite/features2.rs | 2 +- tests/testsuite/features_namespaced.rs | 2 +- tests/testsuite/fetch.rs | 2 +- tests/testsuite/fix.rs | 2 +- tests/testsuite/fix_n_times.rs | 2 +- tests/testsuite/freshness.rs | 2 +- tests/testsuite/freshness_checksum.rs | 2 +- tests/testsuite/future_incompat_report.rs | 2 +- tests/testsuite/generate_lockfile.rs | 2 +- tests/testsuite/git.rs | 3 +-- tests/testsuite/git_auth.rs | 2 +- tests/testsuite/git_gc.rs | 2 +- tests/testsuite/git_shallow.rs | 2 +- tests/testsuite/glob_targets.rs | 2 +- tests/testsuite/global_cache_tracker.rs | 2 +- tests/testsuite/help.rs | 2 +- tests/testsuite/https.rs | 2 +- tests/testsuite/inheritable_workspace_fields.rs | 2 +- tests/testsuite/install.rs | 2 +- tests/testsuite/install_upgrade.rs | 2 +- tests/testsuite/jobserver.rs | 2 +- tests/testsuite/lints/error/mod.rs | 2 +- tests/testsuite/lints/inherited/mod.rs | 2 +- tests/testsuite/lints/mod.rs | 2 +- tests/testsuite/lints/unknown_lints.rs | 2 +- tests/testsuite/lints/warning/mod.rs | 2 +- tests/testsuite/lints_table.rs | 2 +- tests/testsuite/list_availables.rs | 2 +- tests/testsuite/local_registry.rs | 2 +- tests/testsuite/locate_project.rs | 2 +- tests/testsuite/lockfile_compat.rs | 2 +- tests/testsuite/lockfile_path.rs | 1 + tests/testsuite/login.rs | 2 +- tests/testsuite/logout.rs | 2 +- tests/testsuite/lto.rs | 2 +- tests/testsuite/member_discovery.rs | 2 +- tests/testsuite/member_errors.rs | 2 +- tests/testsuite/message_format.rs | 2 +- tests/testsuite/messages.rs | 2 +- tests/testsuite/metabuild.rs | 2 +- tests/testsuite/metadata.rs | 2 +- tests/testsuite/minimal_versions.rs | 2 +- tests/testsuite/multitarget.rs | 2 +- tests/testsuite/net_config.rs | 2 +- tests/testsuite/new.rs | 2 +- tests/testsuite/offline.rs | 2 +- tests/testsuite/old_cargos.rs | 2 +- tests/testsuite/open_namespaces.rs | 2 +- tests/testsuite/owner.rs | 2 +- tests/testsuite/package.rs | 2 +- tests/testsuite/package_features.rs | 2 +- tests/testsuite/package_message_format.rs | 2 +- tests/testsuite/patch.rs | 2 +- tests/testsuite/path.rs | 2 +- tests/testsuite/paths.rs | 2 +- tests/testsuite/pgo.rs | 2 +- tests/testsuite/pkgid.rs | 2 +- tests/testsuite/precise_pre_release.rs | 2 +- tests/testsuite/proc_macro.rs | 2 +- tests/testsuite/profile_config.rs | 2 +- tests/testsuite/profile_custom.rs | 2 +- tests/testsuite/profile_overrides.rs | 2 +- tests/testsuite/profile_targets.rs | 2 +- tests/testsuite/profile_trim_paths.rs | 2 +- tests/testsuite/profiles.rs | 2 +- tests/testsuite/progress.rs | 2 +- tests/testsuite/pub_priv.rs | 2 +- tests/testsuite/publish.rs | 2 +- tests/testsuite/publish_lockfile.rs | 2 +- tests/testsuite/read_manifest.rs | 2 +- tests/testsuite/registry.rs | 2 +- tests/testsuite/registry_auth.rs | 2 +- tests/testsuite/registry_overlay.rs | 2 +- tests/testsuite/rename_deps.rs | 2 +- tests/testsuite/replace.rs | 2 +- tests/testsuite/required_features.rs | 2 +- tests/testsuite/run.rs | 2 +- tests/testsuite/rust_version.rs | 2 +- tests/testsuite/rustc.rs | 2 +- tests/testsuite/rustc_info_cache.rs | 2 +- tests/testsuite/rustdoc.rs | 2 +- tests/testsuite/rustdoc_extern_html.rs | 2 +- tests/testsuite/rustdocflags.rs | 2 +- tests/testsuite/rustflags.rs | 2 +- tests/testsuite/rustup.rs | 2 +- tests/testsuite/sbom.rs | 1 + tests/testsuite/script.rs | 2 +- tests/testsuite/search.rs | 2 +- tests/testsuite/shell_quoting.rs | 2 +- tests/testsuite/source_replacement.rs | 2 +- tests/testsuite/ssh.rs | 2 +- tests/testsuite/standard_lib.rs | 2 +- tests/testsuite/test.rs | 2 +- tests/testsuite/timings.rs | 2 +- tests/testsuite/tool_paths.rs | 2 +- tests/testsuite/unit_graph.rs | 2 +- tests/testsuite/update.rs | 2 +- tests/testsuite/utils/cross_compile.rs | 1 + tests/testsuite/utils/tools.rs | 1 + tests/testsuite/vendor.rs | 2 +- tests/testsuite/verify_project.rs | 2 +- tests/testsuite/version.rs | 2 +- tests/testsuite/warn_on_failure.rs | 2 +- tests/testsuite/warning_override.rs | 1 + tests/testsuite/weak_dep_features.rs | 2 +- tests/testsuite/workspaces.rs | 2 +- tests/testsuite/yank.rs | 2 +- 487 files changed, 487 insertions(+), 537 deletions(-) diff --git a/tests/testsuite/advanced_env.rs b/tests/testsuite/advanced_env.rs index d2a1170789c..56c19786333 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 391dfad1d4f..139adcb4035 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 8ec39d74822..a88cf7cbfc3 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 982c68b616d..ea89a7c55ff 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 baced0c9517..18692d62008 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 d4cc16fbb20..e5cd8ea5009 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 258af709fea..a11822a5e3c 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 a26ba9882cf..f1e04004cb7 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 0ead9eb5082..30d8f876571 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 5a0cd6f0ab7..e6eebaf87f8 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 d6eaf87fd99..1a3a15fc221 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 c8766c95858..716c2001917 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 db48bcd8391..5443ff4bd53 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 fc1e03f987e..5273d1a081f 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 4f81b8f421f..d87f9a2c366 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 3f3710fc799..08f5b9e77ae 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 ed2a12083b6..a677225de08 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 e40d56a1827..ab26c860c53 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 e890839845a..9104d418b52 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 850a4a66b46..892fe8429c2 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 805d0089cad..3da73fd434e 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 26f9880bed7..4e96848b957 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 7a2772a2a86..8fbdfa60479 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 7cfb71a6d8b..5ff03f97641 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 f72db7dd4a6..e82a02db386 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 be6f2a685c7..874b3a7c8c5 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 b60deb2ed99..e1cac9a562b 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 275f7acd4c4..723577c89b1 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 c08a6bea906..7b471a509c4 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 c25d40d2236..75427604924 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 c25d40d2236..75427604924 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 86545d3f4d0..5e731c62666 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 197df781195..7464eeb0d1e 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 d9f5193227d..08c14b97d7a 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 95ecd0d6500..bb94303bd57 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 3d2424ebfc9..a437b1471b4 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 00f9bd8fd8f..ac4b9493673 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 f4bb8786a30..c964ef9fa0f 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 5a4f2c4a9ac..0cfaea19f97 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 95391cb1636..99e43d9f8c0 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 515e975bcc7..7983eb286df 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 5e1c5140360..c067e3c80a1 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 898f3aa81bc..d8653d5e049 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 b157660f705..9492d331558 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 682dd893a30..640eeadb4e5 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 468587d7c4c..835f5bf152c 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 41075a98ae7..c89a98e7abe 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 cce0d90420e..714c40f29ea 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 f7071d44d0f..33cf4bba103 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 5be109b8746..0905763e1e1 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 9724b2c5119..c7c4250ff2f 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 e149dc00987..e17937f8e79 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 0434d5bced1..e994cf9aeaa 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 4a689e7237a..2709f5cf6aa 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 dc60e5dac75..1f794ccc1d6 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 b0e229d8dc4..055d86cb1c8 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 cd8e4c38870..9703b99b98f 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 e0b7049be60..c1dd818e179 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 f0f031e8ebb..7cf4c36748a 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 c0f6c697207..90c4037b778 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 d11d31986f5..c05f1e2d43e 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 0ee595b870f..1139c3101ad 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 1747b81f064..06901140265 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 18c7ce4a5e4..ba23de0e50a 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 b1e5e6246f0..7783e9f6d6f 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 3cd5759bffe..56999d86edf 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 a29ae6d7d47..419808a7dfc 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 a93be5e5de7..db3f96c2540 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 eb9842b2db8..d8e2479bffd 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 c8ef1f756f7..b22cb8cfa16 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 0a923250f53..e1106b594cd 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 fb0e0a16cf8..ce7f8b8ab19 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 fb0e0a16cf8..ce7f8b8ab19 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 e7acbf0f468..4590f35036c 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 f404cd2c788..dc9604886aa 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 c15f9158cd3..f12920a9532 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 d19260496ad..13cb53be475 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 92319f7914c..54106ac30c6 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 9397c5a6cae..05161bf7cd2 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 b3184089ec5..349aceccafc 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 812be6142b2..f8f6fcc3b2c 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 891e0c3327c..a3dce3e6209 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 401a52f45b8..e60db0b43b4 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 e6172c001bc..0e670f88613 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 4f3f675c5f1..39db9f90cd3 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 79c44a18266..45674af0d2c 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 e256189bf1e..fb83f94a23b 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 8f8732fd416..17b12b737d7 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 385046d04d4..dc8abb925a3 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 7ccc5d7aabc..e5d71811766 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 ceea4f1713b..cf4355e9e74 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 3ff29dc3377..5679729c953 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 05dc7b6b10c..48caff404e7 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 c525cba6576..770bca5732e 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 73ff19a5b6c..2ede55bd7ea 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 9f4f9e643ef..0045cf8ddaf 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 360bac45e70..0f290913dc1 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 739468a651c..bb14c009a9b 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 717be7aa353..01530851c99 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 ef4f357047e..c3b11fc8709 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 23c1c5053c3..b07bf58dd16 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 f5d96445b28..c20857a1b7a 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 4b3bedb34ea..07e091e2d16 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 27c061228f9..f83f6817728 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 819e017f753..6142104d575 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 425eceaec68..ee10559fc06 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 c08a6bea906..7b471a509c4 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 73ff19a5b6c..2ede55bd7ea 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 5a16c2416bf..1a2d5d9f5fc 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 3729f9946d4..70ad8f668b3 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 86545d3f4d0..5e731c62666 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 86545d3f4d0..5e731c62666 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 86545d3f4d0..5e731c62666 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 212dba2ca98..a9a4f56d38e 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 9ce9a97f703..14e202faaef 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 e735c848a8b..ea9ca55ee70 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 73ff19a5b6c..2ede55bd7ea 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 c08a6bea906..7b471a509c4 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 9f4f9e643ef..0045cf8ddaf 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 425eceaec68..ee10559fc06 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 360bac45e70..0f290913dc1 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 7bee1aa5c18..0e71adfeede 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 425eceaec68..ee10559fc06 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 917125c7827..2cea656ff3a 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 d3604347927..b096947fc27 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 ade44c07b48..51c58b4be90 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 3a1c58bb5bb..c3363472cd5 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 a25883cb011..0e8999c6706 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 5a16c2416bf..1a2d5d9f5fc 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 7bee1aa5c18..0e71adfeede 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 360bac45e70..0f290913dc1 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 e253892b649..76bd0d15078 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 f38df303363..ab70f579021 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 2708ad8c095..3c3ed9a02f3 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 43ab3b667bd..6300c30c0af 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 3729f9946d4..70ad8f668b3 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 05f9ed762c3..f9bc623e2ed 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 cfd8fcb62ef..cff5e188533 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 cfd8fcb62ef..cff5e188533 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 3729f9946d4..70ad8f668b3 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 f94d9652353..fb4797cf1fd 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 e65bca79f44..b121f102099 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 065aa1dfe01..c86dd845bba 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 aec0e7ce140..4bc3cad56ae 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 49b7901c695..7d20146da5e 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 ca77e190e9a..e946f701494 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 18ee86c9302..a4731871ff5 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 e36b65242b8..dbfa940d6ff 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 7c3381f3e5a..8dcf5e5545e 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 c82c4a0a076..7da09783938 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 7c3381f3e5a..8dcf5e5545e 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 d78863863c8..53d826ef5f7 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 40bc43e82cc..618056956ad 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 40bc43e82cc..618056956ad 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 7bee1aa5c18..0e71adfeede 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 7c409b6172b..5c8797e6f14 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 db8f79b8ef9..34452e76d22 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 c27075ae0d3..8a5eb9fabf2 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 7c3381f3e5a..8dcf5e5545e 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 39ed54242e6..fc3c3ffd507 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 09d9358c835..dd624909dcf 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 b84c9d339bf..8373934f107 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 b84c9d339bf..8373934f107 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 4eb3ca475e0..0257f8f4286 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 6ce13b06487..a9a3256231b 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 289bb8cecc3..e50a942b7d7 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 289bb8cecc3..e50a942b7d7 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 ffa6db6c6f8..de0df53393a 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 ffa6db6c6f8..de0df53393a 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 ffa6db6c6f8..de0df53393a 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 2e11221b0b8..a21444f0a79 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 6b9f92f50fd..37669fb9741 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 57618e0f8c6..0b7852fcdd5 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 90acfc246e4..069cb3f9e0d 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 000138fdcc7..13bf13e0c3e 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 6bf38dbf14f..e428a6b61f3 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 fabd9082086..5efec4fca1f 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 3729f9946d4..70ad8f668b3 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 49b7901c695..7d20146da5e 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 050943fe897..01640226bb6 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 0d20745616c..e3d2a27c35c 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 36bef3f1074..44e7d3853e9 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 5426cc6b134..24323087f93 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 0dbecdcfef1..8a699f55c02 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 b5836078c6a..4339971acd2 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 2b4679ba7bf..bd928bb75d8 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 3fbb975dff8..a84e26f3a96 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 c1f51f97073..d463a6a545e 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 174fb184187..5346a7c02c4 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 3f9f6a6dff7..294a1aa6cd9 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 5f420d31142..1a0c4bc3904 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 ac99a603e74..ba649b3d49f 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 1f341daf5b8..26aec6c6654 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 22b3fdf1449..32089b39393 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 c2fbbfa6acc..3f305a378ef 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 5828fcadfe4..352bae86a71 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 f5db7e12bb7..cd633c9e9f3 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 dd10058db7c..b14cfd331fa 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 303b589a867..7b4592e5780 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 49fadef3e9b..d116215889f 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 95b4dfdb76b..13357424c06 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 ad6bfa03c3f..f5b73b529fd 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 5872aee3070..eaf5c800db1 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 edaa377d522..8b195963410 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 bccfe0345e5..d229b5c1b45 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 3c086895362..5e8e878575c 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 87f9f2aa4c7..6b9e6dc62b3 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 b662a8fd5fe..65562125ba8 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 0a57bb3954f..99931b4be94 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 0e3a6b84be6..3e8ccb82965 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 bfc36dfd7fd..f6067eee8f0 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 706f2d9da0c..74c5a846479 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 a433b78e63c..bf1048c3034 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 736a9928627..8ac9a828cf8 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 345f6944a0c..19e3a755e5a 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 2afb5c19975..caf97d885d3 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 c04f6934ed3..db18a8be678 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 3881f64a880..c0104c11858 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 6678ac7a380..7de8580973f 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 4f958d75eef..5dd3e20e679 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 a04d9ec0150..b29d5f29bc2 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 1b0b71610f7..dd5c2233641 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 9c5d0cdb9a2..fbe73edf23e 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 f057b582179..5bed4d687c7 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 cc93e23f627..38cfcfd0c28 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 4c504f901d9..3599060f9c0 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 6236c449540..7bc8ef9206b 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 20cafe5233d..4fddf5644aa 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 06cb1eb44b3..1a65662fa19 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 d2855639b1a..041e79623de 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 db152a15ed8..f7b0e0c19c6 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 5a9603a5f7e..ec1062a4f56 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 018fe73c39c..a5661938888 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 219b54534a5..f2bb65d362b 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 018fe73c39c..a5661938888 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 81d1c791f68..20ebffce99d 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 2b34486bf3d..cb47aad0b09 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 f1d364258ef..250c7b9a5b1 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 d2855639b1a..041e79623de 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 d2855639b1a..041e79623de 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 4e3cb8b7079..f203839430e 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 074954f01df..70af1a524c3 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 c0d70abe4a3..fe3c3286f82 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 b35ce6093b8..397ab039ab4 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 132ea3eb99c..9246f521464 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 f0a78ed3da5..e348b7dac4f 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 013db91cab9..cad651e21fa 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 fd1930fd4d9..6a04ac619c8 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 d42e5a9e07b..74ccb5c9be1 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 7b59af80933..5c2ab0f26ec 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 7b59af80933..5c2ab0f26ec 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 99dd923c014..21030e799f8 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 b6e4100c972..12cc85c67f1 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 219b54534a5..f2bb65d362b 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 219b54534a5..f2bb65d362b 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 132ea3eb99c..9246f521464 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 7f87da08d88..eabe91dca8c 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 92b3bba71b1..993b7d89846 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 ad361e1038b..5e4e00c07f8 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 132ea3eb99c..9246f521464 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 1c06c940192..229b8b8e611 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 6706742ff74..cb6dfa7cb07 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 e8af27f4664..c5ef5641242 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 c8242fa42f3..32daa407429 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 aa95f8065ce..00f4a87c830 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 132ea3eb99c..9246f521464 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 9c19bcd52d8..51ce7dd0a01 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 9df19a755c0..32c8d410fc1 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 21862402ea5..b76db4212a8 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 57d49dcb4e1..fa714ac31fc 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 00dc6f7c49d..51628955b15 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 6bede7a4296..5f94d1d5f29 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 5416ec10510..9ae2393d0a2 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 5bbb986bc5f..82730645d3b 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 7d42b9e6212..d722e54506d 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 ddf2ba97ac2..de5c989ea17 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 696aeca70b8..7cb081c6b1b 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 696aeca70b8..7cb081c6b1b 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 aa0e31f722a..ec5e4f027d6 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 696aeca70b8..7cb081c6b1b 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 696aeca70b8..7cb081c6b1b 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 696aeca70b8..7cb081c6b1b 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 ddf2ba97ac2..de5c989ea17 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 78eeb7ae9f0..9e4a767aada 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 55eeac5164b..c7ffaca8481 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 d1316c16bfa..938ea7d3da6 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 696aeca70b8..7cb081c6b1b 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 696aeca70b8..7cb081c6b1b 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 8fd9b259216..b4d8f706df1 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 d4907c560dc..5702e692aaa 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 696aeca70b8..7cb081c6b1b 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 14434b45c3d..72df288cf6f 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 8b7669a0ca7..d3310b95eac 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 73ff8b7bc80..cd8deb334eb 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 fb8d622dbd6..0972ef06464 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 ef7802b5cf4..44303c62c40 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 7308a92bc8c..8af9bda7538 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 bfc3b8a292d..0c8e68dcf38 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 46e7b94fa7f..2116c44e325 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 8a0de7ebee3..605aa1b4a10 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 19278d5869c..f56766d2e3e 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 c90110b79a2..cf63bd12169 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 8e19d068dc6..8bcad50c491 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 1f6f963ae2f..7c4cb093a13 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 f2a3cbae1d8..e96ac8bbc70 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 4cad3dda300..449eb3d1319 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 28ba8ea36e8..8c1ca6bc5bb 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 40da2984207..0ea04b6981c 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 a349d20ad74..e544584a529 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 137a71c0be1..cbb3ab4445f 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 26a9c12dbf6..2f42ce4fbf7 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 a61b3b47bab..581c7cf836e 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 c4f41d19e0a..eba3010287d 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 2286e56ec57..100259b5991 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 6e287f223ce..effcdefd2a2 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 5fc96eb4918..8ee6a9b7fea 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 e1594650f7e..26c62d16e30 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 70619f2dcac..9d133ba5b3d 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 48b3fc919c8..0c0de915361 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 493a60b5b64..d36cb8b8137 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 21b758ceb81..1286bad9ca9 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 30f3e337c65..2e37b11f0fe 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 e3f26e7a54f..423ac86df63 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 a1aebd4a886..ea1c39b1912 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 03207eb2630..84c8b429820 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 1b7ec0403a5..cff0426c91d 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 025b031c392..5be1701b072 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 3d971f8612b..d681b33ba6a 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 1f4d176ebf0..048b95e7d15 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 168e5ef6c62..ccf192a6120 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 b5aa3b96b7e..88bc362510d 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 4d4610fdb34..014792b7780 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 4d4610fdb34..014792b7780 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 4d4610fdb34..014792b7780 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 c05e9e3372b..d4e241e6929 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 212ed276cdd..979407b8daa 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 87b66e825bc..134d0b8ac8d 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 a1b2a0193f3..c051656db4b 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 2b96bd572c9..a3f646e0d79 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 beec558d962..fe736372ffe 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 a643dfdbe99..38ca53ad45f 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 330e3690b10..bf747b1896d 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 574d543aadd..466c47fedba 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 fe0aa427190..165d1f8e938 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 6693e8bfbad..233cb23b0ea 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 038a8ddb777..d297a9211d8 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 6b10af23a31..161578e2087 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 48c84da1b47..fe948729f93 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 7bc15484cc7..246ea8ecabd 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 32055ac0ada..1a68f4e5f1f 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 ede93a8f82c..9c83d3cfe92 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 b5103db60ce..89db7b3fe0b 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 a86d204ae40..45baf15b338 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 93b5af05e1d..929decb516d 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 4e7832ad56e..878020d2b0d 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 43fe1f8ad54..3459b701ee8 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 2e03254337a..f2dd61c0d18 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 5a510f6649b..db2e91ba602 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 59214d4a1fa..72eb1bbe60d 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 9adc3067cea..bc07695d025 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 3d48c39b6c8..5fb6dc157e4 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 e590889b35b..7db7462d35e 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 c9eed19fd8f..9e6d515250c 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 468115dd508..548ab81b67c 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 ee4c720fbab..c44500b66f5 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 68810baff57..a373ea0a24b 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 33aa149ed36..22cc0cab261 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 dffd0abc08e..0624a0cd9c8 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 602a574d943..0e7b2dcc9fd 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 f57b74de518..23383f265b9 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 8104f62ba86..3d8a01d9981 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 8bbebf0b79d..3e8202c87da 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 ec5e5f53e7c..8f870e00129 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 9e3f4fed5d2..2406e7e9854 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 1d0d0ad25ac..e1f4ece6ebf 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 eb9ad9f7019..c9b45ffe046 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 9b4bf48164f..c845207e278 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 2d64c73e718..e948ba226a5 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 59a9dd17eb6..278788a93bf 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 da39e16bcde..f71766637c7 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 e97d6a4103b..8216f405558 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 dc9d832a0b3..133013f66f2 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 417c67a3a62..a6bc32f0d9a 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 656189158c0..50ec09dece3 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 d1d422d6b0b..55d0d5d0b33 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 a930e81fe2d..29b26993844 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 997a6151c22..ffc94abb78c 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 6e6f8c7ca53..48a92a346fd 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 640cf5dc5cc..87a00855933 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 e4572ead867..8fbcb0d2670 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 f0af4f22612..5bd4e839328 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 5b2cce78f3c..f8d20cb90f2 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 86291714cd9..6ef1e00fd59 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 ed292de3120..2b11edad215 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 66ebdcaa2ab..1b7730d2839 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 0ba497e4114..ae3a95a03a8 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 d81a51ee44e..c49351e3968 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 82aa7fcfc65..893e853f689 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 da4166d05fb..e0ce5294ecb 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 fe0aaea8086..037b4a4d8a4 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 360c894afda..29504032243 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 bb4ff319aef..6f6411e2462 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 81f4ffc6608..7d061183738 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 70dd3526593..62f4204650f 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 f8b3e9d6fab..99bf9a22e64 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 f1ec40f7655..a5fa996728f 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 c2e232c5047..d3b82dfb89a 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 a2aa80e9a2c..162eadc52c5 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 a5ddcb48da1..9c9c110512d 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 de01210d1b4..867f977f7d4 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 4a24993b160..cc8961a1e45 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 67a26c8d16f..2718553e20b 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 cac0e718af5..2cfcc8f8689 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 aa2ac38fc78..23cf1b9a79a 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 21b96f95609..726c81edae7 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 c04e79427a8..5a123140dd1 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 be8b8429312..72b2e0060e8 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 16947c3944c..7aefa68999c 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 c00f88be050..a2369487021 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 51f0fa959a2..beae9759ac2 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 6d422676f46..8321fd05ad2 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 ef565b0f634..b3edffd4dd9 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 56a4de1a05b..9b4a91dd151 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 487cc83cf4b..f1be9b2b051 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 4c02c45752a..43eccb06277 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 55632e88e44..64d72273d1d 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 d0d5d9cb3f3..64d4ba05495 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 85377bf2c16..3914a2af77f 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 ec473183f34..dcb631d40f6 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 4d70f5bd74d..244477707d8 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 23a7402d29f..d3f0882a2ef 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 503295db168..1a30919e780 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 ff46b324091..b5918e3aecf 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 131f4fa98a0..098afb5d3b5 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 8df1263f641..2fe242fc664 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 8676e73f55f..14444c0f314 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 9e51c59c783..4c878d9fa07 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 71c9a3a787e..fde98866a0d 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 73dd121b93c..ab754459c32 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 d51c0ce6995..f9c4f0dd0ef 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 393f6bb045a..0d1f3f8dd33 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 d0bc44bc357..650d040d7d7 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 c95369966ef..501ee64aad3 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 978896669ff..dfe1d98dc12 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 73a140395b9..3dd4dc5227f 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 68b140f4a5d..d068b2c3c60 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 b9769809749..c8536e0dd9f 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 f2a612f5e1c..ca76e9ac2b2 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 51f376ef756..7d32bf03869 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 3fbf6dfb380..30b2d455a5a 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 adf2d3cd090..16e47e5f17f 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 360402965c4..706390b60c8 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 3733fb82652..6f97296da21 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 a31641f9472..94d5698a87a 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 e80341d93f0..8f9b3eb0fed 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 ea63572509b..8cab2a9a2a1 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 271b8e7acd1..c464f206c6a 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 24c539a9c54..0063e18cc8d 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 da32f20ac1a..d06e8045149 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 2ef7da92cb4..8fa729aeb26 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 8289b261266..be24516e1b0 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 10856fd87bf..121ac271079 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 c0692023154..b12298aecf2 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 195d7a07fea..2f161c1e788 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 c9fda456691..7d47ca77479 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 b8ebca06ddc..8c272a767d3 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 27603af0cbb..a02a45f109f 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 87203606714..a7ab0d98875 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 d5d6800d5b2..64b5464eb64 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 520d72d41b8..aeee72bffbc 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 ac2b9596c01..0240da3d1a2 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 099a5fe6f96..1b785de1439 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 ef96015953d..17bc6f7f58a 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 cea0e2887d9..5fbb7dffbb3 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 b733d6f9b1d..1321e4d78a0 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 3b1318167c2..b338806ae1d 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 047567a27cc..2f0cc183c36 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 8d94a6ae805..1ae1a06e8a7 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 7384a136f50..634567d4e6b 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 04872aa0bd4..9e7fcdca490 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 a02994da4da..3864072e2f3 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 83f2d2b78e8..8ec5765f21e 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 f5b91597e4b..27c66a1e7ad 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 e34063b2ce0..5d9d19ae967 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 80882fcef49..992251b3078 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 8ae6bc37a01..90ba4ee11e7 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 f97c36bf186..4c18fe2a985 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; From 15f755cefdce39b26c2cd5af839f8adb45593f06 Mon Sep 17 00:00:00 2001 From: Ross Sullivan Date: Sat, 21 Jun 2025 19:38:53 +0900 Subject: [PATCH 4/6] chore: Created CargoProjectExt extention trait --- Cargo.lock | 2 +- Cargo.toml | 2 +- crates/cargo-test-support/Cargo.toml | 2 +- crates/cargo-test-support/src/lib.rs | 22 -------------- crates/cargo-test-support/src/publish.rs | 23 --------------- crates/cargo-test-support/src/registry.rs | 2 +- tests/build-std/main.rs | 35 +++++++++++++++++++++-- tests/testsuite/main.rs | 1 + tests/testsuite/utils/ext.rs | 34 ++++++++++++++++++++++ tests/testsuite/utils/mod.rs | 1 + 10 files changed, 73 insertions(+), 51 deletions(-) create mode 100644 tests/testsuite/utils/ext.rs diff --git a/Cargo.lock b/Cargo.lock index cdba1134b41..9d9c012c649 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -452,7 +452,7 @@ version = "0.4.4" [[package]] name = "cargo-test-support" -version = "0.7.5" +version = "0.8.0" dependencies = [ "anstream", "anstyle", diff --git a/Cargo.toml b/Cargo.toml index d3176316045..727f4a1aede 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ cargo-credential-macos-keychain = { version = "0.4.15", path = "credential/cargo cargo-credential-wincred = { version = "0.4.15", path = "credential/cargo-credential-wincred" } cargo-platform = { path = "crates/cargo-platform", version = "0.3.0" } cargo-test-macro = { version = "0.4.4", path = "crates/cargo-test-macro" } -cargo-test-support = { version = "0.7.5", path = "crates/cargo-test-support" } +cargo-test-support = { version = "0.8.0", path = "crates/cargo-test-support" } cargo-util = { version = "0.2.22", path = "crates/cargo-util" } cargo-util-schemas = { version = "0.9.0", path = "crates/cargo-util-schemas" } cargo_metadata = "0.19.1" diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml index 9d7494c498d..6f8aa941324 100644 --- a/crates/cargo-test-support/Cargo.toml +++ b/crates/cargo-test-support/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-test-support" -version = "0.7.5" +version = "0.8.0" edition.workspace = true rust-version = "1.87" # MSRV:1 license.workspace = true diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs index 37abd9f5253..40129e430b0 100644 --- a/crates/cargo-test-support/src/lib.rs +++ b/crates/cargo-test-support/src/lib.rs @@ -490,28 +490,6 @@ impl Project { execs().with_process_builder(p) } - /// Creates a `ProcessBuilder` to run cargo. - /// - /// Arguments can be separated by spaces. - /// - /// For `cargo run`, see [`Project::rename_run`]. - /// - /// # Example: - /// - /// ```no_run - /// # let p = cargo_test_support::project().build(); - /// p.cargo("build --bin foo").run(); - /// ``` - pub fn cargo(&self, cmd: &str) -> Execs { - let cargo = cargo_exe(); - let mut execs = self.process(&cargo); - if let Some(ref mut p) = execs.process_builder { - p.env("CARGO", cargo); - p.arg_line(cmd); - } - execs - } - /// Safely run a process after `cargo build`. /// /// Windows has a problem where a process cannot be reliably diff --git a/crates/cargo-test-support/src/publish.rs b/crates/cargo-test-support/src/publish.rs index 42e32db033c..bd967a51d7d 100644 --- a/crates/cargo-test-support/src/publish.rs +++ b/crates/cargo-test-support/src/publish.rs @@ -6,29 +6,6 @@ //! # use cargo_test_support::registry::RegistryBuilder; //! # use cargo_test_support::publish::validate_upload; //! # use cargo_test_support::project; -//! // This replaces `registry::init()` and must be called before `Package::new().publish()` -//! let registry = RegistryBuilder::new().http_api().http_index().build(); -//! -//! let p = project() -//! .file( -//! "Cargo.toml", -//! r#" -//! [package] -//! name = "foo" -//! version = "0.0.1" -//! edition = "2015" -//! authors = [] -//! license = "MIT" -//! description = "foo" -//! "#, -//! ) -//! .file("src/main.rs", "fn main() {}") -//! .build(); -//! -//! p.cargo("publish --no-verify") -//! .replace_crates_io(registry.index_url()) -//! .run(); -//! //! validate_upload( //! r#" //! { diff --git a/crates/cargo-test-support/src/registry.rs b/crates/cargo-test-support/src/registry.rs index bd089194e93..54f3ff79515 100644 --- a/crates/cargo-test-support/src/registry.rs +++ b/crates/cargo-test-support/src/registry.rs @@ -39,7 +39,7 @@ //! "#) //! .build(); //! -//! p.cargo("run").with_stdout_data(str!["24"]).run(); +//! // p.cargo("run").with_stdout_data(str!["24"]).run(); //! ``` use crate::git::repo; diff --git a/tests/build-std/main.rs b/tests/build-std/main.rs index cf83e63c0aa..37bbe224517 100644 --- a/tests/build-std/main.rs +++ b/tests/build-std/main.rs @@ -20,10 +20,10 @@ #![allow(clippy::disallowed_methods)] -use cargo_test_support::prelude::*; use cargo_test_support::{basic_manifest, paths, project, rustc_host, str, Execs}; +use cargo_test_support::{prelude::*, Project}; use std::env; -use std::path::Path; +use std::path::{Path, PathBuf}; fn enable_build_std(e: &mut Execs, arg: Option<&str>, isolated: bool) { if !isolated { @@ -441,3 +441,34 @@ fn test_panic_abort() { .arg("-Zbuild-std-features=panic_immediate_abort") .run(); } + +pub trait CargoProjectExt { + /// Creates a `ProcessBuilder` to run cargo. + /// + /// Arguments can be separated by spaces. + /// + /// For `cargo run`, see [`Project::rename_run`]. + /// + /// # Example: + /// + /// ```no_run + /// # let p = cargo_test_support::project().build(); + /// p.cargo("build --bin foo").run(); + /// ``` + fn cargo(&self, cmd: &str) -> Execs; +} + +impl CargoProjectExt for Project { + fn cargo(&self, cmd: &str) -> Execs { + let cargo = cargo_exe(); + let mut execs = self.process(&cargo); + execs.env("CARGO", cargo); + execs.arg_line(cmd); + execs + } +} + +/// Path to the cargo binary +pub fn cargo_exe() -> PathBuf { + snapbox::cmd::cargo_bin!("cargo").to_path_buf() +} diff --git a/tests/testsuite/main.rs b/tests/testsuite/main.rs index f8af20f3a11..2eeb27827a6 100644 --- a/tests/testsuite/main.rs +++ b/tests/testsuite/main.rs @@ -196,6 +196,7 @@ mod yank; use crate::prelude::*; pub mod prelude { + pub use crate::utils::ext::CargoProjectExt; pub use cargo_test_support::prelude::*; pub use cargo_test_support::CargoCommandExt; } diff --git a/tests/testsuite/utils/ext.rs b/tests/testsuite/utils/ext.rs new file mode 100644 index 00000000000..f47a6d76e61 --- /dev/null +++ b/tests/testsuite/utils/ext.rs @@ -0,0 +1,34 @@ +use std::path::PathBuf; + +use cargo_test_support::{ArgLineCommandExt, Execs, Project}; + +pub trait CargoProjectExt { + /// Creates a `ProcessBuilder` to run cargo. + /// + /// Arguments can be separated by spaces. + /// + /// For `cargo run`, see [`Project::rename_run`]. + /// + /// # Example: + /// + /// ```no_run + /// # let p = cargo_test_support::project().build(); + /// p.cargo("build --bin foo").run(); + /// ``` + fn cargo(&self, cmd: &str) -> Execs; +} + +impl CargoProjectExt for Project { + fn cargo(&self, cmd: &str) -> Execs { + let cargo = cargo_exe(); + let mut execs = self.process(&cargo); + execs.env("CARGO", cargo); + execs.arg_line(cmd); + execs + } +} + +/// Path to the cargo binary +pub fn cargo_exe() -> PathBuf { + snapbox::cmd::cargo_bin!("cargo").to_path_buf() +} diff --git a/tests/testsuite/utils/mod.rs b/tests/testsuite/utils/mod.rs index 2ea9e4febfb..aac92e00dd5 100644 --- a/tests/testsuite/utils/mod.rs +++ b/tests/testsuite/utils/mod.rs @@ -1,2 +1,3 @@ pub mod cross_compile; +pub mod ext; pub mod tools; From 30b6707135bfbc68da744cf0e5313d9a67e4d3e0 Mon Sep 17 00:00:00 2001 From: Ross Sullivan Date: Wed, 25 Jun 2025 22:54:47 +0900 Subject: [PATCH 5/6] chore: Moved remaining `cargo_exe` logic to testsuite --- crates/cargo-test-support/src/lib.rs | 30 ------------------------- tests/testsuite/build.rs | 7 +++--- tests/testsuite/build_script.rs | 5 ++--- tests/testsuite/cargo_command.rs | 8 +++---- tests/testsuite/cargo_config/mod.rs | 2 +- tests/testsuite/concurrent.rs | 2 +- tests/testsuite/credential_process.rs | 3 ++- tests/testsuite/directory.rs | 2 +- tests/testsuite/error.rs | 2 +- tests/testsuite/feature_unification.rs | 3 ++- tests/testsuite/features2.rs | 3 ++- tests/testsuite/freshness.rs | 2 +- tests/testsuite/global_cache_tracker.rs | 5 +++-- tests/testsuite/help.rs | 3 ++- tests/testsuite/install.rs | 5 ++--- tests/testsuite/install_upgrade.rs | 5 ++--- tests/testsuite/jobserver.rs | 2 +- tests/testsuite/lockfile_path.rs | 4 ++-- tests/testsuite/login.rs | 2 +- tests/testsuite/logout.rs | 3 ++- tests/testsuite/main.rs | 2 +- tests/testsuite/new.rs | 2 +- tests/testsuite/old_cargos.rs | 3 ++- tests/testsuite/package.rs | 5 +++-- tests/testsuite/publish_lockfile.rs | 3 ++- tests/testsuite/registry.rs | 2 +- tests/testsuite/rust_version.rs | 3 ++- tests/testsuite/rustup.rs | 5 +++-- tests/testsuite/search.rs | 2 +- tests/testsuite/source_replacement.rs | 3 ++- tests/testsuite/test.rs | 7 +++--- tests/testsuite/utils/ext.rs | 17 +++++++++++++- tests/testsuite/utils/mod.rs | 18 +++++++++++++++ tests/testsuite/version.rs | 3 ++- 34 files changed, 93 insertions(+), 80 deletions(-) diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs index 40129e430b0..2c8c2c6febc 100644 --- a/crates/cargo-test-support/src/lib.rs +++ b/crates/cargo-test-support/src/lib.rs @@ -115,7 +115,6 @@ pub mod prelude { pub use crate::cargo_test; pub use crate::paths::CargoPathExt; pub use crate::ArgLineCommandExt; - pub use crate::CargoCommandExt; pub use crate::ChannelChangerCommandExt; pub use crate::TestEnvCommandExt; pub use snapbox::IntoData; @@ -598,11 +597,6 @@ pub fn main_file(println: &str, externed_deps: &[&str]) -> String { buf } -/// Path to the cargo binary -pub fn cargo_exe() -> PathBuf { - snapbox::cmd::cargo_bin("cargo") -} - /// This is the raw output from the process. /// /// This is similar to `std::process::Output`, however the `status` is @@ -1472,21 +1466,6 @@ impl TestEnvCommandExt for snapbox::cmd::Command { } } -/// Test the cargo command -pub trait CargoCommandExt { - fn cargo_ui() -> Self; -} - -impl CargoCommandExt for snapbox::cmd::Command { - fn cargo_ui() -> Self { - Self::new(cargo_exe()) - .with_assert(compare::assert_ui()) - .env("CARGO_TERM_COLOR", "always") - .env("CARGO_TERM_HYPERLINKS", "true") - .test_env() - } -} - /// Add a list of arguments as a line pub trait ArgLineCommandExt: Sized { fn arg_line(mut self, s: &str) -> Self { @@ -1524,15 +1503,6 @@ impl ArgLineCommandExt for snapbox::cmd::Command { } } -/// Run `cargo $arg_line`, see [`Execs`] -pub fn cargo_process(arg_line: &str) -> Execs { - let cargo = cargo_exe(); - let mut p = process(&cargo); - p.env("CARGO", cargo); - p.arg_line(arg_line); - execs().with_process_builder(p) -} - /// Run `git $arg_line`, see [`ProcessBuilder`] pub fn git_process(arg_line: &str) -> ProcessBuilder { let mut p = process("git"); diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs index 30d8f876571..39fad946d45 100644 --- a/tests/testsuite/build.rs +++ b/tests/testsuite/build.rs @@ -6,6 +6,8 @@ use std::io::Read; use std::process::Stdio; use crate::prelude::*; +use crate::utils::cargo_exe; +use crate::utils::cargo_process; use crate::utils::tools; use cargo::core::compiler::UserIntent; use cargo::core::Shell; @@ -17,9 +19,8 @@ use cargo_test_support::paths::root; use cargo_test_support::registry::Package; use cargo_test_support::str; use cargo_test_support::{ - basic_bin_manifest, basic_lib_manifest, basic_manifest, cargo_exe, cargo_process, git, - is_nightly, main_file, paths, process, project, rustc_host, sleep_ms, symlink_supported, t, - Execs, ProjectBuilder, + basic_bin_manifest, basic_lib_manifest, basic_manifest, git, is_nightly, main_file, paths, + process, project, rustc_host, sleep_ms, symlink_supported, t, Execs, ProjectBuilder, }; use cargo_util::paths::dylib_path_envvar; diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs index 716c2001917..c6217021174 100644 --- a/tests/testsuite/build_script.rs +++ b/tests/testsuite/build_script.rs @@ -6,6 +6,7 @@ use std::io; use std::thread; use crate::prelude::*; +use crate::utils::cargo_exe; use crate::utils::cross_compile::{ can_run_on_host as cross_compile_can_run_on_host, disabled as cross_compile_disabled, }; @@ -14,9 +15,7 @@ use cargo_test_support::compare::assert_e2e; use cargo_test_support::paths::cargo_home; use cargo_test_support::registry::Package; use cargo_test_support::str; -use cargo_test_support::{ - basic_manifest, cargo_exe, cross_compile, is_coarse_mtime, project, project_in, -}; +use cargo_test_support::{basic_manifest, cross_compile, is_coarse_mtime, project, project_in}; use cargo_test_support::{git, rustc_host, sleep_ms, slow_cpu_multiplier, symlink_supported}; use cargo_util::paths::{self, remove_dir_all}; diff --git a/tests/testsuite/cargo_command.rs b/tests/testsuite/cargo_command.rs index a84e26f3a96..e0fe47dd377 100644 --- a/tests/testsuite/cargo_command.rs +++ b/tests/testsuite/cargo_command.rs @@ -8,14 +8,14 @@ use std::process::Stdio; use std::str; use crate::prelude::*; +use crate::utils::cargo_exe; +use crate::utils::cargo_process; use crate::utils::tools::echo_subcommand; use cargo_test_support::basic_manifest; use cargo_test_support::registry::Package; use cargo_test_support::rustc_host; use cargo_test_support::str; -use cargo_test_support::{ - basic_bin_manifest, cargo_exe, cargo_process, paths, project, project_in_home, -}; +use cargo_test_support::{basic_bin_manifest, paths, project, project_in_home}; use cargo_util::paths::join_paths; fn path() -> Vec { @@ -601,7 +601,7 @@ fn overwrite_cargo_environment_variable() { // Create two other cargo binaries in the project root, one with the wrong // name and one with the right name. - let cargo_exe = cargo_test_support::cargo_exe(); + let cargo_exe = crate::utils::cargo_exe(); let wrong_name_path = p .root() .join(format!("wrong_name{}", env::consts::EXE_SUFFIX)); diff --git a/tests/testsuite/cargo_config/mod.rs b/tests/testsuite/cargo_config/mod.rs index 5346a7c02c4..be5cf7d35e5 100644 --- a/tests/testsuite/cargo_config/mod.rs +++ b/tests/testsuite/cargo_config/mod.rs @@ -10,7 +10,7 @@ use std::path::PathBuf; mod help; fn cargo_process(s: &str) -> cargo_test_support::Execs { - let mut p = cargo_test_support::cargo_process(s); + let mut p = crate::utils::cargo_process(s); // Clear out some of the environment added by the default cargo_process so // the tests don't need to deal with it. p.env_remove("CARGO_PROFILE_DEV_SPLIT_DEBUGINFO") diff --git a/tests/testsuite/concurrent.rs b/tests/testsuite/concurrent.rs index 5fb6dc157e4..1f8afa35c99 100644 --- a/tests/testsuite/concurrent.rs +++ b/tests/testsuite/concurrent.rs @@ -8,7 +8,7 @@ use std::thread; use std::{env, str}; use crate::prelude::*; -use cargo_test_support::cargo_process; +use crate::utils::cargo_process; use cargo_test_support::git; use cargo_test_support::install::assert_has_installed_exe; use cargo_test_support::paths; diff --git a/tests/testsuite/credential_process.rs b/tests/testsuite/credential_process.rs index a373ea0a24b..a775f829fbd 100644 --- a/tests/testsuite/credential_process.rs +++ b/tests/testsuite/credential_process.rs @@ -1,8 +1,9 @@ //! Tests for credential-process. use crate::prelude::*; +use crate::utils::cargo_process; use cargo_test_support::registry::{Package, TestRegistry}; -use cargo_test_support::{basic_manifest, cargo_process, paths, project, registry, str, Project}; +use cargo_test_support::{basic_manifest, paths, project, registry, str, Project}; fn toml_bin(proj: &Project, name: &str) -> String { proj.bin(name).display().to_string().replace('\\', "\\\\") diff --git a/tests/testsuite/directory.rs b/tests/testsuite/directory.rs index 2406e7e9854..4bd13860a9f 100644 --- a/tests/testsuite/directory.rs +++ b/tests/testsuite/directory.rs @@ -5,7 +5,7 @@ use std::fs; use std::str; use crate::prelude::*; -use cargo_test_support::cargo_process; +use crate::utils::cargo_process; use cargo_test_support::git; use cargo_test_support::paths; use cargo_test_support::registry::{cksum, Package}; diff --git a/tests/testsuite/error.rs b/tests/testsuite/error.rs index e948ba226a5..8898ff1adb1 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 crate::utils::cargo_process; #[cargo_test] fn internal_error() { diff --git a/tests/testsuite/feature_unification.rs b/tests/testsuite/feature_unification.rs index 278788a93bf..f5337336aac 100644 --- a/tests/testsuite/feature_unification.rs +++ b/tests/testsuite/feature_unification.rs @@ -1,7 +1,8 @@ //! Tests for workspace feature unification. use crate::prelude::*; -use cargo_test_support::{basic_manifest, cargo_process, project, str}; +use crate::utils::cargo_process; +use cargo_test_support::{basic_manifest, project, str}; #[cargo_test] fn workspace_feature_unification() { diff --git a/tests/testsuite/features2.rs b/tests/testsuite/features2.rs index 8216f405558..ec121c78c98 100644 --- a/tests/testsuite/features2.rs +++ b/tests/testsuite/features2.rs @@ -3,13 +3,14 @@ use std::fs::File; use crate::prelude::*; +use crate::utils::cargo_process; 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::publish::validate_crate_contents; use cargo_test_support::registry::{Dependency, Package}; use cargo_test_support::str; -use cargo_test_support::{basic_manifest, cargo_process, project, rustc_host, Project}; +use cargo_test_support::{basic_manifest, project, rustc_host, Project}; /// Switches Cargo.toml to use `resolver = "2"`. pub fn switch_to_resolver_2(p: &Project) { diff --git a/tests/testsuite/freshness.rs b/tests/testsuite/freshness.rs index 29b26993844..837b03d42df 100644 --- a/tests/testsuite/freshness.rs +++ b/tests/testsuite/freshness.rs @@ -2986,7 +2986,7 @@ fn cargo_env_changes() { ) .build(); - let cargo_exe = cargo_test_support::cargo_exe(); + let cargo_exe = crate::utils::cargo_exe(); let other_cargo_path = p.root().join(cargo_exe.file_name().unwrap()); std::fs::hard_link(&cargo_exe, &other_cargo_path).unwrap(); let other_cargo = || { diff --git a/tests/testsuite/global_cache_tracker.rs b/tests/testsuite/global_cache_tracker.rs index 1b7730d2839..a42e054c8e6 100644 --- a/tests/testsuite/global_cache_tracker.rs +++ b/tests/testsuite/global_cache_tracker.rs @@ -15,6 +15,7 @@ use std::sync::OnceLock; use std::time::{Duration, SystemTime}; use crate::prelude::*; +use crate::utils::cargo_process; use cargo::core::global_cache_tracker::{self, DeferredGlobalLastUse, GlobalCacheTracker}; use cargo::util::cache_lock::CacheLockMode; use cargo::GlobalContext; @@ -22,8 +23,8 @@ use cargo_test_support::compare::assert_e2e; use cargo_test_support::paths; use cargo_test_support::registry::{Package, RegistryBuilder}; use cargo_test_support::{ - basic_manifest, cargo_process, execs, git, process, project, retry, sleep_ms, str, - thread_wait_timeout, Execs, Project, + basic_manifest, execs, git, process, project, retry, sleep_ms, str, thread_wait_timeout, Execs, + Project, }; use itertools::Itertools; diff --git a/tests/testsuite/help.rs b/tests/testsuite/help.rs index ae3a95a03a8..cec7d5513d3 100644 --- a/tests/testsuite/help.rs +++ b/tests/testsuite/help.rs @@ -5,9 +5,10 @@ use std::path::Path; use std::str::from_utf8; use crate::prelude::*; +use crate::utils::cargo_process; use cargo_test_support::registry::Package; use cargo_test_support::str; -use cargo_test_support::{basic_manifest, cargo_process, paths, project}; +use cargo_test_support::{basic_manifest, paths, project}; #[cargo_test] fn help() { diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs index e0ce5294ecb..7197649b233 100644 --- a/tests/testsuite/install.rs +++ b/tests/testsuite/install.rs @@ -8,14 +8,13 @@ use std::path::PathBuf; use std::thread; use crate::prelude::*; +use crate::utils::cargo_process; use cargo_test_support::compare::assert_e2e; use cargo_test_support::cross_compile; use cargo_test_support::git; use cargo_test_support::registry::{self, Package}; use cargo_test_support::str; -use cargo_test_support::{ - basic_manifest, cargo_process, project, project_in, symlink_supported, t, -}; +use cargo_test_support::{basic_manifest, project, project_in, symlink_supported, t}; use cargo_util::{ProcessBuilder, ProcessError}; use crate::utils::cross_compile::disabled as cross_compile_disabled; diff --git a/tests/testsuite/install_upgrade.rs b/tests/testsuite/install_upgrade.rs index 037b4a4d8a4..4677309a428 100644 --- a/tests/testsuite/install_upgrade.rs +++ b/tests/testsuite/install_upgrade.rs @@ -7,14 +7,13 @@ use std::path::PathBuf; use std::sync::atomic::{AtomicUsize, Ordering}; use crate::prelude::*; +use crate::utils::cargo_process; 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::registry::{self, Package}; -use cargo_test_support::{ - basic_manifest, cargo_process, cross_compile, execs, git, process, project, str, Execs, -}; +use cargo_test_support::{basic_manifest, cross_compile, execs, git, process, project, str, Execs}; fn pkg_maybe_yanked(name: &str, vers: &str, yanked: bool) { Package::new(name, vers) diff --git a/tests/testsuite/jobserver.rs b/tests/testsuite/jobserver.rs index 29504032243..f66c017404f 100644 --- a/tests/testsuite/jobserver.rs +++ b/tests/testsuite/jobserver.rs @@ -6,8 +6,8 @@ use std::process::Command; use std::thread; use crate::prelude::*; +use crate::utils::cargo_exe; 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::{project, rustc_host, str}; diff --git a/tests/testsuite/lockfile_path.rs b/tests/testsuite/lockfile_path.rs index 2718553e20b..2c492e88b8a 100644 --- a/tests/testsuite/lockfile_path.rs +++ b/tests/testsuite/lockfile_path.rs @@ -5,12 +5,12 @@ use std::fs; use snapbox::str; use crate::prelude::*; +use crate::utils::cargo_process; use cargo_test_support::compare::assert_e2e; use cargo_test_support::install::assert_has_installed_exe; use cargo_test_support::registry::{Package, RegistryBuilder}; use cargo_test_support::{ - basic_bin_manifest, cargo_process, cargo_test, paths, project, symlink_supported, - ProjectBuilder, + basic_bin_manifest, cargo_test, paths, project, symlink_supported, ProjectBuilder, }; /////////////////////////////// //// Unstable feature tests start diff --git a/tests/testsuite/login.rs b/tests/testsuite/login.rs index 2cfcc8f8689..f93618b370c 100644 --- a/tests/testsuite/login.rs +++ b/tests/testsuite/login.rs @@ -4,7 +4,7 @@ use std::fs; use std::path::PathBuf; use crate::prelude::*; -use cargo_test_support::cargo_process; +use crate::utils::cargo_process; use cargo_test_support::paths; use cargo_test_support::registry::{self, RegistryBuilder}; use cargo_test_support::str; diff --git a/tests/testsuite/logout.rs b/tests/testsuite/logout.rs index 23cf1b9a79a..283754b41cd 100644 --- a/tests/testsuite/logout.rs +++ b/tests/testsuite/logout.rs @@ -2,9 +2,10 @@ use super::login::check_token; use crate::prelude::*; +use crate::utils::cargo_process; use cargo_test_support::paths; use cargo_test_support::registry::TestRegistry; -use cargo_test_support::{cargo_process, registry, str}; +use cargo_test_support::{registry, str}; fn simple_logout_test(registry: &TestRegistry, reg: Option<&str>, flag: &str, note: &str) { let msg = reg.unwrap_or("crates-io"); diff --git a/tests/testsuite/main.rs b/tests/testsuite/main.rs index 2eeb27827a6..bcff5664a24 100644 --- a/tests/testsuite/main.rs +++ b/tests/testsuite/main.rs @@ -196,9 +196,9 @@ mod yank; use crate::prelude::*; pub mod prelude { + pub use crate::utils::ext::CargoCommandExt; pub use crate::utils::ext::CargoProjectExt; pub use cargo_test_support::prelude::*; - pub use cargo_test_support::CargoCommandExt; } #[cargo_test] diff --git a/tests/testsuite/new.rs b/tests/testsuite/new.rs index 43eccb06277..b559b588700 100644 --- a/tests/testsuite/new.rs +++ b/tests/testsuite/new.rs @@ -4,7 +4,7 @@ use std::env; use std::fs::{self, File}; use crate::prelude::*; -use cargo_test_support::cargo_process; +use crate::utils::cargo_process; use cargo_test_support::paths; use cargo_test_support::str; diff --git a/tests/testsuite/old_cargos.rs b/tests/testsuite/old_cargos.rs index 64d4ba05495..42d3e9c9cc1 100644 --- a/tests/testsuite/old_cargos.rs +++ b/tests/testsuite/old_cargos.rs @@ -13,9 +13,10 @@ use std::fs; use crate::prelude::*; +use crate::utils::cargo_exe; use cargo::CargoResult; use cargo_test_support::registry::{self, Dependency, Package}; -use cargo_test_support::{cargo_exe, execs, paths, process, project, rustc_host, str}; +use cargo_test_support::{execs, paths, process, project, rustc_host, str}; use cargo_util::{ProcessBuilder, ProcessError}; use semver::Version; diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs index 244477707d8..69ab788ea0e 100644 --- a/tests/testsuite/package.rs +++ b/tests/testsuite/package.rs @@ -4,11 +4,12 @@ use std::fs::{self, read_to_string, File}; use std::path::Path; use crate::prelude::*; +use crate::utils::cargo_process; use cargo_test_support::publish::validate_crate_contents; use cargo_test_support::registry::{self, Package}; use cargo_test_support::{ - basic_manifest, cargo_process, git, paths, project, rustc_host, str, symlink_supported, t, - Project, ProjectBuilder, + basic_manifest, git, paths, project, rustc_host, str, symlink_supported, t, Project, + ProjectBuilder, }; use flate2::read::GzDecoder; use tar::Archive; diff --git a/tests/testsuite/publish_lockfile.rs b/tests/testsuite/publish_lockfile.rs index 7d32bf03869..1d3a095f4d4 100644 --- a/tests/testsuite/publish_lockfile.rs +++ b/tests/testsuite/publish_lockfile.rs @@ -3,9 +3,10 @@ use std::fs::File; use crate::prelude::*; +use crate::utils::cargo_process; use cargo_test_support::registry::Package; use cargo_test_support::{ - basic_manifest, cargo_process, git, paths, project, publish::validate_crate_contents, str, + basic_manifest, git, paths, project, publish::validate_crate_contents, str, }; fn pl_manifest(name: &str, version: &str, extra: &str) -> String { diff --git a/tests/testsuite/registry.rs b/tests/testsuite/registry.rs index 16e47e5f17f..a2b2e9d859b 100644 --- a/tests/testsuite/registry.rs +++ b/tests/testsuite/registry.rs @@ -7,8 +7,8 @@ use std::sync::Arc; use std::sync::Mutex; use crate::prelude::*; +use crate::utils::cargo_process; use cargo::core::SourceId; -use cargo_test_support::cargo_process; use cargo_test_support::paths; use cargo_test_support::registry::{ self, registry_path, Dependency, Package, RegistryBuilder, Response, TestRegistry, diff --git a/tests/testsuite/rust_version.rs b/tests/testsuite/rust_version.rs index 0063e18cc8d..183d068d076 100644 --- a/tests/testsuite/rust_version.rs +++ b/tests/testsuite/rust_version.rs @@ -1,7 +1,8 @@ //! Tests for targets with `rust-version`. use crate::prelude::*; -use cargo_test_support::{cargo_process, project, registry::Package, str}; +use crate::utils::cargo_process; +use cargo_test_support::{project, registry::Package, str}; #[cargo_test] fn rust_version_satisfied() { diff --git a/tests/testsuite/rustup.rs b/tests/testsuite/rustup.rs index 7d47ca77479..181a257e7b4 100644 --- a/tests/testsuite/rustup.rs +++ b/tests/testsuite/rustup.rs @@ -7,8 +7,9 @@ use std::fs; use std::path::{Path, PathBuf}; use crate::prelude::*; +use crate::utils::cargo_process; use cargo_test_support::paths::{home, root}; -use cargo_test_support::{cargo_process, process, project, str}; +use cargo_test_support::{process, project, str}; /// Helper to generate an executable. fn make_exe(dest: &Path, name: &str, contents: &str, env: &[(&str, PathBuf)]) -> PathBuf { @@ -207,7 +208,7 @@ fn custom_calls_other_cargo() { let custom_bin = root().join("custom-bin"); custom_bin.mkdir_p(); // `cargo` points to the real cargo. - let cargo_exe = cargo_test_support::cargo_exe(); + let cargo_exe = crate::utils::cargo_exe(); fs::hard_link(&cargo_exe, custom_bin.join(cargo_exe.file_name().unwrap())).unwrap(); // `rustc` executes the real rustc. real_rustc_wrapper(&custom_bin, "custom toolchain rustc running"); diff --git a/tests/testsuite/search.rs b/tests/testsuite/search.rs index a7ab0d98875..e4de2cedb83 100644 --- a/tests/testsuite/search.rs +++ b/tests/testsuite/search.rs @@ -3,8 +3,8 @@ use std::collections::HashSet; use crate::prelude::*; +use crate::utils::cargo_process; use cargo::util::cache_lock::CacheLockMode; -use cargo_test_support::cargo_process; use cargo_test_support::paths; use cargo_test_support::registry::{RegistryBuilder, Response}; use cargo_test_support::str; diff --git a/tests/testsuite/source_replacement.rs b/tests/testsuite/source_replacement.rs index aeee72bffbc..94fdfdca923 100644 --- a/tests/testsuite/source_replacement.rs +++ b/tests/testsuite/source_replacement.rs @@ -3,8 +3,9 @@ use std::fs; use crate::prelude::*; +use crate::utils::cargo_process; use cargo_test_support::registry::{Package, RegistryBuilder, TestRegistry}; -use cargo_test_support::{cargo_process, paths, project, str, t}; +use cargo_test_support::{paths, project, str, t}; fn setup_replacement(config: &str) -> TestRegistry { let crates_io = RegistryBuilder::new() diff --git a/tests/testsuite/test.rs b/tests/testsuite/test.rs index 17bc6f7f58a..099a2bc7ac6 100644 --- a/tests/testsuite/test.rs +++ b/tests/testsuite/test.rs @@ -3,10 +3,9 @@ use std::fs; use crate::prelude::*; +use crate::utils::cargo_exe; use cargo_test_support::registry::Package; -use cargo_test_support::{ - basic_bin_manifest, basic_lib_manifest, basic_manifest, cargo_exe, project, str, -}; +use cargo_test_support::{basic_bin_manifest, basic_lib_manifest, basic_manifest, project, str}; use cargo_test_support::{cross_compile, paths}; use cargo_test_support::{rustc_host, rustc_host_env, sleep_ms}; use cargo_util::paths::dylib_path_envvar; @@ -3912,7 +3911,7 @@ test env_test ... ok .run(); // Check that `cargo test` propagates the environment's $CARGO - let cargo_exe = cargo_test_support::cargo_exe(); + let cargo_exe = cargo_exe(); let other_cargo_path = p.root().join(cargo_exe.file_name().unwrap()); std::fs::hard_link(&cargo_exe, &other_cargo_path).unwrap(); let stderr_other_cargo = format!( diff --git a/tests/testsuite/utils/ext.rs b/tests/testsuite/utils/ext.rs index f47a6d76e61..19bc17733a1 100644 --- a/tests/testsuite/utils/ext.rs +++ b/tests/testsuite/utils/ext.rs @@ -1,6 +1,6 @@ use std::path::PathBuf; -use cargo_test_support::{ArgLineCommandExt, Execs, Project}; +use cargo_test_support::{compare, ArgLineCommandExt, Execs, Project, TestEnvCommandExt}; pub trait CargoProjectExt { /// Creates a `ProcessBuilder` to run cargo. @@ -32,3 +32,18 @@ impl CargoProjectExt for Project { pub fn cargo_exe() -> PathBuf { snapbox::cmd::cargo_bin!("cargo").to_path_buf() } + +/// Test the cargo command +pub trait CargoCommandExt { + fn cargo_ui() -> Self; +} + +impl CargoCommandExt for snapbox::cmd::Command { + fn cargo_ui() -> Self { + Self::new(cargo_exe()) + .with_assert(compare::assert_ui()) + .env("CARGO_TERM_COLOR", "always") + .env("CARGO_TERM_HYPERLINKS", "true") + .test_env() + } +} diff --git a/tests/testsuite/utils/mod.rs b/tests/testsuite/utils/mod.rs index aac92e00dd5..c068ea33596 100644 --- a/tests/testsuite/utils/mod.rs +++ b/tests/testsuite/utils/mod.rs @@ -1,3 +1,21 @@ +use std::path::PathBuf; + +use cargo_test_support::{execs, process, ArgLineCommandExt, Execs}; + pub mod cross_compile; pub mod ext; pub mod tools; + +/// Run `cargo $arg_line`, see [`Execs`] +pub fn cargo_process(arg_line: &str) -> Execs { + let cargo = cargo_exe(); + let mut p = process(&cargo); + p.env("CARGO", cargo); + p.arg_line(arg_line); + execs().with_process_builder(p) +} + +/// Path to the cargo binary +pub fn cargo_exe() -> PathBuf { + snapbox::cmd::cargo_bin!("cargo").to_path_buf() +} diff --git a/tests/testsuite/version.rs b/tests/testsuite/version.rs index 8ec5765f21e..9dd4e3a2c81 100644 --- a/tests/testsuite/version.rs +++ b/tests/testsuite/version.rs @@ -1,7 +1,8 @@ //! Tests for displaying the cargo version. use crate::prelude::*; -use cargo_test_support::{cargo_process, project}; +use crate::utils::cargo_process; +use cargo_test_support::project; #[cargo_test] fn simple() { From 02b56d4d22d75b8be20b1ac3dbf509a876b51ace Mon Sep 17 00:00:00 2001 From: Ross Sullivan Date: Wed, 25 Jun 2025 23:05:29 +0900 Subject: [PATCH 6/6] docs: Updated test docs with updated prelude and utils --- src/doc/contrib/src/tests/writing.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/doc/contrib/src/tests/writing.md b/src/doc/contrib/src/tests/writing.md index be92184af84..178d7f09f6c 100644 --- a/src/doc/contrib/src/tests/writing.md +++ b/src/doc/contrib/src/tests/writing.md @@ -29,7 +29,7 @@ stdout and stderr output against the expected output. Generally, a functional test will be placed in `tests/testsuite/.rs` and will look roughly like: ```rust,ignore -use cargo_test_support::prelude::*; +use crate::prelude::*; use cargo_test_support::str; use cargo_test_support::project; @@ -123,7 +123,7 @@ Tests that need to do cross-compilation should include this at the top of the test to disable it in scenarios where cross compilation isn't available: ```rust,ignore -if cargo_test_support::cross_compile::disabled() { +if crate::utils::cross_compile::disabled() { return; } ``` @@ -146,7 +146,7 @@ If the test needs to run the cross-compiled binary, then it should have something like this to exit the test before doing so: ```rust,ignore -if cargo_test_support::cross_compile::can_run_on_host() { +if crate::utils::cross_compile::can_run_on_host() { return; } ``` @@ -165,10 +165,10 @@ mod ; `tests/testsuite///mod.rs`: ```rust,ignore +use crate::prelude::*; use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; -use cargo_test_support::prelude::*; use cargo_test_support::Project; #[cargo_test]