refactor: Resolve snapbox deprecations

2024-07-05 01:19:13 +00:00 · 2024-05-24 12:16:45 -05:00 · 2024-05-24 12:16:45 -05:00 · 4a6f25c112
commit 4a6f25c112
parent 602f2f2e21
282 changed files with 633 additions and 625 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -91,7 +91,7 @@ sha1 = "0.10.6"
 sha2 = "0.10.8"
 shell-escape = "0.1.5"
 supports-hyperlinks = "3.0.0"
-snapbox = { version = "0.5.14", features = ["diff", "path", "term-svg"] }
+snapbox = { version = "0.5.14", features = ["diff", "dir", "term-svg"] }
 tar = { version = "0.4.40", default-features = false }
 tempfile = "3.10.1"
 thiserror = "1.0.59"
--- a/crates/cargo-test-support/src/compare.rs
+++ b/crates/cargo-test-support/src/compare.rs
@ -82,7 +82,7 @@ pub fn assert_ui() -> snapbox::Assert {
    let root_url = url::Url::from_file_path(&root).unwrap().to_string();
    let root = root.display().to_string();

-    let mut subs = snapbox::Substitutions::new();
+    let mut subs = snapbox::Redactions::new();
    subs.extend([
        (
            "[EXE]",
@ -93,7 +93,7 @@ pub fn assert_ui() -> snapbox::Assert {
    ])
    .unwrap();
    snapbox::Assert::new()
-        .action_env(snapbox::DEFAULT_ACTION_ENV)
+        .action_env(snapbox::assert::DEFAULT_ACTION_ENV)
        .substitutions(subs)
 }

--- a/crates/cargo-test-support/src/lib.rs
+++ b/crates/cargo-test-support/src/lib.rs
@ -40,8 +40,8 @@ macro_rules! t {
 }

 pub use snapbox::file;
-pub use snapbox::path::current_dir;
 pub use snapbox::str;
+pub use snapbox::utils::current_dir;

 #[track_caller]
 pub fn panic_error(what: &str, err: impl Into<anyhow::Error>) -> ! {
@ -315,7 +315,7 @@ impl Project {
    pub fn from_template(template_path: impl AsRef<std::path::Path>) -> Self {
        let root = paths::root();
        let project_root = root.join("case");
-        snapbox::path::copy_template(template_path.as_ref(), &project_root).unwrap();
+        snapbox::dir::copy_template(template_path.as_ref(), &project_root).unwrap();
        Self { root: project_root }
    }

--- a/crates/cargo-util-schemas/src/core/partial_version.rs
+++ b/crates/cargo-util-schemas/src/core/partial_version.rs
@ -186,6 +186,7 @@ enum ErrorKind {
 #[cfg(test)]
 mod test {
    use super::*;
+    use snapbox::prelude::*;
    use snapbox::str;

    #[test]
@ -202,7 +203,7 @@ mod test {
                Ok(result) => result.to_string(),
                Err(err) => format!("didn't pass: {err}"),
            };
-            snapbox::assert_eq(expected.clone(), actual);
+            snapbox::assert_data_eq!(actual, expected.clone().raw());
        }
    }

@ -241,7 +242,7 @@ mod test {
                Ok(result) => format!("didn't fail: {result:?}"),
                Err(err) => err.to_string(),
            };
-            snapbox::assert_eq(expected.clone(), actual);
+            snapbox::assert_data_eq!(actual, expected.clone().raw());
        }
    }
 }
--- a/crates/cargo-util-schemas/src/manifest/rust_version.rs
+++ b/crates/cargo-util-schemas/src/manifest/rust_version.rs
@ -106,6 +106,7 @@ enum RustVersionErrorKind {
 #[cfg(test)]
 mod test {
    use super::*;
+    use snapbox::prelude::*;
    use snapbox::str;

    #[test]
@ -212,7 +213,7 @@ mod test {
                Ok(result) => format!("didn't fail: {result:?}"),
                Err(err) => err.to_string(),
            };
-            snapbox::assert_eq(expected.clone(), actual);
+            snapbox::assert_data_eq!(actual, expected.clone().raw());
        }
    }
 }
--- a/crates/mdman/tests/compare.rs
+++ b/crates/mdman/tests/compare.rs
@ -22,7 +22,7 @@ fn run(name: &str) {
            name,
            format.extension(section)
        ));
