Eliminate use of deprecated cargo_bin function

Author: smoelius

tests/dogfood.rs

@@ -1,8 +1,7 @@
-use assert_cmd::cargo::CommandCargoExt;
-use elaborate::std::{env::var_wc, process::CommandContext};
+use assert_cmd::cargo::cargo_bin_cmd;
+use elaborate::std::env::var_wc;
 use std::{
     io::{Write, stderr},
-    process::Command,
     sync::Mutex,
 };
 
@@ -15,21 +14,19 @@ fn dogfood() {
     let _lock = MUTEX.lock().unwrap();
 
     preserves_cleanliness("dogfood", || {
-        let mut command = Command::cargo_bin("rustdoc-prettier").unwrap();
+        let mut command = cargo_bin_cmd!("rustdoc-prettier");
         command.arg("src/**/*.rs");
-        let status = command.status_wc().unwrap();
-        assert!(status.success());
+        command.assert().success();
     });
 }
 
 #[test]
 fn dogfood_with_check() {
     let _lock = MUTEX.lock().unwrap();
 
-    let mut command = Command::cargo_bin("rustdoc-prettier").unwrap();
+    let mut command = cargo_bin_cmd!("rustdoc-prettier");
     command.args(["src/**/*.rs", "--check"]);
-    let status = command.status_wc().unwrap();
-    assert!(status.success());
+    command.assert().success();
 }
 
 fn preserves_cleanliness(test_name: &str, f: impl FnOnce()) {

tests/globstar.rs

@@ -1,15 +1,14 @@
-use assert_cmd::{assert::OutputAssertExt, cargo::CommandCargoExt};
+use assert_cmd::cargo::cargo_bin_cmd;
 use elaborate::std::fs::read_to_string_wc;
 use predicates::prelude::*;
-use std::process::Command;
 
 mod util;
 
 #[test]
 fn globstar() {
     let (_tempdir, path) = util::copy_into_tempdir("fixtures/globstar").unwrap();
 
-    let mut command = Command::cargo_bin("rustdoc-prettier").unwrap();
+    let mut command = cargo_bin_cmd!("rustdoc-prettier");
     command.arg("**/*.rs");
     command.current_dir(&path);
     command.assert().success();
@@ -20,7 +19,7 @@ fn globstar() {
 
 #[test]
 fn globstar_with_check() {
-    let mut command = Command::cargo_bin("rustdoc-prettier").unwrap();
+    let mut command = cargo_bin_cmd!("rustdoc-prettier");
     command.args(["**/*.rs", "--check"]);
     command.current_dir("fixtures/globstar");
     command.assert().failure().stderr(predicate::eq(

tests/nonexistent_file.rs

@@ -1,13 +1,12 @@
-use assert_cmd::{assert::OutputAssertExt, cargo::CommandCargoExt};
+use assert_cmd::cargo::cargo_bin_cmd;
 use predicates::prelude::*;
-use std::process::Command;
 use tempfile::tempdir;
 
 #[test]
 fn nonexistent_file() {
     let tempdir = tempdir().unwrap();
 
-    let mut command = Command::cargo_bin("rustdoc-prettier").unwrap();
+    let mut command = cargo_bin_cmd!("rustdoc-prettier");
     command.arg("nonexistent_file.rs");
     command.current_dir(&tempdir);
     command.assert().failure().stderr(predicate::eq(

tests/rustfmt_toml_in_parent_directory.rs

@@ -1,8 +1,7 @@
-use assert_cmd::{assert::OutputAssertExt, cargo::CommandCargoExt};
+use assert_cmd::cargo::cargo_bin_cmd;
 use elaborate::std::fs::read_to_string_wc;
 use predicates::prelude::*;
 use similar_asserts::SimpleDiff;
-use std::process::Command;
 
 mod util;
 
@@ -12,7 +11,7 @@ fn rustfmt_toml_in_parent_directory() {
 
     let src_dir = path.join("src");
 
-    let mut command = Command::cargo_bin("rustdoc-prettier").unwrap();
+    let mut command = cargo_bin_cmd!("rustdoc-prettier");
     command.arg("main.rs");
     command.current_dir(&src_dir);
     command.assert().success();
@@ -28,7 +27,7 @@ fn rustfmt_toml_in_parent_directory() {
 
 #[test]
 fn rustfmt_toml_in_parent_directory_with_check() {
-    let mut command = Command::cargo_bin("rustdoc-prettier").unwrap();
+    let mut command = cargo_bin_cmd!("rustdoc-prettier");
     command.args(["main.rs", "--check"]);
     command.current_dir("fixtures/clippy_issue_14274/src");
     command.assert().failure().stderr(predicate::eq(

tests/z_race.rs

@@ -1,14 +1,10 @@
 use anyhow::Result;
-use assert_cmd::cargo::CommandCargoExt;
-use elaborate::std::{
-    fs::{create_dir_wc, write_wc},
-    process::CommandContext,
-};
+use assert_cmd::cargo::cargo_bin_cmd;
+use elaborate::std::fs::{create_dir_wc, write_wc};
 use std::{
     fs::remove_dir_all,
     io,
     path::{Path, PathBuf},
-    process::Command,
     sync::atomic::{AtomicBool, Ordering},
     thread,
 };
@@ -52,11 +48,10 @@ fn race() {
 
     for i in 0..N_ITERATIONS {
         dbg!(i);
-        let mut command = Command::cargo_bin("rustdoc-prettier").unwrap();
+        let mut command = cargo_bin_cmd!("rustdoc-prettier");
         command.arg("**/*.rs");
         command.current_dir(&tempdir);
-        let status = command.status_wc().unwrap();
-        assert!(status.success());
+        command.assert().success();
     }
 
     EXIT.store(true, Ordering::SeqCst);