chore: Created CargoProjectExt extention trait

Author: ranger-ross

Cargo.lock

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

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

crates/cargo-test-support/Cargo.toml

@@ -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

crates/cargo-test-support/src/lib.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#"
 //!     {

crates/cargo-test-support/src/publish.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;

crates/cargo-test-support/src/registry.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()
+}

tests/build-std/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;
 }

tests/testsuite/main.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()
+}

tests/testsuite/utils/ext.rs

@@ -1,2 +1,3 @@
 pub mod cross_compile;
+pub mod ext;
 pub mod tools;