-        snapbox::assert_eq(snapbox::Data::read_from(&expected_path, None), result);
+        snapbox::assert_data_eq!(result, snapbox::Data::read_from(&expected_path, None).raw());
    }
 }

--- a/crates/mdman/tests/invalid.rs
+++ b/crates/mdman/tests/invalid.rs
@ -3,15 +3,16 @@
 use std::path::PathBuf;

 use mdman::{Format, ManMap};
+use snapbox::prelude::*;

-fn run(name: &str, expected_error: &str) {
+fn run(name: &str, expected_error: impl IntoData) {
    let input = PathBuf::from(format!("tests/invalid/{}", name));
    match mdman::convert(&input, Format::Man, None, ManMap::new()) {
        Ok(_) => {
            panic!("expected {} to fail", name);
        }
        Err(e) => {
-            snapbox::assert_eq(expected_error, e.to_string());
+            snapbox::assert_data_eq!(e.to_string(), expected_error.raw());
        }
    }
 }
--- a/credential/cargo-credential/src/stdio.rs
+++ b/credential/cargo-credential/src/stdio.rs
@ -143,7 +143,7 @@ mod test {

    #[test]
    fn stdin() {
-        let tempdir = snapbox::path::PathFixture::mutable_temp().unwrap();
+        let tempdir = snapbox::dir::DirRoot::mutable_temp().unwrap();
        let file = tempdir.path().unwrap().join("stdin");
        let mut file = OpenOptions::new()
            .read(true)
--- a/credential/cargo-credential/tests/examples.rs
+++ b/credential/cargo-credential/tests/examples.rs
@ -1,6 +1,7 @@
 use std::path::Path;

 use snapbox::cmd::Command;
+use snapbox::prelude::*;

 #[test]
 fn stdout_redirected() {
@ -14,8 +15,8 @@ fn stdout_redirected() {
        .stdin(format!("{get_request}\n"))
        .arg("--cargo-plugin")
        .assert()
-        .stdout_eq(format!("{hello}\n{err_not_supported}\n"))
-        .stderr_eq("message on stderr should be sent to the parent process\n")
+        .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();
 }

@ -38,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"))
-        .stderr_eq("")
+        .stdout_eq_(format!("{hello}\n{login_response}\n{get_response}\n").raw())
+        .stderr_eq_("".raw())
        .success();
    std::fs::remove_dir_all(&dir).unwrap();
 }
--- a/src/cargo/core/features.rs
+++ b/src/cargo/core/features.rs
@ -733,10 +733,9 @@ macro_rules! unstable_cli_options {
                );
                let mut expected = vec![$(stringify!($element)),*];
                expected[2..].sort();
-                snapbox::assert_eq(
-                    format!("{:#?}", expected),
-                    format!("{:#?}", vec![$(stringify!($element)),*])
-                );
+                let expected = format!("{:#?}", expected);
+                let actual = format!("{:#?}", vec![$(stringify!($element)),*]);
+                snapbox::assert_data_eq!(actual, expected);
            }
        }
    }
