refactor: Resolve deprecations

rust-lang · May 28, 2024 · 9af864e · 9af864e
1 parent eafc743
commit 9af864e
Show file tree

Hide file tree

Showing 273 changed files with 547 additions and 547 deletions.
diff --git a/crates/cargo-test-support/src/compare.rs b/crates/cargo-test-support/src/compare.rs
@@ -88,7 +88,7 @@ pub fn assert_ui() -> snapbox::Assert {
     subs.insert("[ROOTURL]", root_url).unwrap();
     snapbox::Assert::new()
         .action_env(snapbox::assert::DEFAULT_ACTION_ENV)
-        .substitutions(subs)
+        .redact_with(subs)
 }
 
 /// Normalizes the output so that it can be compared against the expected value.

diff --git a/credential/cargo-credential/tests/examples.rs b/credential/cargo-credential/tests/examples.rs
@@ -15,8 +15,8 @@ fn stdout_redirected() {
         .stdin(format!("{get_request}\n"))
         .arg("--cargo-plugin")
         .assert()
-        .stdout_eq_(format!("{hello}\n{err_not_supported}\n").raw())
-        .stderr_eq_("message on stderr should be sent to the parent process\n".raw())
+        .stdout_eq(format!("{hello}\n{err_not_supported}\n").raw())
+        .stderr_eq("message on stderr should be sent to the parent process\n".raw())
         .success();
 }
 
@@ -39,8 +39,8 @@ fn file_provider() {
         .stdin(format!("{login_request}\n{get_request}\n"))
         .arg("--cargo-plugin")
         .assert()
-        .stdout_eq_(format!("{hello}\n{login_response}\n{get_response}\n").raw())
-        .stderr_eq_("".raw())
+        .stdout_eq(format!("{hello}\n{login_response}\n{get_response}\n").raw())
+        .stderr_eq("".raw())
         .success();
     std::fs::remove_dir_all(&dir).unwrap();
 }
diff --git a/tests/testsuite/cargo/help/mod.rs b/tests/testsuite/cargo/help/mod.rs
@@ -8,6 +8,6 @@ fn case() {
         .arg("--help")
         .assert()
         .success()
-        .stdout_eq_(file!["stdout.term.svg"])
-        .stderr_eq_(str![""]);
+        .stdout_eq(file!["stdout.term.svg"])
+        .stderr_eq(str![""]);
 }
diff --git a/tests/testsuite/cargo/z_help/mod.rs b/tests/testsuite/cargo/z_help/mod.rs
@@ -9,6 +9,6 @@ fn case() {
         .args(["-Z", "help"])
         .assert()
         .success()
-        .stdout_eq_(file!["stdout.term.svg"])
-        .stderr_eq_(str![""]);
+        .stdout_eq(file!["stdout.term.svg"])
+        .stderr_eq(str![""]);
 }
diff --git a/tests/testsuite/cargo_add/add_basic/mod.rs b/tests/testsuite/cargo_add/add_basic/mod.rs
@@ -30,8 +30,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/add_multiple/mod.rs b/tests/testsuite/cargo_add/add_multiple/mod.rs
@@ -32,8 +32,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/mod.rs b/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/mod.rs
@@ -29,8 +29,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs b/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs
@@ -17,8 +17,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs b/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs
@@ -35,8 +35,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/add_toolchain/mod.rs b/tests/testsuite/cargo_add/add_toolchain/mod.rs
@@ -17,8 +17,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/build/mod.rs b/tests/testsuite/cargo_add/build/mod.rs
@@ -32,8 +32,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs b/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs
@@ -32,8 +32,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/change_rename_target/mod.rs b/tests/testsuite/cargo_add/change_rename_target/mod.rs
@@ -32,8 +32,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/cyclic_features/mod.rs b/tests/testsuite/cargo_add/cyclic_features/mod.rs
@@ -24,8 +24,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/default_features/mod.rs b/tests/testsuite/cargo_add/default_features/mod.rs
@@ -32,8 +32,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/deprecated_default_features/mod.rs b/tests/testsuite/cargo_add/deprecated_default_features/mod.rs
@@ -30,8 +30,8 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .failure()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/deprecated_section/mod.rs b/tests/testsuite/cargo_add/deprecated_section/mod.rs
@@ -30,8 +30,8 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .failure()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs
@@ -19,8 +19,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs
@@ -19,8 +19,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs
@@ -19,8 +19,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs
@@ -20,8 +20,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/dev/mod.rs b/tests/testsuite/cargo_add/dev/mod.rs
@@ -32,8 +32,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/dev_build_conflict/mod.rs b/tests/testsuite/cargo_add/dev_build_conflict/mod.rs
@@ -30,8 +30,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(1)
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs b/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs
@@ -32,8 +32,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/dry_run/mod.rs b/tests/testsuite/cargo_add/dry_run/mod.rs
@@ -30,8 +30,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/empty_dep_name/mod.rs b/tests/testsuite/cargo_add/empty_dep_name/mod.rs
@@ -18,8 +18,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/features/mod.rs b/tests/testsuite/cargo_add/features/mod.rs
@@ -25,8 +25,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs b/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs
@@ -32,8 +32,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs b/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs
@@ -32,8 +32,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/features_empty/mod.rs b/tests/testsuite/cargo_add/features_empty/mod.rs
@@ -25,8 +25,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs b/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs
@@ -25,8 +25,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/features_preserve/mod.rs b/tests/testsuite/cargo_add/features_preserve/mod.rs
@@ -25,8 +25,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/features_spaced_values/mod.rs b/tests/testsuite/cargo_add/features_spaced_values/mod.rs
@@ -25,8 +25,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/features_unknown/mod.rs b/tests/testsuite/cargo_add/features_unknown/mod.rs
@@ -25,8 +25,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs b/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs
@@ -30,8 +30,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_eq_(str![""])
-        .stderr_eq_(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }