Skip to content

Commit 9af864e

Browse files
epageepage
committed
refactor: Resolve deprecations
1 parent eafc743 commit 9af864e

File tree

273 files changed

+547
-547
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

273 files changed

+547
-547
lines changed

Diff for: ‎crates/cargo-test-support/src/compare.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ pub fn assert_ui() -> snapbox::Assert {
8888
subs.insert("[ROOTURL]", root_url).unwrap();
8989
snapbox::Assert::new()
9090
.action_env(snapbox::assert::DEFAULT_ACTION_ENV)
91-
.substitutions(subs)
91+
.redact_with(subs)
9292
}
9393

9494
/// Normalizes the output so that it can be compared against the expected value.

Diff for: ‎credential/cargo-credential/tests/examples.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ fn stdout_redirected() {
1515
.stdin(format!("{get_request}\n"))
1616
.arg("--cargo-plugin")
1717
.assert()
18-
.stdout_eq_(format!("{hello}\n{err_not_supported}\n").raw())
19-
.stderr_eq_("message on stderr should be sent to the parent process\n".raw())
18+
.stdout_eq(format!("{hello}\n{err_not_supported}\n").raw())
19+
.stderr_eq("message on stderr should be sent to the parent process\n".raw())
2020
.success();
2121
}
2222

@@ -39,8 +39,8 @@ fn file_provider() {
3939
.stdin(format!("{login_request}\n{get_request}\n"))
4040
.arg("--cargo-plugin")
4141
.assert()
42-
.stdout_eq_(format!("{hello}\n{login_response}\n{get_response}\n").raw())
43-
.stderr_eq_("".raw())
42+
.stdout_eq(format!("{hello}\n{login_response}\n{get_response}\n").raw())
43+
.stderr_eq("".raw())
4444
.success();
4545
std::fs::remove_dir_all(&dir).unwrap();
4646
}

Diff for: ‎tests/testsuite/cargo/help/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ fn case() {
88
.arg("--help")
99
.assert()
1010
.success()
11-
.stdout_eq_(file!["stdout.term.svg"])
12-
.stderr_eq_(str![""]);
11+
.stdout_eq(file!["stdout.term.svg"])
12+
.stderr_eq(str![""]);
1313
}

Diff for: ‎tests/testsuite/cargo/z_help/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ fn case() {
99
.args(["-Z", "help"])
1010
.assert()
1111
.success()
12-
.stdout_eq_(file!["stdout.term.svg"])
13-
.stderr_eq_(str![""]);
12+
.stdout_eq(file!["stdout.term.svg"])
13+
.stderr_eq(str![""]);
1414
}

Diff for: ‎tests/testsuite/cargo_add/add_basic/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ fn case() {
3030
.current_dir(cwd)
3131
.assert()
3232
.success()
33-
.stdout_eq_(str![""])
34-
.stderr_eq_(file!["stderr.term.svg"]);
33+
.stdout_eq(str![""])
34+
.stderr_eq(file!["stderr.term.svg"]);
3535

3636
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3737
}

Diff for: ‎tests/testsuite/cargo_add/add_multiple/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ fn case() {
3232
.current_dir(cwd)
3333
.assert()
3434
.success()
35-
.stdout_eq_(str![""])
36-
.stderr_eq_(file!["stderr.term.svg"]);
35+
.stdout_eq(str![""])
36+
.stderr_eq(file!["stderr.term.svg"]);
3737

3838
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3939
}

Diff for: ‎tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ fn case() {
2929
.current_dir(cwd)
3030
.assert()
3131
.success()
32-
.stdout_eq_(str![""])
33-
.stderr_eq_(file!["stderr.term.svg"]);
32+
.stdout_eq(str![""])
33+
.stderr_eq(file!["stderr.term.svg"]);
3434

3535
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3636
}

Diff for: ‎tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ fn case() {
1717
.current_dir(cwd)
1818
.assert()
1919
.failure()
20-
.stdout_eq_(str![""])
21-
.stderr_eq_(file!["stderr.term.svg"]);
20+
.stdout_eq(str![""])
21+
.stderr_eq(file!["stderr.term.svg"]);
2222

2323
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
2424
}

Diff for: ‎tests/testsuite/cargo_add/add_normalized_name_external/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ fn case() {
3535
.current_dir(cwd)
3636
.assert()
3737
.success()
38-
.stdout_eq_(str![""])
39-
.stderr_eq_(file!["stderr.term.svg"]);
38+
.stdout_eq(str![""])
39+
.stderr_eq(file!["stderr.term.svg"]);
4040

4141
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
4242
}

Diff for: ‎tests/testsuite/cargo_add/add_toolchain/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ fn case() {
1717
.current_dir(cwd)
1818
.assert()
1919
.failure()
20-
.stdout_eq_(str![""])
21-
.stderr_eq_(file!["stderr.term.svg"]);
20+
.stdout_eq(str![""])
21+
.stderr_eq(file!["stderr.term.svg"]);
2222

2323
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
2424
}

