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/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;
 

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};
 

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<PathBuf> {
@@ -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));

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

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;

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('\\', "\\\\")

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};

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() {

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() {