chore: Moved remaining cargo_exe logic to testsuite

Author: ranger-ross

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");

tests/testsuite/advanced_env.rs

@@ -3,7 +3,6 @@
 use crate::prelude::*;
 use cargo_test_support::{paths, project, registry::Package};
 
-
 #[cargo_test]
 fn source_config_env() {
     // Try to define [source] with environment variables.

tests/testsuite/alt_registry.rs

@@ -2,14 +2,13 @@
 
 use std::fs;
 
-use cargo_test_support::compare::assert_e2e;
 use crate::prelude::*;
+use cargo_test_support::compare::assert_e2e;
 use cargo_test_support::publish::validate_alt_upload;
 use cargo_test_support::registry::{self, Package, RegistryBuilder};
 use cargo_test_support::str;
 use cargo_test_support::{basic_manifest, paths, project};
 
-
 #[cargo_test]
 fn depend_on_alt_registry() {
     registry::alt_init();

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 crate::prelude::*;
 use cargo_test_support::registry::{Package, RegistryBuilder};
 use cargo_test_support::str;
 use cargo_test_support::{

tests/testsuite/artifact_dir.rs

@@ -9,7 +9,6 @@ use cargo_test_support::sleep_ms;
 use cargo_test_support::str;
 use cargo_test_support::{basic_manifest, project};
 
-
 #[cargo_test]
 fn binary_with_debug() {
     let p = project()

tests/testsuite/bad_config.rs

@@ -1,12 +1,11 @@
 //! Tests for some invalid .cargo/config files.
 
-use cargo_test_support::git::cargo_uses_gitoxide;
 use crate::prelude::*;
+use cargo_test_support::git::cargo_uses_gitoxide;
 use cargo_test_support::registry::{self, Package};
 use cargo_test_support::str;
 use cargo_test_support::{basic_manifest, project, rustc_host};
 
-
 #[cargo_test]
 fn bad1() {
     let p = project()

tests/testsuite/bad_manifest_path.rs

@@ -3,7 +3,6 @@
 use crate::prelude::*;
 use cargo_test_support::{basic_bin_manifest, main_file, project, str};
 
-
 #[track_caller]
 fn assert_not_a_cargo_toml(command: &str, manifest_path_argument: &str) {
     let p = project()

tests/testsuite/bench.rs

@@ -3,7 +3,6 @@
 use crate::prelude::*;
 use cargo_test_support::{basic_bin_manifest, basic_lib_manifest, basic_manifest, project, str};
 
-
 #[cargo_test(nightly, reason = "bench")]
 fn cargo_bench_simple() {
     let p = project()

tests/testsuite/binary_name.rs

@@ -1,14 +1,13 @@
 //! 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 crate::prelude::*;
 use cargo_test_support::project;
 use cargo_test_support::str;
 
-
 #[cargo_test]
 fn gated() {
     let p = project()

tests/testsuite/build.rs

@@ -5,6 +5,9 @@ use std::fs;
 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;
@@ -13,13 +16,11 @@ use cargo::ops::CompileOptions;
 use cargo::GlobalContext;
 use cargo_test_support::compare::assert_e2e;
 use cargo_test_support::paths::root;
-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, 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;