Diff for: ‎tests/testsuite/cargo_add/build/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ fn case() {
3232
.current_dir(cwd)
3333
.assert()
3434
.success()
35-
.stdout_eq_(str![""])
36-
.stderr_eq_(file!["stderr.term.svg"]);
35+
.stdout_eq(str![""])
36+
.stderr_eq(file!["stderr.term.svg"]);
3737

3838
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3939
}

Diff for: ‎tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ fn case() {
3232
.current_dir(cwd)
3333
.assert()
3434
.success()
35-
.stdout_eq_(str![""])
36-
.stderr_eq_(file!["stderr.term.svg"]);
35+
.stdout_eq(str![""])
36+
.stderr_eq(file!["stderr.term.svg"]);
3737

3838
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3939
}

Diff for: ‎tests/testsuite/cargo_add/change_rename_target/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ fn case() {
3232
.current_dir(cwd)
3333
.assert()
3434
.success()
35-
.stdout_eq_(str![""])
36-
.stderr_eq_(file!["stderr.term.svg"]);
35+
.stdout_eq(str![""])
36+
.stderr_eq(file!["stderr.term.svg"]);
3737

3838
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3939
}

Diff for: ‎tests/testsuite/cargo_add/cyclic_features/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ fn case() {
2424
.current_dir(cwd)
2525
.assert()
2626
.success()
27-
.stdout_eq_(str![""])
28-
.stderr_eq_(file!["stderr.term.svg"]);
27+
.stdout_eq(str![""])
28+
.stderr_eq(file!["stderr.term.svg"]);
2929

3030
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3131
}

Diff for: ‎tests/testsuite/cargo_add/default_features/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ fn case() {
3232
.current_dir(cwd)
3333
.assert()
3434
.success()
35-
.stdout_eq_(str![""])
36-
.stderr_eq_(file!["stderr.term.svg"]);
35+
.stdout_eq(str![""])
36+
.stderr_eq(file!["stderr.term.svg"]);
3737

3838
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3939
}

Diff for: ‎tests/testsuite/cargo_add/deprecated_default_features/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ fn case() {
3030
.current_dir(&cwd)
3131
.assert()
3232
.failure()
33-
.stdout_eq_(str![""])
34-
.stderr_eq_(file!["stderr.term.svg"]);
33+
.stdout_eq(str![""])
34+
.stderr_eq(file!["stderr.term.svg"]);
3535

3636
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3737
}

Diff for: ‎tests/testsuite/cargo_add/deprecated_section/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ fn case() {
3030
.current_dir(&cwd)
3131
.assert()
3232
.failure()
33-
.stdout_eq_(str![""])
34-
.stderr_eq_(file!["stderr.term.svg"]);
33+
.stdout_eq(str![""])
34+
.stderr_eq(file!["stderr.term.svg"]);
3535

3636
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3737
}

Diff for: ‎tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ fn case() {
1919
.current_dir(cwd)
2020
.assert()
2121
.success()
22-
.stdout_eq_(str![""])
23-
.stderr_eq_(file!["stderr.term.svg"]);
22+
.stdout_eq(str![""])
23+
.stderr_eq(file!["stderr.term.svg"]);
2424

2525
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
2626
}

Diff for: ‎tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ fn case() {
1919
.current_dir(cwd)
2020
.assert()
2121
.success()
22-
.stdout_eq_(str![""])
23-
.stderr_eq_(file!["stderr.term.svg"]);
22+
.stdout_eq(str![""])
23+
.stderr_eq(file!["stderr.term.svg"]);
2424

2525
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
2626
}

Diff for: ‎tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ fn case() {
1919
.current_dir(cwd)
2020
.assert()
2121
.success()
22-
.stdout_eq_(str![""])
23-
.stderr_eq_(file!["stderr.term.svg"]);
22+
.stdout_eq(str![""])
23+
.stderr_eq(file!["stderr.term.svg"]);
2424

2525
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
2626
}

Diff for: ‎tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ fn case() {
2020
.current_dir(cwd)
2121
.assert()
2222
.success()
23-
.stdout_eq_(str![""])
24-
.stderr_eq_(file!["stderr.term.svg"]);
23+
.stdout_eq(str![""])
24+
.stderr_eq(file!["stderr.term.svg"]);
2525

2626
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
2727
}

Diff for: ‎tests/testsuite/cargo_add/dev/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ fn case() {
3232
.current_dir(cwd)
3333
.assert()
3434
.success()
35-
.stdout_eq_(str![""])
36-
.stderr_eq_(file!["stderr.term.svg"]);
35+
.stdout_eq(str![""])
36+
.stderr_eq(file!["stderr.term.svg"]);
3737

3838
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3939
}

Diff for: ‎tests/testsuite/cargo_add/dev_build_conflict/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ fn case() {
3030
.current_dir(cwd)
3131
.assert()
3232
.code(1)
33-
.stdout_eq_(str![""])
34-
.stderr_eq_(file!["stderr.term.svg"]);
33+
.stdout_eq(str![""])
34+
.stderr_eq(file!["stderr.term.svg"]);
3535

3636
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3737
}

