Merge pull request #406 from epage/cargo_bin

fix: Deprecate cargo_bin (runtime version)

Author: epage

crates/snapbox-macros/src/lib.rs

@@ -29,30 +29,6 @@ macro_rules! debug {
     ($($arg:tt)*) => {};
 }
 
-/// The absolute path to a binary target's executable.
-///
-/// The `bin_target_name` is the name of the binary
-/// target, exactly as-is.
-///
-/// **NOTE:** This is only set when building an integration test or benchmark.
-///
-/// ## Example
-///
-/// ```rust,no_run
-/// #[test]
-/// fn cli_tests() {
-///     trycmd::TestCases::new()
-///         .default_bin_path(trycmd::cargo_bin!("bin-fixture"))
-///         .case("tests/cmd/*.trycmd");
-/// }
-/// ```
-#[macro_export]
-macro_rules! cargo_bin {
-    ($bin_target_name:expr) => {
-        ::std::path::Path::new(env!(concat!("CARGO_BIN_EXE_", $bin_target_name)))
-    };
-}
-
 #[doc = include_str!("../README.md")]
 #[cfg(doctest)]
 pub struct ReadmeDoctests;

crates/snapbox/src/cmd.rs

@@ -845,11 +845,16 @@ fn wait(
     child.wait()
 }
 
-pub use snapbox_macros::cargo_bin;
+#[doc(inline)]
+pub use crate::cargo_bin;
 
 /// Look up the path to a cargo-built binary within an integration test.
 ///
 /// **NOTE:** Prefer [`cargo_bin!`] as this makes assumptions about cargo
+#[deprecated(
+    since = "0.6.23",
+    note = "incompatible with a custom cargo build-dir, see instead `cmd::cargo_bin!`"
+)]
 pub fn cargo_bin(name: &str) -> std::path::PathBuf {
     let file_name = format!("{}{}", name, std::env::consts::EXE_SUFFIX);
     let target_dir = target_dir();

crates/snapbox/src/macros.rs

@@ -108,6 +108,34 @@ macro_rules! fn_path {
     }};
 }
 
+/// The absolute path to a binary target's executable.
+///
+/// The `bin_target_name` is the name of the binary
+/// target, exactly as-is.
+///
+/// **NOTE:** This is only set when building an integration test or benchmark.
+///
+/// ## Example
+///
+/// ```rust,no_run
+/// #[test]
+/// fn cli_tests() {
+///     trycmd::TestCases::new()
+///         .default_bin_path(trycmd::cargo_bin!("bin-fixture"))
+///         .case("tests/cmd/*.trycmd");
+/// }
+/// ```
+#[macro_export]
+#[doc(hidden)]
+macro_rules! cargo_bin {
+    () => {
+        $crate::cmd::cargo_bin!(env!("CARGO_PKG_NAME"))
+    };
+    ($bin_target_name:expr) => {
+        ::std::path::Path::new(env!(concat!("CARGO_BIN_EXE_", $bin_target_name)))
+    };
+}
+
 #[cfg(test)]
 mod test {
     #[test]