Skip to content

Commit 3fb23c9

Browse files
technicalpicklestechnicalpickles
committed
Use fully qualified path for cargo_bin! macro
The cargo_bin function is deprecated, so we can't import it. Instead, use the fully qualified macro path: assert_cmd::cargo::cargo_bin! This avoids the deprecation warning while still using the recommended macro.
1 parent 342b704 commit 3fb23c9

18 files changed

+64
-82
lines changed

‎tests/add_constant_dependencies.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use assert_cmd::cargo::cargo_bin;
21
use assert_cmd::Command;
32
use predicates::prelude::*;
43
use pretty_assertions::assert_eq;
@@ -10,7 +9,7 @@ mod common;
109
#[test]
1110
#[serial]
1211
fn test_add_constant_dependencies() -> anyhow::Result<()> {
13-
Command::new(cargo_bin!("pks"))
12+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
1413
.arg("--project-root")
1514
.arg("tests/fixtures/app_with_missing_dependencies")
1615
.arg("update-dependencies-for-constant")
@@ -44,7 +43,7 @@ fn test_add_constant_dependencies() -> anyhow::Result<()> {
4443
#[test]
4544
#[serial]
4645
fn test_add_constant_dependencies_no_dependencies() -> anyhow::Result<()> {
47-
Command::new(cargo_bin!("pks"))
46+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
4847
.arg("--project-root")
4948
.arg("tests/fixtures/app_with_missing_dependencies")
5049
.arg("update-dependencies-for-constant")

‎tests/add_dependency_test.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use assert_cmd::cargo::cargo_bin;
21
use assert_cmd::Command;
32
use predicates::prelude::*;
43
use pretty_assertions::assert_eq;
@@ -10,7 +9,7 @@ mod common;
109
#[test]
1110
#[serial]
1211
fn test_add_dependency() -> Result<(), Box<dyn Error>> {
13-
Command::new(cargo_bin!("pks"))
12+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
1413
.arg("--project-root")
1514
.arg("tests/fixtures/app_with_missing_dependency")
1615
.arg("add-dependency")
@@ -42,7 +41,7 @@ fn test_add_dependency() -> Result<(), Box<dyn Error>> {
4241
#[test]
4342
#[serial]
4443
fn test_add_dependency_creating_cycle() -> Result<(), Box<dyn Error>> {
45-
Command::new(cargo_bin!("pks"))
44+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
4645
.arg("--project-root")
4746
.arg("tests/fixtures/app_with_missing_dependency")
4847
.arg("add-dependency")
@@ -81,7 +80,7 @@ fn test_add_dependency_creating_cycle() -> Result<(), Box<dyn Error>> {
8180

8281
#[test]
8382
fn test_add_dependency_unnecessarily() -> Result<(), Box<dyn Error>> {
84-
Command::new(cargo_bin!("pks"))
83+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
8584
.arg("--project-root")
8685
.arg("tests/fixtures/app_with_missing_dependency")
8786
.arg("add-dependency")

‎tests/check_test.rs‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use assert_cmd::cargo::cargo_bin;
21
use assert_cmd::Command;
32
use predicates::prelude::*;
43
use std::{error::Error, fs};
@@ -12,7 +11,7 @@ pub fn stripped_output(output: Vec<u8>) -> String {
1211
#[test]
1312
fn test_check_with_privacy_dependency_error_template_overrides(
1413
) -> Result<(), Box<dyn Error>> {
15-
let output = Command::new(cargo_bin!("pks"))
14+
let output = Command::new(assert_cmd::cargo::cargo_bin!("pks"))
1615
.arg("--project-root")
1716
.arg("tests/fixtures/privacy_violation_overrides")
1817
.arg("--debug")
@@ -34,7 +33,7 @@ fn test_check_with_privacy_dependency_error_template_overrides(
3433
}
3534
#[test]
3635
fn test_check() -> Result<(), Box<dyn Error>> {
37-
let output = Command::new(cargo_bin!("pks"))
36+
let output = Command::new(assert_cmd::cargo::cargo_bin!("pks"))
3837
.arg("--project-root")
3938
.arg("tests/fixtures/simple_app")
4039
.arg("--debug")
@@ -57,7 +56,7 @@ fn test_check() -> Result<(), Box<dyn Error>> {
5756

5857
#[test]
5958
fn test_check_enforce_privacy_disabled() -> Result<(), Box<dyn Error>> {
60-
let output = Command::new(cargo_bin!("pks"))
59+
let output = Command::new(assert_cmd::cargo::cargo_bin!("pks"))
6160
.arg("--project-root")
6261
.arg("tests/fixtures/simple_app")
6362
.arg("--debug")
@@ -80,7 +79,7 @@ fn test_check_enforce_privacy_disabled() -> Result<(), Box<dyn Error>> {
8079

8180
#[test]
8281
fn test_check_enforce_dependency_disabled() -> Result<(), Box<dyn Error>> {
83-
let output = Command::new(cargo_bin!("pks"))
82+
let output = Command::new(assert_cmd::cargo::cargo_bin!("pks"))
8483
.arg("--project-root")
8584
.arg("tests/fixtures/simple_app")
8685
.arg("--debug")
@@ -103,7 +102,7 @@ fn test_check_enforce_dependency_disabled() -> Result<(), Box<dyn Error>> {
103102

104103
#[test]
105104
fn test_check_with_single_file() -> Result<(), Box<dyn Error>> {
106-
let output = Command::new(cargo_bin!("pks"))
105+
let output = Command::new(assert_cmd::cargo::cargo_bin!("pks"))
107106
.arg("--project-root")
108107
.arg("tests/fixtures/simple_app")
109108
.arg("--debug")
@@ -128,7 +127,7 @@ fn test_check_with_single_file() -> Result<(), Box<dyn Error>> {
128127
#[test]
129128
fn test_check_with_single_file_experimental_parser(
130129
) -> Result<(), Box<dyn Error>> {
131-
let output = Command::new(cargo_bin!("pks"))
130+
let output = Command::new(assert_cmd::cargo::cargo_bin!("pks"))
132131
.arg("--project-root")
133132
.arg("tests/fixtures/simple_app")
134133
.arg("--debug")
@@ -153,7 +152,7 @@ fn test_check_with_single_file_experimental_parser(
153152

154153
#[test]
155154
fn test_check_with_package_todo_file() -> Result<(), Box<dyn Error>> {
156-
Command::new(cargo_bin!("pks"))
155+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
157156
.arg("--project-root")
158157
.arg("tests/fixtures/contains_package_todo")
159158
.arg("--debug")
@@ -169,7 +168,7 @@ fn test_check_with_package_todo_file() -> Result<(), Box<dyn Error>> {
169168

170169
#[test]
171170
fn test_check_with_package_todo_file_csv() -> Result<(), Box<dyn Error>> {
172-
Command::new(cargo_bin!("pks"))
171+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
173172
.arg("--project-root")
174173
.arg("tests/fixtures/contains_package_todo")
175174
.arg("--debug")
@@ -189,7 +188,7 @@ fn test_check_with_package_todo_file_csv() -> Result<(), Box<dyn Error>> {
189188
#[test]
190189
fn test_check_with_package_todo_file_ignoring_recorded_violations(
191190
) -> Result<(), Box<dyn Error>> {
192-
let output = Command::new(cargo_bin!("pks"))
191+
let output = Command::new(assert_cmd::cargo::cargo_bin!("pks"))
193192
.arg("--project-root")
194193
.arg("tests/fixtures/contains_package_todo")
195194
.arg("--debug")
@@ -213,7 +212,7 @@ fn test_check_with_package_todo_file_ignoring_recorded_violations(
213212

214213
#[test]
215214
fn test_check_with_experimental_parser() -> Result<(), Box<dyn Error>> {
216-
let output = Command::new(cargo_bin!("pks"))
215+
let output = Command::new(assert_cmd::cargo::cargo_bin!("pks"))
217216
.arg("--project-root")
218217
.arg("tests/fixtures/simple_app")
219218
.arg("--experimental-parser")
@@ -237,7 +236,7 @@ fn test_check_with_experimental_parser() -> Result<(), Box<dyn Error>> {
237236

238237
#[test]
239238
fn test_check_with_stale_violations() -> Result<(), Box<dyn Error>> {
240-
Command::new(cargo_bin!("pks"))
239+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
241240
.arg("--project-root")
242241
.arg("tests/fixtures/contains_stale_violations")
243242
.arg("check")
@@ -254,7 +253,7 @@ fn test_check_with_stale_violations() -> Result<(), Box<dyn Error>> {
254253
#[test]
255254
fn test_check_with_stale_violations_when_file_no_longer_exists(
256255
) -> Result<(), Box<dyn Error>> {
257-
Command::new(cargo_bin!("pks"))
256+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
258257
.arg("--project-root")
259258
.arg("tests/fixtures/contains_stale_violations_no_file")
260259
.arg("check")
@@ -270,7 +269,7 @@ fn test_check_with_stale_violations_when_file_no_longer_exists(
270269

271270
#[test]
272271
fn test_check_with_relationship_violations() -> Result<(), Box<dyn Error>> {
273-
Command::new(cargo_bin!("pks"))
272+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
274273
.arg("--project-root")
275274
.arg("tests/fixtures/app_with_rails_relationships")
276275
.arg("check")
@@ -286,7 +285,7 @@ fn test_check_with_relationship_violations() -> Result<(), Box<dyn Error>> {
286285

287286
#[test]
288287
fn test_check_without_stale_violations() -> Result<(), Box<dyn Error>> {
289-
Command::new(cargo_bin!("pks"))
288+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
290289
.arg("--project-root")
291290
.arg("tests/fixtures/contains_package_todo")
292291
.arg("check")
@@ -305,7 +304,7 @@ fn test_check_without_stale_violations() -> Result<(), Box<dyn Error>> {
305304

306305
#[test]
307306
fn test_check_with_strict_mode() -> Result<(), Box<dyn Error>> {
308-
Command::new(cargo_bin!("pks"))
307+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
309308
.arg("--project-root")
310309
.arg("tests/fixtures/uses_strict_mode")
311310
.arg("check")
@@ -324,7 +323,7 @@ fn test_check_with_strict_mode() -> Result<(), Box<dyn Error>> {
324323

325324
#[test]
326325
fn test_check_with_strict_mode_output_csv() -> Result<(), Box<dyn Error>> {
327-
Command::new(cargo_bin!("pks"))
326+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
328327
.arg("--project-root")
329328
.arg("tests/fixtures/uses_strict_mode")
330329
.arg("check")
@@ -348,7 +347,7 @@ fn test_check_contents() -> Result<(), Box<dyn Error>> {
348347
let foo_rb_contents =
349348
fs::read_to_string(format!("{}/{}", project_root, relative_path))?;
350349

351-
let output = Command::new(cargo_bin!("pks"))
350+
let output = Command::new(assert_cmd::cargo::cargo_bin!("pks"))
352351
.arg("--project-root")
353352
.arg(project_root)
354353
.arg("--debug")
@@ -379,7 +378,7 @@ fn test_check_contents_ignoring_recorded_violations(
379378
let foo_rb_contents =
380379
fs::read_to_string(format!("{}/{}", project_root, relative_path))?;
381380

382-
let output = Command::new(cargo_bin!("pks"))
381+
let output = Command::new(assert_cmd::cargo::cargo_bin!("pks"))
383382
.arg("--project-root")
384383
.arg(project_root)
385384
.arg("--debug")

‎tests/check_unused_dependencies.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
use assert_cmd::cargo::cargo_bin;
21
use assert_cmd::prelude::*;
32
use predicates::prelude::*;
43
use std::{error::Error, fs, process::Command};
54
mod common;
65

76
fn assert_check_unused_dependencies(cmd: &str) -> Result<(), Box<dyn Error>> {
8-
Command::new(cargo_bin!("pks"))
7+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
98
.arg("--project-root")
109
.arg("tests/fixtures/app_with_dependency_cycles")
1110
.arg("--debug")
@@ -52,7 +51,7 @@ fn assert_auto_correct_unused_dependencies(
5251
let foo_package_yml = fs::read_to_string("tests/fixtures/app_with_unnecessary_dependencies/packs/foo/package.yml").unwrap();
5352
assert_eq!(foo_package_yml, expected_before_autocorrect);
5453

55-
Command::new(cargo_bin!("pks"))
54+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
5655
.arg("--project-root")
5756
.arg("tests/fixtures/app_with_unnecessary_dependencies")
5857
.arg("--debug")
@@ -95,7 +94,7 @@ fn test_auto_correct_unnecessary_dependencies() -> Result<(), Box<dyn Error>> {
9594
#[test]
9695
fn test_check_unnecessary_dependencies_no_issue() -> Result<(), Box<dyn Error>>
9796
{
98-
Command::new(cargo_bin!("pks"))
97+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
9998
.arg("--project-root")
10099
.arg("tests/fixtures/simple_app")
101100
.arg("--debug")

‎tests/corrupt_todo_test.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
use assert_cmd::cargo::cargo_bin;
21
use assert_cmd::Command;
32
use predicates::prelude::*;
43
mod common;
54

65
#[test]
76
fn test_check_with_corrupt_todo() -> anyhow::Result<()> {
8-
Command::new(cargo_bin!("pks"))
7+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
98
.arg("--project-root")
109
.arg("tests/fixtures/contains_corrupt_todo")
1110
.arg("--debug")

‎tests/create_test.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use assert_cmd::cargo::cargo_bin;
21
use assert_cmd::Command;
32
use predicates::prelude::*;
43
use pretty_assertions::assert_eq;
@@ -10,7 +9,7 @@ mod common;
109
fn test_create() -> Result<(), Box<dyn Error>> {
1110
common::delete_foobar();
1211

13-
Command::new(cargo_bin!("pks"))
12+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
1413
.arg("--project-root")
1514
.arg("tests/fixtures/simple_app")
1615
.arg("create")
@@ -77,7 +76,7 @@ fn test_create_with_readme_template_default_path() -> Result<(), Box<dyn Error>>
7776
"This is a test custom README template",
7877
)?;
7978

80-
Command::new(cargo_bin!("pks"))
79+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
8180
.arg("--project-root")
8281
.arg("tests/fixtures/simple_packs_first_app")
8382
.arg("create")
@@ -107,7 +106,7 @@ fn test_create_with_readme_template_custom_path() -> Result<(), Box<dyn Error>>
107106
{
108107
common::delete_foobar_app_with_custom_readme();
109108

110-
Command::new(cargo_bin!("pks"))
109+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
111110
.arg("--project-root")
112111
.arg("tests/fixtures/app_with_custom_readme")
113112
.arg("create")
@@ -132,7 +131,7 @@ fn test_create_with_readme_template_custom_path() -> Result<(), Box<dyn Error>>
132131

133132
#[test]
134133
fn test_create_already_exists() -> Result<(), Box<dyn Error>> {
135-
Command::new(cargo_bin!("pks"))
134+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
136135
.arg("--project-root")
137136
.arg("tests/fixtures/simple_packs_first_app")
138137
.arg("create")

‎tests/delete_cache_test.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use assert_cmd::cargo::cargo_bin;
21
use assert_cmd::prelude::*;
32
use std::{error::Error, fs, path::PathBuf, process::Command};
43
mod common;
@@ -35,7 +34,7 @@ fn test_delete_cache() -> Result<(), Box<dyn Error>> {
3534

3635
assert!(!is_tmp_cache_packwerk_empty().unwrap());
3736

38-
Command::new(cargo_bin!("pks"))
37+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
3938
.arg("--debug")
4039
.arg("--project-root")
4140
.arg("tests/fixtures/simple_app")

‎tests/dependencies_test.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use assert_cmd::cargo::cargo_bin;
21
use assert_cmd::prelude::*;
32
use predicates::prelude::*;
43
use std::{error::Error, process::Command};
@@ -8,7 +7,7 @@ mod common;
87
#[test]
98
fn test_list_pack_dependencies_with_explicit_dependencies(
109
) -> Result<(), Box<dyn Error>> {
11-
Command::new(cargo_bin!("pks"))
10+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
1211
.arg("--project-root")
1312
.arg("tests/fixtures/simple_app")
1413
.arg("--debug")
@@ -26,7 +25,7 @@ fn test_list_pack_dependencies_with_explicit_dependencies(
2625
#[test]
2726
fn list_pack_dependencies_with_implicit_dependencies(
2827
) -> Result<(), Box<dyn Error>> {
29-
Command::new(cargo_bin!("pks"))
28+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
3029
.arg("--project-root")
3130
.arg("tests/fixtures/contains_package_todo")
3231
.arg("--debug")

‎tests/enforcement_globs.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use assert_cmd::cargo::cargo_bin;
21
use std::error::Error;
32

43
use assert_cmd::Command;
@@ -7,7 +6,7 @@ mod common;
76

87
#[test]
98
fn test_check() -> Result<(), Box<dyn Error>> {
10-
Command::new(cargo_bin!("pks"))
9+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
1110
.arg("--project-root")
1211
.arg("tests/fixtures/simple_app_with_enforcement_globs")
1312
.arg("--debug")

‎tests/expose_monkey_patches_test.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use assert_cmd::cargo::cargo_bin;
21
use assert_cmd::prelude::*;
32
use predicates::prelude::*;
43
use std::{error::Error, process::Command};
@@ -11,7 +10,7 @@ fn test_expose_monkey_patches() -> Result<(), Box<dyn Error>> {
1110
let expected_message_portion = String::from(
1211
"The following is a list of constants that are redefined by your app.",
1312
);
14-
Command::new(cargo_bin!("pks"))
13+
Command::new(assert_cmd::cargo::cargo_bin!("pks"))
1514
.arg("--project-root")
1615
.arg("tests/fixtures/app_with_monkey_patches")
1716
.arg("--experimental-parser")

0 commit comments

Comments
 (0)