Diff for: ‎tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ fn case() {
3232
.current_dir(cwd)
3333
.assert()
3434
.success()
35-
.stdout_eq_(str![""])
36-
.stderr_eq_(file!["stderr.term.svg"]);
35+
.stdout_eq(str![""])
36+
.stderr_eq(file!["stderr.term.svg"]);
3737

3838
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3939
}

Diff for: ‎tests/testsuite/cargo_add/dry_run/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ fn case() {
3030
.current_dir(cwd)
3131
.assert()
3232
.success()
33-
.stdout_eq_(str![""])
34-
.stderr_eq_(file!["stderr.term.svg"]);
33+
.stdout_eq(str![""])
34+
.stderr_eq(file!["stderr.term.svg"]);
3535

3636
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3737
}

Diff for: ‎tests/testsuite/cargo_add/empty_dep_name/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ fn case() {
1818
.current_dir(cwd)
1919
.assert()
2020
.failure()
21-
.stdout_eq_(str![""])
22-
.stderr_eq_(file!["stderr.term.svg"]);
21+
.stdout_eq(str![""])
22+
.stderr_eq(file!["stderr.term.svg"]);
2323

2424
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
2525
}

Diff for: ‎tests/testsuite/cargo_add/features/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ fn case() {
2525
.current_dir(cwd)
2626
.assert()
2727
.success()
28-
.stdout_eq_(str![""])
29-
.stderr_eq_(file!["stderr.term.svg"]);
28+
.stdout_eq(str![""])
29+
.stderr_eq(file!["stderr.term.svg"]);
3030

3131
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3232
}

Diff for: ‎tests/testsuite/cargo_add/features_activated_over_limit/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ fn case() {
3232
.current_dir(cwd)
3333
.assert()
3434
.success()
35-
.stdout_eq_(str![""])
36-
.stderr_eq_(file!["stderr.term.svg"]);
35+
.stdout_eq(str![""])
36+
.stderr_eq(file!["stderr.term.svg"]);
3737

3838
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3939
}

Diff for: ‎tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ fn case() {
3232
.current_dir(cwd)
3333
.assert()
3434
.success()
35-
.stdout_eq_(str![""])
36-
.stderr_eq_(file!["stderr.term.svg"]);
35+
.stdout_eq(str![""])
36+
.stderr_eq(file!["stderr.term.svg"]);
3737

3838
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3939
}

Diff for: ‎tests/testsuite/cargo_add/features_empty/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ fn case() {
2525
.current_dir(cwd)
2626
.assert()
2727
.success()
28-
.stdout_eq_(str![""])
29-
.stderr_eq_(file!["stderr.term.svg"]);
28+
.stdout_eq(str![""])
29+
.stderr_eq(file!["stderr.term.svg"]);
3030

3131
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3232
}

Diff for: ‎tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ fn case() {
2525
.current_dir(cwd)
2626
.assert()
2727
.success()
28-
.stdout_eq_(str![""])
29-
.stderr_eq_(file!["stderr.term.svg"]);
28+
.stdout_eq(str![""])
29+
.stderr_eq(file!["stderr.term.svg"]);
3030

3131
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3232
}

Diff for: ‎tests/testsuite/cargo_add/features_preserve/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ fn case() {
2525
.current_dir(cwd)
2626
.assert()
2727
.success()
28-
.stdout_eq_(str![""])
29-
.stderr_eq_(file!["stderr.term.svg"]);
28+
.stdout_eq(str![""])
29+
.stderr_eq(file!["stderr.term.svg"]);
3030

3131
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3232
}

Diff for: ‎tests/testsuite/cargo_add/features_spaced_values/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ fn case() {
2525
.current_dir(cwd)
2626
.assert()
2727
.success()
28-
.stdout_eq_(str![""])
29-
.stderr_eq_(file!["stderr.term.svg"]);
28+
.stdout_eq(str![""])
29+
.stderr_eq(file!["stderr.term.svg"]);
3030

3131
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3232
}

Diff for: ‎tests/testsuite/cargo_add/features_unknown/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ fn case() {
2525
.current_dir(cwd)
2626
.assert()
2727
.code(101)
28-
.stdout_eq_(str![""])
29-
.stderr_eq_(file!["stderr.term.svg"]);
28+
.stdout_eq(str![""])
29+
.stderr_eq(file!["stderr.term.svg"]);
3030

3131
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3232
}

Diff for: ‎tests/testsuite/cargo_add/features_unknown_no_features/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ fn case() {
3030
.current_dir(cwd)
3131
.assert()
3232
.code(101)
33-
.stdout_eq_(str![""])
34-
.stderr_eq_(file!["stderr.term.svg"]);
33+
.stdout_eq(str![""])
34+
.stderr_eq(file!["stderr.term.svg"]);
3535

3636
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3737
}

0 commit comments

Comments
 (0)