Merge pull request #13 from khagankhan/cleanup

Address deprecated cmd failure

Author: khagankhan

tests/cli.rs

@@ -1,7 +1,7 @@
 // tests/cli.rs
 //! Trait Winnower CLI tests.
 
-use assert_cmd::Command;
+use assert_cmd::{Command, cargo};
 use assert_fs::assert::PathAssert;
 use assert_fs::fixture::FileWriteStr;
 use assert_fs::fixture::PathChild;
@@ -11,9 +11,13 @@ use trait_winnower::config::Config;
 
 type TestResult = Result<(), Box<dyn std::error::Error>>;
 
+fn tw_cmd() -> Command {
+    Command::new(cargo::cargo_bin!("trait-winnower"))
+}
+
 #[test]
 fn dies_no_args() -> TestResult {
-    let mut cmd = Command::cargo_bin("trait-winnower")?;
+    let mut cmd = tw_cmd();
     cmd.env("CLICOLOR", "0");
 
     cmd.assert()
@@ -26,14 +30,10 @@ fn dies_no_args() -> TestResult {
 }
 
 #[test]
-fn init_writes_default_config_in_cwd() -> Result<(), Box<dyn std::error::Error>> {
+fn init_writes_default_config_in_cwd() -> TestResult {
     let tmp = assert_fs::TempDir::new()?;
 
-    Command::cargo_bin("trait-winnower")?
-        .current_dir(&tmp)
-        .arg("init")
-        .assert()
-        .success();
+    tw_cmd().current_dir(&tmp).arg("init").assert().success();
 
     let cfg_path = tmp.child(".trait-winnower.toml");
     cfg_path.assert(predicates::path::exists());
@@ -49,14 +49,14 @@ fn init_writes_default_config_in_cwd() -> Result<(), Box<dyn std::error::Error>>
 }
 
 #[test]
-fn check_dry_run_on_crate_root_succeeds() -> Result<(), Box<dyn std::error::Error>> {
+fn check_dry_run_on_crate_root_succeeds() -> TestResult {
     let tmp = assert_fs::TempDir::new()?;
     tmp.child("Cargo.toml")
         .write_str("[package]\nname=\"x\"\nversion=\"0.1.0\"\n")?;
     tmp.child("src").create_dir_all()?;
     tmp.child("src/lib.rs").write_str("// lib\n")?;
 
-    Command::cargo_bin("trait-winnower")?
+    tw_cmd()
         .current_dir(&tmp)
         .args(["check", "."])
         .assert()
@@ -67,14 +67,14 @@ fn check_dry_run_on_crate_root_succeeds() -> Result<(), Box<dyn std::error::Erro
 }
 
 #[test]
-fn prune_dry_run_on_crate_root_succeeds() -> Result<(), Box<dyn std::error::Error>> {
+fn prune_dry_run_on_crate_root_succeeds() -> TestResult {
     let tmp = assert_fs::TempDir::new()?;
     tmp.child("Cargo.toml")
         .write_str("[package]\nname=\"x\"\nversion=\"0.1.0\"\n")?;
     tmp.child("src").create_dir_all()?;
     tmp.child("src/lib.rs").write_str("// lib\n")?;
 
-    Command::cargo_bin("trait-winnower")?
+    tw_cmd()
         .current_dir(&tmp)
         .args(["prune", "."])
         .assert()