--- a/src/cargo/util/toml/embedded.rs
+++ b/src/cargo/util/toml/embedded.rs
@ -261,6 +261,8 @@ fn split_source(input: &str) -> CargoResult<Source<'_>> {

 #[cfg(test)]
 mod test_expand {
+    use snapbox::str;
+
    use super::*;

    macro_rules! si {
@ -276,92 +278,95 @@ mod test_expand {

    #[test]
    fn test_default() {
-        snapbox::assert_eq(
-            r#"[[bin]]
-name = "test-"
-path = "/home/me/test.rs"
-
-[package]
-autobenches = false
-autobins = false
-autoexamples = false
-autotests = false
-build = false
-edition = "2021"
-name = "test-"
-
-[profile.release]
-strip = true
-
-[workspace]
-"#,
+        snapbox::assert_data_eq!(
            si!(r#"fn main() {}"#),
+            str![[r#"
+            [[bin]]
+            name = "test-"
+            path = "/home/me/test.rs"
+
+            [package]
+            autobenches = false
+            autobins = false
+            autoexamples = false
+            autotests = false
+            build = false
+            edition = "2021"
+            name = "test-"
+
+            [profile.release]
+            strip = true
+
+            [workspace]
+        "#]]
        );
    }

    #[test]
    fn test_dependencies() {
-        snapbox::assert_matches(
-            r#"[[bin]]
-name = "test-"
-path = [..]
-
-[dependencies]
-time = "0.1.25"
-
-[package]
-autobenches = false
-autobins = false
-autoexamples = false
-autotests = false
-build = false
-edition = "2021"
-name = "test-"
-
-[profile.release]
-strip = true
-
-[workspace]
-"#,
+        snapbox::assert_data_eq!(
            si!(r#"---cargo
 [dependencies]
 time="0.1.25"
 ---
 fn main() {}
 "#),
+            str![[r#"
+                [[bin]]
+                name = "test-"
+                path = [..]
+
+                [dependencies]
+                time = "0.1.25"
+
+                [package]
+                autobenches = false
+                autobins = false
+                autoexamples = false
+                autotests = false
+                build = false
+                edition = "2021"
+                name = "test-"
+
+                [profile.release]
+                strip = true
+
+                [workspace]
+            "#]]
        );
    }

    #[test]
    fn test_no_infostring() {
-        snapbox::assert_matches(
-            r#"[[bin]]
-name = "test-"
-path = [..]
-
-[dependencies]
-time = "0.1.25"
-
-[package]
-autobenches = false
-autobins = false
-autoexamples = false
-autotests = false
-build = false
-edition = "2021"
-name = "test-"
-
-[profile.release]
-strip = true
-
-[workspace]
-"#,
+        snapbox::assert_data_eq!(
            si!(r#"---
 [dependencies]
 time="0.1.25"
 ---
 fn main() {}
 "#),
+            str![[r#"
+                [[bin]]
+                name = "test-"
+                path = [..]
+
+                [dependencies]
+                time = "0.1.25"
+
+                [package]
+                autobenches = false
+                autobins = false
+                autoexamples = false
+                autotests = false
+                build = false
+                edition = "2021"
+                name = "test-"
+
+                [profile.release]
+                strip = true
+
+                [workspace]
+            "#]]
        );
    }
 }
--- 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_matches(file!["stdout.term.svg"])
-        .stderr_matches(str![""]);
+        .stdout_eq_(file!["stdout.term.svg"])
+        .stderr_eq_(str![""]);
 }
--- 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_matches(file!["stdout.term.svg"])
-        .stderr_matches(str![""]);
+        .stdout_eq_(file!["stdout.term.svg"])
+        .stderr_eq_(str![""]);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- 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_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/git/mod.rs
+++ b/tests/testsuite/cargo_add/git/mod.rs
@ -28,8 +28,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/git_branch/mod.rs
+++ b/tests/testsuite/cargo_add/git_branch/mod.rs
@ -31,8 +31,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs
+++ b/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs
@ -34,8 +34,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/git_dev/mod.rs
+++ b/tests/testsuite/cargo_add/git_dev/mod.rs
@ -28,8 +28,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/git_inferred_name/mod.rs
+++ b/tests/testsuite/cargo_add/git_inferred_name/mod.rs
@ -28,8 +28,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs
+++ b/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs
@ -68,8 +68,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/git_multiple_names/mod.rs
+++ b/tests/testsuite/cargo_add/git_multiple_names/mod.rs
@ -46,8 +46,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs
+++ b/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs
@ -57,8 +57,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/git_normalized_name/mod.rs
+++ b/tests/testsuite/cargo_add/git_normalized_name/mod.rs
@ -28,8 +28,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .failure() // Fuzzy searching for paths isn't supported at this time
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/git_registry/mod.rs
+++ b/tests/testsuite/cargo_add/git_registry/mod.rs
@ -47,8 +47,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .failure()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/git_rev/mod.rs
+++ b/tests/testsuite/cargo_add/git_rev/mod.rs
@ -30,8 +30,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/git_tag/mod.rs
+++ b/tests/testsuite/cargo_add/git_tag/mod.rs
@ -30,8 +30,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/help/mod.rs
+++ b/tests/testsuite/cargo_add/help/mod.rs
@ -9,6 +9,6 @@ fn case() {
        .arg("--help")
        .assert()
        .success()
-        .stdout_matches(file!["stdout.term.svg"])
-        .stderr_matches(str![""]);
+        .stdout_eq_(file!["stdout.term.svg"])
+        .stderr_eq_(str![""]);
 }
--- a/tests/testsuite/cargo_add/infer_prerelease/mod.rs
+++ b/tests/testsuite/cargo_add/infer_prerelease/mod.rs
@ -20,8 +20,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/invalid_arg/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_arg/mod.rs
@ -30,8 +30,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .code(1)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/invalid_git_name/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_git_name/mod.rs
@ -28,8 +28,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs
@ -17,8 +17,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .failure()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs
@ -17,8 +17,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .failure()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs
@ -17,8 +17,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .failure()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/invalid_manifest/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_manifest/mod.rs
@ -30,8 +30,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/invalid_name_external/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_name_external/mod.rs
@ -19,8 +19,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/invalid_path/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_path/mod.rs
@ -19,8 +19,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/invalid_path_name/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_path_name/mod.rs
@ -31,8 +31,8 @@ fn case() {
        .current_dir(&cwd)
        .assert()
        .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/invalid_path_self/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_path_self/mod.rs
@ -19,8 +19,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/invalid_target_empty/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_target_empty/mod.rs
@ -30,8 +30,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .code(1)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/invalid_vers/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_vers/mod.rs
@ -30,8 +30,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/list_features/mod.rs
+++ b/tests/testsuite/cargo_add/list_features/mod.rs
@ -25,8 +25,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/list_features_path/mod.rs
+++ b/tests/testsuite/cargo_add/list_features_path/mod.rs
@ -36,8 +36,8 @@ fn case() {
        .current_dir(&cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs
+++ b/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs
@ -41,8 +41,8 @@ fn case() {
        .current_dir(&cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/locked_changed/mod.rs
+++ b/tests/testsuite/cargo_add/locked_changed/mod.rs
@ -30,8 +30,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .failure()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/locked_unchanged/mod.rs
+++ b/tests/testsuite/cargo_add/locked_unchanged/mod.rs
@ -30,8 +30,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/lockfile_updated/mod.rs
+++ b/tests/testsuite/cargo_add/lockfile_updated/mod.rs
@ -32,8 +32,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/manifest_path_package/mod.rs
+++ b/tests/testsuite/cargo_add/manifest_path_package/mod.rs
@ -37,8 +37,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/merge_activated_features/mod.rs
+++ b/tests/testsuite/cargo_add/merge_activated_features/mod.rs
@ -17,8 +17,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs
+++ b/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs
@ -36,8 +36,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs
+++ b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs
@ -32,8 +32,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/namever/mod.rs
+++ b/tests/testsuite/cargo_add/namever/mod.rs
@ -32,8 +32,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/no_args/mod.rs
+++ b/tests/testsuite/cargo_add/no_args/mod.rs
@ -18,8 +18,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .code(1)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/no_default_features/mod.rs
+++ b/tests/testsuite/cargo_add/no_default_features/mod.rs
@ -32,8 +32,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/no_optional/mod.rs
+++ b/tests/testsuite/cargo_add/no_optional/mod.rs
@ -20,8 +20,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/no_public/mod.rs
+++ b/tests/testsuite/cargo_add/no_public/mod.rs
@ -20,8 +20,8 @@ fn case() {
        .masquerade_as_nightly_cargo(&["public-dependency"])
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/offline_empty_cache/mod.rs
+++ b/tests/testsuite/cargo_add/offline_empty_cache/mod.rs
@ -30,8 +30,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/optional/mod.rs
+++ b/tests/testsuite/cargo_add/optional/mod.rs
@ -20,8 +20,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/overwrite_default_features/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_default_features/mod.rs
@ -32,8 +32,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs
@ -32,8 +32,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/overwrite_features/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_features/mod.rs
@ -25,8 +25,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs
@ -31,8 +31,8 @@ fn case() {
        .current_dir(&cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs
@ -19,8 +19,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs
@ -19,8 +19,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs
@ -19,8 +19,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs
@ -38,8 +38,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs
@ -26,8 +26,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs
@ -26,8 +26,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs
@ -32,8 +32,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/mod.rs
@ -32,8 +32,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs
@ -20,8 +20,8 @@ fn case() {
        .current_dir(cwd)
        .assert()
        .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq_(str![""])
+        .stderr_eq_(file!["stderr.term.svg"]);

    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
--- a/Show More
+++ b/Show More