diff --git a/Cargo.lock b/Cargo.lock
index 64dca07aa02..dcb4f31e1b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -344,7 +344,7 @@ dependencies = [
 
 [[package]]
 name = "cargo-credential"
-version = "0.4.5"
+version = "0.4.6"
 dependencies = [
  "anyhow",
  "libc",
@@ -3208,9 +3208,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "snapbox"
-version = "0.5.9"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ac441e1ecf678f68423d47f376d53fabce1afba92c8f68e31508eb27df8562a"
+checksum = "9ad8c7be18cc9ec7f4d7948ad6b9df0e04fc649663e3c0ed59f304ed17ca69e9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -3229,9 +3229,9 @@ dependencies = [
 
 [[package]]
 name = "snapbox-macros"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1c4b838b05d15ab22754068cb73500b2f3b07bf09d310e15b27f88160f1de40"
+checksum = "b1f4c14672714436c09254801c934b203196a51182a5107fb76591c7cc56424d"
 dependencies = [
  "anstream",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 3ce3a6701f9..c429c94bd65 100644
--- 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.9", features = ["diff", "path", "term-svg"] }
+snapbox = { version = "0.6.5", features = ["diff", "dir", "term-svg"] }
 tar = { version = "0.4.40", default-features = false }
 tempfile = "3.10.1"
 thiserror = "1.0.59"
diff --git a/crates/cargo-test-support/src/compare.rs b/crates/cargo-test-support/src/compare.rs
index 62559747d47..92745bb8690 100644
--- a/crates/cargo-test-support/src/compare.rs
+++ b/crates/cargo-test-support/src/compare.rs
@@ -80,21 +80,15 @@ pub fn assert_ui() -> snapbox::Assert {
     // Use `from_file_path` instead of `from_dir_path` so the trailing slash is
     // put in the users output, rather than hidden in the variable
     let root_url = url::Url::from_file_path(&root).unwrap().to_string();
-    let root = root.display().to_string();
 
-    let mut subs = snapbox::Substitutions::new();
-    subs.extend([
-        (
-            "[EXE]",
-            std::borrow::Cow::Borrowed(std::env::consts::EXE_SUFFIX),
-        ),
-        ("[ROOT]", std::borrow::Cow::Owned(root)),
-        ("[ROOTURL]", std::borrow::Cow::Owned(root_url)),
-    ])
-    .unwrap();
+    let mut subs = snapbox::Redactions::new();
+    subs.extend([("[EXE]", std::env::consts::EXE_SUFFIX)])
+        .unwrap();
+    subs.insert("[ROOT]", root).unwrap();
+    subs.insert("[ROOTURL]", root_url).unwrap();
     snapbox::Assert::new()
-        .action_env(snapbox::DEFAULT_ACTION_ENV)
-        .substitutions(subs)
+        .action_env(snapbox::assert::DEFAULT_ACTION_ENV)
+        .redact_with(subs)
 }
 
 /// Normalizes the output so that it can be compared against the expected value.
diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs
index e35defb667d..48391b400a8 100644
--- 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 }
     }
 
diff --git a/crates/cargo-util-schemas/src/core/partial_version.rs b/crates/cargo-util-schemas/src/core/partial_version.rs
index 5057d6046e1..00252f56aa0 100644
--- 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());
         }
     }
 }
diff --git a/crates/cargo-util-schemas/src/manifest/rust_version.rs b/crates/cargo-util-schemas/src/manifest/rust_version.rs
index 5c40097737f..7afcf92bd80 100644
--- 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());
         }
     }
 }
diff --git a/crates/mdman/tests/compare.rs b/crates/mdman/tests/compare.rs
index 661afcd9517..b20366ddc46 100644
--- 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());
     }
 }
 
diff --git a/crates/mdman/tests/invalid.rs b/crates/mdman/tests/invalid.rs
index b8be1ed24c3..46f83df5152 100644
--- 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());
         }
     }
 }
diff --git a/credential/cargo-credential/Cargo.toml b/credential/cargo-credential/Cargo.toml
index 4ed0d325352..63fd8235992 100644
--- a/credential/cargo-credential/Cargo.toml
+++ b/credential/cargo-credential/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-credential"
-version = "0.4.5"
+version = "0.4.6"
 rust-version.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/credential/cargo-credential/src/stdio.rs b/credential/cargo-credential/src/stdio.rs
index 25435056f8a..5aa2e4e391c 100644
--- 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)
diff --git a/credential/cargo-credential/tests/examples.rs b/credential/cargo-credential/tests/examples.rs
index 9c2604d1c0f..6844642baef 100644
--- 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();
 }
diff --git a/src/cargo/core/features.rs b/src/cargo/core/features.rs
index 91be88c713f..56a65ecef08 100644
--- 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);
             }
         }
     }
diff --git a/src/cargo/util/toml/embedded.rs b/src/cargo/util/toml/embedded.rs
index ed7a2849f7e..618ff0036f5 100644
--- 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,8 +278,10 @@ mod test_expand {
 
     #[test]
     fn test_default() {
-        snapbox::assert_eq(
-            r#"[[bin]]
+        snapbox::assert_data_eq!(
+            si!(r#"fn main() {}"#),
+            str![[r#"
+[[bin]]
 name = "test-"
 path = "/home/me/test.rs"
 
@@ -294,15 +298,22 @@ name = "test-"
 strip = true
 
 [workspace]
-"#,
-            si!(r#"fn main() {}"#),
+
+"#]]
         );
     }
 
     #[test]
     fn test_dependencies() {
-        snapbox::assert_matches(
-            r#"[[bin]]
+        snapbox::assert_data_eq!(
+            si!(r#"---cargo
+[dependencies]
+time="0.1.25"
+---
+fn main() {}
+"#),
+            str![[r#"
+[[bin]]
 name = "test-"
 path = [..]
 
@@ -322,20 +333,22 @@ name = "test-"
 strip = true
 
 [workspace]
-"#,
-            si!(r#"---cargo
-[dependencies]
-time="0.1.25"
----
-fn main() {}
-"#),
+
+"#]]
         );
     }
 
     #[test]
     fn test_no_infostring() {
-        snapbox::assert_matches(
-            r#"[[bin]]
+        snapbox::assert_data_eq!(
+            si!(r#"---
+[dependencies]
+time="0.1.25"
+---
+fn main() {}
+"#),
+            str![[r#"
+[[bin]]
 name = "test-"
 path = [..]
 
@@ -355,13 +368,8 @@ name = "test-"
 strip = true
 
 [workspace]
-"#,
-            si!(r#"---
-[dependencies]
-time="0.1.25"
----
-fn main() {}
-"#),
+
+"#]]
         );
     }
 }
diff --git a/tests/testsuite/cargo/help/mod.rs b/tests/testsuite/cargo/help/mod.rs
index d6c2b9c2a90..e40d56a1827 100644
--- 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![""]);
 }
diff --git a/tests/testsuite/cargo/z_help/mod.rs b/tests/testsuite/cargo/z_help/mod.rs
index 05e91b81bfd..e890839845a 100644
--- 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![""]);
 }
diff --git a/tests/testsuite/cargo_add/add_basic/mod.rs b/tests/testsuite/cargo_add/add_basic/mod.rs
index f78d8555b30..850a4a66b46 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/add_multiple/mod.rs b/tests/testsuite/cargo_add/add_multiple/mod.rs
index 89fb234e44f..805d0089cad 100644
--- 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);
 }
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
index 74b3186018a..26f9880bed7 100644
--- 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);
 }
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
index 392a53d6165..5ca79c7c5e8 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs b/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs
index b6a5d0ab4e0..23c1c5053c3 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/add_toolchain/mod.rs b/tests/testsuite/cargo_add/add_toolchain/mod.rs
index 531f2bb0471..9220aa7ed6b 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/build/mod.rs b/tests/testsuite/cargo_add/build/mod.rs
index 53addf2b6a9..f72db7dd4a6 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs b/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs
index 1f8d54bf611..be6f2a685c7 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/change_rename_target/mod.rs b/tests/testsuite/cargo_add/change_rename_target/mod.rs
index d0046fa57a1..b60deb2ed99 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/cyclic_features/mod.rs b/tests/testsuite/cargo_add/cyclic_features/mod.rs
index 7a4befb3579..275f7acd4c4 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/default_features/mod.rs b/tests/testsuite/cargo_add/default_features/mod.rs
index b81fcba3908..c08a6bea906 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/deprecated_default_features/mod.rs b/tests/testsuite/cargo_add/deprecated_default_features/mod.rs
index ed80f3f4c8c..c25d40d2236 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/deprecated_section/mod.rs b/tests/testsuite/cargo_add/deprecated_section/mod.rs
index ed80f3f4c8c..c25d40d2236 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs
index 45af7d6212a..86545d3f4d0 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs
index 6af2684be56..197df781195 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs
index de880db7d9d..d9f5193227d 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs
index e7b1413ffa5..3d2424ebfc9 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/dev/mod.rs b/tests/testsuite/cargo_add/dev/mod.rs
index 6c96ecd2282..00f9bd8fd8f 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/dev_build_conflict/mod.rs b/tests/testsuite/cargo_add/dev_build_conflict/mod.rs
index 36026645a39..f4bb8786a30 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs b/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs
index 6376004b664..95391cb1636 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/dry_run/mod.rs b/tests/testsuite/cargo_add/dry_run/mod.rs
index e50c668331d..515e975bcc7 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/empty_dep_name/mod.rs b/tests/testsuite/cargo_add/empty_dep_name/mod.rs
index 51f0af3b2d2..5e1c5140360 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/features/mod.rs b/tests/testsuite/cargo_add/features/mod.rs
index 973015f2b13..468587d7c4c 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs b/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs
index 51345c7b53f..41075a98ae7 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs b/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs
index 6a15f085e7b..cce0d90420e 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/features_empty/mod.rs b/tests/testsuite/cargo_add/features_empty/mod.rs
index 0ef080fcdee..f7071d44d0f 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs b/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs
index cc48e49b306..e149dc00987 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/features_preserve/mod.rs b/tests/testsuite/cargo_add/features_preserve/mod.rs
index b5b8ae962cf..0434d5bced1 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/features_spaced_values/mod.rs b/tests/testsuite/cargo_add/features_spaced_values/mod.rs
index ea7e56acd32..4a689e7237a 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/features_unknown/mod.rs b/tests/testsuite/cargo_add/features_unknown/mod.rs
index 8f5e2b68aca..dc60e5dac75 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs b/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs
index 1fe2f77ba2c..b0e229d8dc4 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/git/mod.rs b/tests/testsuite/cargo_add/git/mod.rs
index 648d6346ab3..cd8e4c38870 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/git_branch/mod.rs b/tests/testsuite/cargo_add/git_branch/mod.rs
index cdb68e087f5..e0b7049be60 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs b/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs
index b2a65eec12a..f0f031e8ebb 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/git_dev/mod.rs b/tests/testsuite/cargo_add/git_dev/mod.rs
index 902ba92a095..c0f6c697207 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/git_inferred_name/mod.rs b/tests/testsuite/cargo_add/git_inferred_name/mod.rs
index 78b29bf727b..d11d31986f5 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs b/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs
index 00cc82af4bb..0ee595b870f 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/git_multiple_names/mod.rs b/tests/testsuite/cargo_add/git_multiple_names/mod.rs
index addd9aa7df4..1747b81f064 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs b/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs
index 1e69342d06c..18c7ce4a5e4 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/git_normalized_name/mod.rs b/tests/testsuite/cargo_add/git_normalized_name/mod.rs
index 39121322904..739468a651c 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/git_registry/mod.rs b/tests/testsuite/cargo_add/git_registry/mod.rs
index dd5fbce6338..b1e5e6246f0 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/git_rev/mod.rs b/tests/testsuite/cargo_add/git_rev/mod.rs
index 89ee40053c0..3cd5759bffe 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/git_tag/mod.rs b/tests/testsuite/cargo_add/git_tag/mod.rs
index c486ed19494..a29ae6d7d47 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/help/mod.rs b/tests/testsuite/cargo_add/help/mod.rs
index 54ed2273750..a93be5e5de7 100644
--- 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![""]);
 }
diff --git a/tests/testsuite/cargo_add/infer_prerelease/mod.rs b/tests/testsuite/cargo_add/infer_prerelease/mod.rs
index 86c445a54af..eb9842b2db8 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/invalid_arg/mod.rs b/tests/testsuite/cargo_add/invalid_arg/mod.rs
index 021936e40ee..c8ef1f756f7 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/invalid_git_name/mod.rs b/tests/testsuite/cargo_add/invalid_git_name/mod.rs
index 3aa1c52afc2..0a923250f53 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs
index 6f8a77ca45a..9aeea125127 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs
index 6f8a77ca45a..9aeea125127 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs
index b28c269f3b0..c564fa4360f 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/invalid_manifest/mod.rs b/tests/testsuite/cargo_add/invalid_manifest/mod.rs
index fcb7096e8a6..f404cd2c788 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/invalid_name_external/mod.rs b/tests/testsuite/cargo_add/invalid_name_external/mod.rs
index 192e3349867..c15f9158cd3 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/invalid_path/mod.rs b/tests/testsuite/cargo_add/invalid_path/mod.rs
index 88e8838e02b..d19260496ad 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/invalid_path_name/mod.rs b/tests/testsuite/cargo_add/invalid_path_name/mod.rs
index ea7d1fd6921..92319f7914c 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/invalid_path_self/mod.rs b/tests/testsuite/cargo_add/invalid_path_self/mod.rs
index 47d031d8727..9397c5a6cae 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/invalid_target_empty/mod.rs b/tests/testsuite/cargo_add/invalid_target_empty/mod.rs
index 52b3baceacb..b3184089ec5 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/invalid_vers/mod.rs b/tests/testsuite/cargo_add/invalid_vers/mod.rs
index 2e88c2d3b4d..812be6142b2 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/list_features/mod.rs b/tests/testsuite/cargo_add/list_features/mod.rs
index 714d016d5e0..891e0c3327c 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/list_features_path/mod.rs b/tests/testsuite/cargo_add/list_features_path/mod.rs
index c2d4421a8b7..401a52f45b8 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs b/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs
index ad88ceb67d1..e6172c001bc 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/locked_changed/mod.rs b/tests/testsuite/cargo_add/locked_changed/mod.rs
index 04a367bd469..4f3f675c5f1 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/locked_unchanged/mod.rs b/tests/testsuite/cargo_add/locked_unchanged/mod.rs
index 932c008bb38..79c44a18266 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/lockfile_updated/mod.rs b/tests/testsuite/cargo_add/lockfile_updated/mod.rs
index 151f49b38f1..e256189bf1e 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/manifest_path_package/mod.rs b/tests/testsuite/cargo_add/manifest_path_package/mod.rs
index 6c6a7677ff3..8f8732fd416 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/merge_activated_features/mod.rs b/tests/testsuite/cargo_add/merge_activated_features/mod.rs
index c99b7087942..d006d2b655d 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs b/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs
index 932549177ef..ceea4f1713b 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs
index 6328ae731ca..3ff29dc3377 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/namever/mod.rs b/tests/testsuite/cargo_add/namever/mod.rs
index ac916da2f8c..05dc7b6b10c 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/no_args/mod.rs b/tests/testsuite/cargo_add/no_args/mod.rs
index 2b69d5db639..c525cba6576 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/no_default_features/mod.rs b/tests/testsuite/cargo_add/no_default_features/mod.rs
index 6eadbf7ee05..73ff19a5b6c 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/no_optional/mod.rs b/tests/testsuite/cargo_add/no_optional/mod.rs
index 3a07f0b51b4..9f4f9e643ef 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/no_public/mod.rs b/tests/testsuite/cargo_add/no_public/mod.rs
index 2c6c832d490..360bac45e70 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/offline_empty_cache/mod.rs b/tests/testsuite/cargo_add/offline_empty_cache/mod.rs
index 299f5ae82d8..819e017f753 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/optional/mod.rs b/tests/testsuite/cargo_add/optional/mod.rs
index 29f0e94226f..425eceaec68 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_default_features/mod.rs
index b81fcba3908..c08a6bea906 100644
--- 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);
 }
diff --git 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
index 6eadbf7ee05..73ff19a5b6c 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_features/mod.rs b/tests/testsuite/cargo_add/overwrite_features/mod.rs
index 614036dee66..5a16c2416bf 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs b/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs
index 1a5952f4a75..3729f9946d4 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs
index 45af7d6212a..86545d3f4d0 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs
index 45af7d6212a..86545d3f4d0 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs
index 45af7d6212a..86545d3f4d0 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs b/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs
index 2ca83475ced..212dba2ca98 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs
index cdff7fa1902..9ce9a97f703 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs
index 3291e556b23..e735c848a8b 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs
index 6eadbf7ee05..73ff19a5b6c 100644
--- 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);
 }
diff --git 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
index b81fcba3908..c08a6bea906 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs
index 3a07f0b51b4..9f4f9e643ef 100644
--- 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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs
index 29f0e94226f..425eceaec68 100644
--- a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_no_optional_with_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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_no_public/mod.rs b/tests/testsuite/cargo_add/overwrite_no_public/mod.rs
index 2c6c832d490..360bac45e70 100644
--- a/tests/testsuite/cargo_add/overwrite_no_public/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs b/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs
index 3ca92cdc2fb..7bee1aa5c18 100644
--- a/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_no_public_with_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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional/mod.rs
index 29f0e94226f..425eceaec68 100644
--- a/tests/testsuite/cargo_add/overwrite_optional/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs
index a17d7d19b07..917125c7827 100644
--- a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs
index 03e863bcb42..d3604347927 100644
--- a/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_optional_with_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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs
index 39de0137460..3a1c58bb5bb 100644
--- a/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_path_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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs b/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs
index a192c0dd78d..a25883cb011 100644
--- a/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_path_with_version/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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs
index 614036dee66..5a16c2416bf 100644
--- a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_public/mod.rs b/tests/testsuite/cargo_add/overwrite_public/mod.rs
index 3ca92cdc2fb..7bee1aa5c18 100644
--- a/tests/testsuite/cargo_add/overwrite_public/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs b/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs
index 2c6c832d490..360bac45e70 100644
--- a/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_public_with_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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs
index 660a241d10e..e253892b649 100644
--- a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs
index 4e10ee12d02..f38df303363 100644
--- a/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename/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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs
index 82141add198..2708ad8c095 100644
--- a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs b/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs
index 73d669c021e..43ab3b667bd 100644
--- a/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs
@@ -39,8 +39,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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs b/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs
index 1a5952f4a75..3729f9946d4 100644
--- a/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_version_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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs
index 86922986f2a..05f9ed762c3 100644
--- a/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_with_rename/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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs b/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs
index 93359ab6be8..cfd8fcb62ef 100644
--- a/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_workspace_dep/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);
 }
diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs
index 93359ab6be8..cfd8fcb62ef 100644
--- a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_workspace_dep_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);
 }
diff --git a/tests/testsuite/cargo_add/path/mod.rs b/tests/testsuite/cargo_add/path/mod.rs
index 1a5952f4a75..3729f9946d4 100644
--- a/tests/testsuite/cargo_add/path/mod.rs
+++ b/tests/testsuite/cargo_add/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);
 }
diff --git a/tests/testsuite/cargo_add/path_dev/mod.rs b/tests/testsuite/cargo_add/path_dev/mod.rs
index 5c12f879ffd..49b7901c695 100644
--- a/tests/testsuite/cargo_add/path_dev/mod.rs
+++ b/tests/testsuite/cargo_add/path_dev/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);
 }
diff --git a/tests/testsuite/cargo_add/path_inferred_name/mod.rs b/tests/testsuite/cargo_add/path_inferred_name/mod.rs
index 1a5952f4a75..3729f9946d4 100644
--- a/tests/testsuite/cargo_add/path_inferred_name/mod.rs
+++ b/tests/testsuite/cargo_add/path_inferred_name/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);
 }
diff --git a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs
index 0bde644c369..18ee86c9302 100644
--- a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs
+++ b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/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);
 }
diff --git a/tests/testsuite/cargo_add/path_normalized_name/mod.rs b/tests/testsuite/cargo_add/path_normalized_name/mod.rs
index 98702f52045..717be7aa353 100644
--- a/tests/testsuite/cargo_add/path_normalized_name/mod.rs
+++ b/tests/testsuite/cargo_add/path_normalized_name/mod.rs
@@ -31,8 +31,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);
 }
diff --git a/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs b/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs
index cc60c5d10d5..7c3381f3e5a 100644
--- a/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs
+++ b/tests/testsuite/cargo_add/preserve_dep_std_table/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);
 }
diff --git a/tests/testsuite/cargo_add/preserve_features_sorted/mod.rs b/tests/testsuite/cargo_add/preserve_features_sorted/mod.rs
index 3e9f8a659e5..c82c4a0a076 100644
--- a/tests/testsuite/cargo_add/preserve_features_sorted/mod.rs
+++ b/tests/testsuite/cargo_add/preserve_features_sorted/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);
 }
diff --git a/tests/testsuite/cargo_add/preserve_features_table/mod.rs b/tests/testsuite/cargo_add/preserve_features_table/mod.rs
index cc60c5d10d5..7c3381f3e5a 100644
--- a/tests/testsuite/cargo_add/preserve_features_table/mod.rs
+++ b/tests/testsuite/cargo_add/preserve_features_table/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);
 }
diff --git a/tests/testsuite/cargo_add/preserve_features_unsorted/mod.rs b/tests/testsuite/cargo_add/preserve_features_unsorted/mod.rs
index 4cf09d67946..d78863863c8 100644
--- a/tests/testsuite/cargo_add/preserve_features_unsorted/mod.rs
+++ b/tests/testsuite/cargo_add/preserve_features_unsorted/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);
 }
diff --git a/tests/testsuite/cargo_add/preserve_sorted/mod.rs b/tests/testsuite/cargo_add/preserve_sorted/mod.rs
index 40199bb35af..40bc43e82cc 100644
--- a/tests/testsuite/cargo_add/preserve_sorted/mod.rs
+++ b/tests/testsuite/cargo_add/preserve_sorted/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);
 }
diff --git a/tests/testsuite/cargo_add/preserve_unsorted/mod.rs b/tests/testsuite/cargo_add/preserve_unsorted/mod.rs
index 40199bb35af..40bc43e82cc 100644
--- a/tests/testsuite/cargo_add/preserve_unsorted/mod.rs
+++ b/tests/testsuite/cargo_add/preserve_unsorted/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);
 }
diff --git a/tests/testsuite/cargo_add/public/mod.rs b/tests/testsuite/cargo_add/public/mod.rs
index 3ca92cdc2fb..7bee1aa5c18 100644
--- a/tests/testsuite/cargo_add/public/mod.rs
+++ b/tests/testsuite/cargo_add/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);
 }
diff --git a/tests/testsuite/cargo_add/quiet/mod.rs b/tests/testsuite/cargo_add/quiet/mod.rs
index 6d0a8d49c4f..7c409b6172b 100644
--- a/tests/testsuite/cargo_add/quiet/mod.rs
+++ b/tests/testsuite/cargo_add/quiet/mod.rs
@@ -24,8 +24,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(str![""])
-        .stderr_matches(str![""]);
+        .stdout_eq(str![""])
+        .stderr_eq(str![""]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/registry/mod.rs b/tests/testsuite/cargo_add/registry/mod.rs
index 4d019895588..db8f79b8ef9 100644
--- a/tests/testsuite/cargo_add/registry/mod.rs
+++ b/tests/testsuite/cargo_add/registry/mod.rs
@@ -34,8 +34,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);
 }
diff --git a/tests/testsuite/cargo_add/rename/mod.rs b/tests/testsuite/cargo_add/rename/mod.rs
index 6492e551b62..c27075ae0d3 100644
--- a/tests/testsuite/cargo_add/rename/mod.rs
+++ b/tests/testsuite/cargo_add/rename/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);
 }
diff --git a/tests/testsuite/cargo_add/require_weak/mod.rs b/tests/testsuite/cargo_add/require_weak/mod.rs
index cc60c5d10d5..7c3381f3e5a 100644
--- a/tests/testsuite/cargo_add/require_weak/mod.rs
+++ b/tests/testsuite/cargo_add/require_weak/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);
 }
diff --git a/tests/testsuite/cargo_add/rust_version_ignore/mod.rs b/tests/testsuite/cargo_add/rust_version_ignore/mod.rs
index 0b7fe71627b..37770685b11 100644
--- a/tests/testsuite/cargo_add/rust_version_ignore/mod.rs
+++ b/tests/testsuite/cargo_add/rust_version_ignore/mod.rs
@@ -32,8 +32,8 @@ fn case() {
         .masquerade_as_nightly_cargo(&["msrv-policy"])
         .assert()
         .code(0)
-        .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);
 }
diff --git a/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs b/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs
index cbc89e90da2..e8872028460 100644
--- a/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs
+++ b/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs
@@ -34,8 +34,8 @@ fn case() {
         .masquerade_as_nightly_cargo(&["msrv-policy"])
         .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);
 }
diff --git a/tests/testsuite/cargo_add/rust_version_latest/mod.rs b/tests/testsuite/cargo_add/rust_version_latest/mod.rs
index 07b6be45208..f20b4c4895b 100644
--- a/tests/testsuite/cargo_add/rust_version_latest/mod.rs
+++ b/tests/testsuite/cargo_add/rust_version_latest/mod.rs
@@ -31,8 +31,8 @@ fn case() {
         .masquerade_as_nightly_cargo(&["msrv-policy"])
         .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);
 }
diff --git a/tests/testsuite/cargo_add/rust_version_older/mod.rs b/tests/testsuite/cargo_add/rust_version_older/mod.rs
index 07b6be45208..f20b4c4895b 100644
--- a/tests/testsuite/cargo_add/rust_version_older/mod.rs
+++ b/tests/testsuite/cargo_add/rust_version_older/mod.rs
@@ -31,8 +31,8 @@ fn case() {
         .masquerade_as_nightly_cargo(&["msrv-policy"])
         .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);
 }
diff --git a/tests/testsuite/cargo_add/rustc_ignore/mod.rs b/tests/testsuite/cargo_add/rustc_ignore/mod.rs
index 2763fc515fa..7fea1e6bbb3 100644
--- a/tests/testsuite/cargo_add/rustc_ignore/mod.rs
+++ b/tests/testsuite/cargo_add/rustc_ignore/mod.rs
@@ -35,8 +35,8 @@ fn case() {
         .masquerade_as_nightly_cargo(&["msrv-policy"])
         .assert()
         .code(0)
-        .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);
 }
diff --git a/tests/testsuite/cargo_add/rustc_incompatible/mod.rs b/tests/testsuite/cargo_add/rustc_incompatible/mod.rs
index 375c218d7a1..892e423fcdb 100644
--- a/tests/testsuite/cargo_add/rustc_incompatible/mod.rs
+++ b/tests/testsuite/cargo_add/rustc_incompatible/mod.rs
@@ -28,8 +28,8 @@ fn case() {
         .masquerade_as_nightly_cargo(&["msrv-policy"])
         .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);
 }
diff --git a/tests/testsuite/cargo_add/rustc_latest/mod.rs b/tests/testsuite/cargo_add/rustc_latest/mod.rs
index 43018ba5444..56b919e09ea 100644
--- a/tests/testsuite/cargo_add/rustc_latest/mod.rs
+++ b/tests/testsuite/cargo_add/rustc_latest/mod.rs
@@ -34,8 +34,8 @@ fn case() {
         .masquerade_as_nightly_cargo(&["msrv-policy"])
         .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);
 }
diff --git a/tests/testsuite/cargo_add/rustc_older/mod.rs b/tests/testsuite/cargo_add/rustc_older/mod.rs
index 43018ba5444..56b919e09ea 100644
--- a/tests/testsuite/cargo_add/rustc_older/mod.rs
+++ b/tests/testsuite/cargo_add/rustc_older/mod.rs
@@ -34,8 +34,8 @@ fn case() {
         .masquerade_as_nightly_cargo(&["msrv-policy"])
         .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);
 }
diff --git a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs
index 4f5498dbeba..2e11221b0b8 100644
--- a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs
+++ b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/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);
 }
diff --git a/tests/testsuite/cargo_add/target/mod.rs b/tests/testsuite/cargo_add/target/mod.rs
index f683d235aec..ca7fa309170 100644
--- a/tests/testsuite/cargo_add/target/mod.rs
+++ b/tests/testsuite/cargo_add/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);
 }
diff --git a/tests/testsuite/cargo_add/target_cfg/mod.rs b/tests/testsuite/cargo_add/target_cfg/mod.rs
index dcfebafa915..762816b033a 100644
--- a/tests/testsuite/cargo_add/target_cfg/mod.rs
+++ b/tests/testsuite/cargo_add/target_cfg/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);
 }
diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs b/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs
index 448d6eba7e2..5825d0a7f7d 100644
--- a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs
+++ b/tests/testsuite/cargo_add/unknown_inherited_feature/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);
 }
diff --git a/tests/testsuite/cargo_add/vers/mod.rs b/tests/testsuite/cargo_add/vers/mod.rs
index dd0645e50f9..6bf38dbf14f 100644
--- a/tests/testsuite/cargo_add/vers/mod.rs
+++ b/tests/testsuite/cargo_add/vers/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);
 }
diff --git a/tests/testsuite/cargo_add/workspace_name/mod.rs b/tests/testsuite/cargo_add/workspace_name/mod.rs
index f320cc11c45..fabd9082086 100644
--- a/tests/testsuite/cargo_add/workspace_name/mod.rs
+++ b/tests/testsuite/cargo_add/workspace_name/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);
 }
diff --git a/tests/testsuite/cargo_add/workspace_path/mod.rs b/tests/testsuite/cargo_add/workspace_path/mod.rs
index 1a5952f4a75..3729f9946d4 100644
--- a/tests/testsuite/cargo_add/workspace_path/mod.rs
+++ b/tests/testsuite/cargo_add/workspace_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);
 }
diff --git a/tests/testsuite/cargo_add/workspace_path_dev/mod.rs b/tests/testsuite/cargo_add/workspace_path_dev/mod.rs
index 5c12f879ffd..49b7901c695 100644
--- a/tests/testsuite/cargo_add/workspace_path_dev/mod.rs
+++ b/tests/testsuite/cargo_add/workspace_path_dev/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);
 }
diff --git a/tests/testsuite/cargo_bench/help/mod.rs b/tests/testsuite/cargo_bench/help/mod.rs
index 3f38147a101..36bef3f1074 100644
--- a/tests/testsuite/cargo_bench/help/mod.rs
+++ b/tests/testsuite/cargo_bench/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![""]);
 }
diff --git a/tests/testsuite/cargo_bench/no_keep_going/mod.rs b/tests/testsuite/cargo_bench/no_keep_going/mod.rs
index c710ea73a98..4226dc1c66a 100644
--- a/tests/testsuite/cargo_bench/no_keep_going/mod.rs
+++ b/tests/testsuite/cargo_bench/no_keep_going/mod.rs
@@ -16,6 +16,6 @@ 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"]);
 }
diff --git a/tests/testsuite/cargo_build/help/mod.rs b/tests/testsuite/cargo_build/help/mod.rs
index 032ab15927a..0dbecdcfef1 100644
--- a/tests/testsuite/cargo_build/help/mod.rs
+++ b/tests/testsuite/cargo_build/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![""]);
 }
diff --git a/tests/testsuite/cargo_check/help/mod.rs b/tests/testsuite/cargo_check/help/mod.rs
index d54aa58f2e5..b5836078c6a 100644
--- a/tests/testsuite/cargo_check/help/mod.rs
+++ b/tests/testsuite/cargo_check/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![""]);
 }
diff --git a/tests/testsuite/cargo_clean/help/mod.rs b/tests/testsuite/cargo_clean/help/mod.rs
index 80b2df45286..2b4679ba7bf 100644
--- a/tests/testsuite/cargo_clean/help/mod.rs
+++ b/tests/testsuite/cargo_clean/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![""]);
 }
diff --git a/tests/testsuite/cargo_config/help/mod.rs b/tests/testsuite/cargo_config/help/mod.rs
index 8e45f699803..c1f51f97073 100644
--- a/tests/testsuite/cargo_config/help/mod.rs
+++ b/tests/testsuite/cargo_config/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![""]);
 }
diff --git a/tests/testsuite/cargo_doc/help/mod.rs b/tests/testsuite/cargo_doc/help/mod.rs
index a293273cdf8..3f9f6a6dff7 100644
--- a/tests/testsuite/cargo_doc/help/mod.rs
+++ b/tests/testsuite/cargo_doc/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![""]);
 }
diff --git a/tests/testsuite/cargo_fetch/help/mod.rs b/tests/testsuite/cargo_fetch/help/mod.rs
index b45a1f5e04d..1f341daf5b8 100644
--- a/tests/testsuite/cargo_fetch/help/mod.rs
+++ b/tests/testsuite/cargo_fetch/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![""]);
 }
diff --git a/tests/testsuite/cargo_fix/help/mod.rs b/tests/testsuite/cargo_fix/help/mod.rs
index 5e648b8c9ef..22b3fdf1449 100644
--- a/tests/testsuite/cargo_fix/help/mod.rs
+++ b/tests/testsuite/cargo_fix/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![""]);
 }
diff --git a/tests/testsuite/cargo_generate_lockfile/help/mod.rs b/tests/testsuite/cargo_generate_lockfile/help/mod.rs
index 12831bc7fb1..c2fbbfa6acc 100644
--- a/tests/testsuite/cargo_generate_lockfile/help/mod.rs
+++ b/tests/testsuite/cargo_generate_lockfile/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![""]);
 }
diff --git a/tests/testsuite/cargo_git_checkout/help/mod.rs b/tests/testsuite/cargo_git_checkout/help/mod.rs
index 35bbf7fec9e..5828fcadfe4 100644
--- a/tests/testsuite/cargo_git_checkout/help/mod.rs
+++ b/tests/testsuite/cargo_git_checkout/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![""]);
 }
diff --git a/tests/testsuite/cargo_help/help/mod.rs b/tests/testsuite/cargo_help/help/mod.rs
index 703577f2768..f5db7e12bb7 100644
--- a/tests/testsuite/cargo_help/help/mod.rs
+++ b/tests/testsuite/cargo_help/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![""]);
 }
diff --git a/tests/testsuite/cargo_init/auto_git/mod.rs b/tests/testsuite/cargo_init/auto_git/mod.rs
index 8780abf8cb9..06cb1eb44b3 100644
--- a/tests/testsuite/cargo_init/auto_git/mod.rs
+++ b/tests/testsuite/cargo_init/auto_git/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(project_root.join(".git").is_dir());
diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs
index 0ae9d6355ce..d2855639b1a 100644
--- a/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs
+++ b/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
 }
diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs
index d0dd40c4d19..db152a15ed8 100644
--- a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs
+++ b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join("src").is_dir());
diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs
index 15a52a1d7c0..5a9603a5f7e 100644
--- a/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs
+++ b/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
 }
diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs
index 388fb2bb91a..018fe73c39c 100644
--- a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs
+++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join("src").is_dir());
diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs
index df89641fab7..219b54534a5 100644
--- a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs
+++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join("src/main.rs").is_file());
diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs
index 388fb2bb91a..018fe73c39c 100644
--- a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs
+++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join("src").is_dir());
diff --git a/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs b/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs
index e382ddb4c46..81d1c791f68 100644
--- a/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs
+++ b/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs
@@ -12,8 +12,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!(!cwd.join("Cargo.toml").is_file());
 }
diff --git a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs
index c73a2950249..2b34486bf3d 100644
--- a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs
+++ b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs
@@ -14,6 +14,6 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 }
diff --git a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs
index 2c67e36d74e..f1d364258ef 100644
--- a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs
+++ b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join("Cargo.toml").is_file());
diff --git a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs
index 0ae9d6355ce..d2855639b1a 100644
--- a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs
+++ b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
 }
diff --git a/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/mod.rs b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/mod.rs
index 0ae9d6355ce..d2855639b1a 100644
--- a/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/mod.rs
+++ b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
 }
diff --git a/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/mod.rs b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/mod.rs
index e807e9ec845..4e3cb8b7079 100644
--- a/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/mod.rs
+++ b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
 }
diff --git a/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs b/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs
index a2e3044c61f..c0d70abe4a3 100644
--- a/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs
+++ b/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
 }
diff --git a/tests/testsuite/cargo_init/formats_source/mod.rs b/tests/testsuite/cargo_init/formats_source/mod.rs
index e4333b88e27..b35ce6093b8 100644
--- a/tests/testsuite/cargo_init/formats_source/mod.rs
+++ b/tests/testsuite/cargo_init/formats_source/mod.rs
@@ -23,8 +23,8 @@ fn case() {
         .current_dir(project_root)
         .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);
 }
diff --git a/tests/testsuite/cargo_init/fossil_autodetect/mod.rs b/tests/testsuite/cargo_init/fossil_autodetect/mod.rs
index ad1d282cef9..132ea3eb99c 100644
--- a/tests/testsuite/cargo_init/fossil_autodetect/mod.rs
+++ b/tests/testsuite/cargo_init/fossil_autodetect/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join(".git").is_dir());
diff --git a/tests/testsuite/cargo_init/git_autodetect/mod.rs b/tests/testsuite/cargo_init/git_autodetect/mod.rs
index ff4bf660d12..f0a78ed3da5 100644
--- a/tests/testsuite/cargo_init/git_autodetect/mod.rs
+++ b/tests/testsuite/cargo_init/git_autodetect/mod.rs
@@ -17,8 +17,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(project_root.join(".git").is_dir());
diff --git a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs
index 72f88914a4e..013db91cab9 100644
--- a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs
+++ b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(project_root.join(".git").is_dir());
diff --git a/tests/testsuite/cargo_init/help/mod.rs b/tests/testsuite/cargo_init/help/mod.rs
index 490a624c5b5..fd1930fd4d9 100644
--- a/tests/testsuite/cargo_init/help/mod.rs
+++ b/tests/testsuite/cargo_init/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![""]);
 }
diff --git a/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs b/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs
index fc0592879f4..d42e5a9e07b 100644
--- a/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs
+++ b/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs
@@ -16,8 +16,8 @@ fn case() {
         .current_dir(project_root)
         .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);
 }
diff --git a/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs b/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs
index 4bfdf6195c9..7b59af80933 100644
--- a/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs
+++ b/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
 }
diff --git a/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs b/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs
index 4bfdf6195c9..7b59af80933 100644
--- a/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs
+++ b/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
 }
diff --git a/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs b/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs
index 818a5407165..cd912bb03b0 100644
--- a/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs
+++ b/tests/testsuite/cargo_init/inherit_workspace_package_table/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);
 }
diff --git a/tests/testsuite/cargo_init/invalid_dir_name/mod.rs b/tests/testsuite/cargo_init/invalid_dir_name/mod.rs
index d8038be0ec7..b6e4100c972 100644
--- a/tests/testsuite/cargo_init/invalid_dir_name/mod.rs
+++ b/tests/testsuite/cargo_init/invalid_dir_name/mod.rs
@@ -14,8 +14,8 @@ fn case() {
         .current_dir(foo)
         .assert()
         .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert!(!foo.join("Cargo.toml").is_file());
 }
diff --git a/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs b/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs
index df89641fab7..219b54534a5 100644
--- a/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs
+++ b/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join("src/main.rs").is_file());
diff --git a/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs b/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs
index df89641fab7..219b54534a5 100644
--- a/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs
+++ b/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join("src/main.rs").is_file());
diff --git a/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs b/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs
index ad1d282cef9..132ea3eb99c 100644
--- a/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs
+++ b/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join(".git").is_dir());
diff --git a/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs b/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs
index 6d83b9abf9c..7f87da08d88 100644
--- a/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs
+++ b/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join("Cargo.toml").is_file());
diff --git a/tests/testsuite/cargo_init/no_filename/mod.rs b/tests/testsuite/cargo_init/no_filename/mod.rs
index 439189de1a1..92b3bba71b1 100644
--- a/tests/testsuite/cargo_init/no_filename/mod.rs
+++ b/tests/testsuite/cargo_init/no_filename/mod.rs
@@ -11,6 +11,6 @@ fn case() {
         .current_dir(paths::root())
         .assert()
         .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 }
diff --git a/tests/testsuite/cargo_init/path_contains_separator/mod.rs b/tests/testsuite/cargo_init/path_contains_separator/mod.rs
index f861375831a..ad361e1038b 100644
--- a/tests/testsuite/cargo_init/path_contains_separator/mod.rs
+++ b/tests/testsuite/cargo_init/path_contains_separator/mod.rs
@@ -19,8 +19,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join(".gitignore").is_file());
diff --git a/tests/testsuite/cargo_init/pijul_autodetect/mod.rs b/tests/testsuite/cargo_init/pijul_autodetect/mod.rs
index ad1d282cef9..132ea3eb99c 100644
--- a/tests/testsuite/cargo_init/pijul_autodetect/mod.rs
+++ b/tests/testsuite/cargo_init/pijul_autodetect/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join(".git").is_dir());
diff --git a/tests/testsuite/cargo_init/reserved_name/mod.rs b/tests/testsuite/cargo_init/reserved_name/mod.rs
index 5212765f44f..91b4de8b4b3 100644
--- a/tests/testsuite/cargo_init/reserved_name/mod.rs
+++ b/tests/testsuite/cargo_init/reserved_name/mod.rs
@@ -14,8 +14,8 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 
     assert!(!project_root.join("Cargo.toml").is_file());
 }
diff --git a/tests/testsuite/cargo_init/simple_bin/mod.rs b/tests/testsuite/cargo_init/simple_bin/mod.rs
index f6eb6cc9b08..6706742ff74 100644
--- a/tests/testsuite/cargo_init/simple_bin/mod.rs
+++ b/tests/testsuite/cargo_init/simple_bin/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join(".gitignore").is_file());
diff --git a/tests/testsuite/cargo_init/simple_git/mod.rs b/tests/testsuite/cargo_init/simple_git/mod.rs
index de150e87d19..e8af27f4664 100644
--- a/tests/testsuite/cargo_init/simple_git/mod.rs
+++ b/tests/testsuite/cargo_init/simple_git/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(project_root.join(".git").is_dir());
diff --git a/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs b/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs
index 75559019b25..c8242fa42f3 100644
--- a/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs
+++ b/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(project_root.join(".git").is_dir());
diff --git a/tests/testsuite/cargo_init/simple_hg/mod.rs b/tests/testsuite/cargo_init/simple_hg/mod.rs
index 42610e75a58..c32455afa21 100644
--- a/tests/testsuite/cargo_init/simple_hg/mod.rs
+++ b/tests/testsuite/cargo_init/simple_hg/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join(".git").is_dir());
diff --git a/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs b/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs
index ad1d282cef9..132ea3eb99c 100644
--- a/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs
+++ b/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join(".git").is_dir());
diff --git a/tests/testsuite/cargo_init/simple_lib/mod.rs b/tests/testsuite/cargo_init/simple_lib/mod.rs
index 8018acd3607..9c19bcd52d8 100644
--- a/tests/testsuite/cargo_init/simple_lib/mod.rs
+++ b/tests/testsuite/cargo_init/simple_lib/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
     assert!(!project_root.join(".gitignore").is_file());
diff --git a/tests/testsuite/cargo_init/unknown_flags/mod.rs b/tests/testsuite/cargo_init/unknown_flags/mod.rs
index 9c270902b11..9df19a755c0 100644
--- a/tests/testsuite/cargo_init/unknown_flags/mod.rs
+++ b/tests/testsuite/cargo_init/unknown_flags/mod.rs
@@ -10,6 +10,6 @@ fn case() {
         .current_dir(paths::root())
         .assert()
         .code(1)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 }
diff --git a/tests/testsuite/cargo_init/with_argument/mod.rs b/tests/testsuite/cargo_init/with_argument/mod.rs
index ccd539cfd38..21862402ea5 100644
--- a/tests/testsuite/cargo_init/with_argument/mod.rs
+++ b/tests/testsuite/cargo_init/with_argument/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root)
         .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);
 }
diff --git a/tests/testsuite/cargo_init/workspace_add_member/mod.rs b/tests/testsuite/cargo_init/workspace_add_member/mod.rs
index 968b3ae33bc..57d49dcb4e1 100644
--- a/tests/testsuite/cargo_init/workspace_add_member/mod.rs
+++ b/tests/testsuite/cargo_init/workspace_add_member/mod.rs
@@ -15,8 +15,8 @@ fn case() {
         .current_dir(project_root.join("crates").join("foo"))
         .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);
 }
diff --git a/tests/testsuite/cargo_install/help/mod.rs b/tests/testsuite/cargo_install/help/mod.rs
index b45265efe41..00dc6f7c49d 100644
--- a/tests/testsuite/cargo_install/help/mod.rs
+++ b/tests/testsuite/cargo_install/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![""]);
 }
diff --git a/tests/testsuite/cargo_locate_project/help/mod.rs b/tests/testsuite/cargo_locate_project/help/mod.rs
index b3a2492a8f0..6bede7a4296 100644
--- a/tests/testsuite/cargo_locate_project/help/mod.rs
+++ b/tests/testsuite/cargo_locate_project/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![""]);
 }
diff --git a/tests/testsuite/cargo_login/help/mod.rs b/tests/testsuite/cargo_login/help/mod.rs
index 383058118fb..5416ec10510 100644
--- a/tests/testsuite/cargo_login/help/mod.rs
+++ b/tests/testsuite/cargo_login/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![""]);
 }
diff --git a/tests/testsuite/cargo_logout/help/mod.rs b/tests/testsuite/cargo_logout/help/mod.rs
index 440983d8932..5bbb986bc5f 100644
--- a/tests/testsuite/cargo_logout/help/mod.rs
+++ b/tests/testsuite/cargo_logout/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![""]);
 }
diff --git a/tests/testsuite/cargo_metadata/help/mod.rs b/tests/testsuite/cargo_metadata/help/mod.rs
index 03e2f9d0684..7d42b9e6212 100644
--- a/tests/testsuite/cargo_metadata/help/mod.rs
+++ b/tests/testsuite/cargo_metadata/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![""]);
 }
diff --git a/tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs b/tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs
index 7983fed9b2c..9a6e7c5486b 100644
--- a/tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_non_workspace/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);
 }
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs
index e1057f47a4a..f3411259b3b 100644
--- a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/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);
 }
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs
index e1057f47a4a..f3411259b3b 100644
--- a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/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);
 }
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs
index cbb4dec3995..d666c0aca71 100644
--- a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs
@@ -18,8 +18,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);
 }
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs
index e1057f47a4a..f3411259b3b 100644
--- a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/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);
 }
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs
index e1057f47a4a..f3411259b3b 100644
--- a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/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);
 }
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs
index e1057f47a4a..f3411259b3b 100644
--- a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/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);
 }
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs
index 7983fed9b2c..9a6e7c5486b 100644
--- a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/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);
 }
diff --git a/tests/testsuite/cargo_new/empty_name/mod.rs b/tests/testsuite/cargo_new/empty_name/mod.rs
index 9c17fd7e190..da6fb0e2d64 100644
--- a/tests/testsuite/cargo_new/empty_name/mod.rs
+++ b/tests/testsuite/cargo_new/empty_name/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);
 }
diff --git a/tests/testsuite/cargo_new/help/mod.rs b/tests/testsuite/cargo_new/help/mod.rs
index 5283da64bd2..55eeac5164b 100644
--- a/tests/testsuite/cargo_new/help/mod.rs
+++ b/tests/testsuite/cargo_new/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![""]);
 }
diff --git a/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs
index e1057f47a4a..f3411259b3b 100644
--- a/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs
+++ b/tests/testsuite/cargo_new/inherit_workspace_lints/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);
 }
diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs
index e1057f47a4a..f3411259b3b 100644
--- a/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs
+++ b/tests/testsuite/cargo_new/inherit_workspace_package_table/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);
 }
diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs
index 4db6bab7222..9c8c2a404fd 100644
--- a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs
+++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/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);
 }
diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs
index 04bc96f3cc6..51883bd4993 100644
--- a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs
+++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/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);
 }
diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs
index e1057f47a4a..f3411259b3b 100644
--- a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs
+++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/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);
 }
diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs
index ac1eb1063ba..54796a00eb3 100644
--- a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs
+++ b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/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);
 }
diff --git a/tests/testsuite/cargo_owner/help/mod.rs b/tests/testsuite/cargo_owner/help/mod.rs
index e912723ce21..8b7669a0ca7 100644
--- a/tests/testsuite/cargo_owner/help/mod.rs
+++ b/tests/testsuite/cargo_owner/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![""]);
 }
diff --git a/tests/testsuite/cargo_package/help/mod.rs b/tests/testsuite/cargo_package/help/mod.rs
index 854a5c821fc..73ff8b7bc80 100644
--- a/tests/testsuite/cargo_package/help/mod.rs
+++ b/tests/testsuite/cargo_package/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![""]);
 }
diff --git a/tests/testsuite/cargo_pkgid/help/mod.rs b/tests/testsuite/cargo_pkgid/help/mod.rs
index 88ff147cac2..fb8d622dbd6 100644
--- a/tests/testsuite/cargo_pkgid/help/mod.rs
+++ b/tests/testsuite/cargo_pkgid/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![""]);
 }
diff --git a/tests/testsuite/cargo_publish/help/mod.rs b/tests/testsuite/cargo_publish/help/mod.rs
index c2687c81946..ef7802b5cf4 100644
--- a/tests/testsuite/cargo_publish/help/mod.rs
+++ b/tests/testsuite/cargo_publish/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![""]);
 }
diff --git a/tests/testsuite/cargo_read_manifest/help/mod.rs b/tests/testsuite/cargo_read_manifest/help/mod.rs
index 053be9c82da..7308a92bc8c 100644
--- a/tests/testsuite/cargo_read_manifest/help/mod.rs
+++ b/tests/testsuite/cargo_read_manifest/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![""]);
 }
diff --git a/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs b/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs
index 552e404ee4b..e5f3e34815a 100644
--- a/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs
+++ b/tests/testsuite/cargo_remove/avoid_empty_tables/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);
 }
diff --git a/tests/testsuite/cargo_remove/build/mod.rs b/tests/testsuite/cargo_remove/build/mod.rs
index e61886910ba..8320d824744 100644
--- a/tests/testsuite/cargo_remove/build/mod.rs
+++ b/tests/testsuite/cargo_remove/build/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);
 }
diff --git a/tests/testsuite/cargo_remove/dev/mod.rs b/tests/testsuite/cargo_remove/dev/mod.rs
index 1104a45767a..b8594662b79 100644
--- a/tests/testsuite/cargo_remove/dev/mod.rs
+++ b/tests/testsuite/cargo_remove/dev/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);
 }
diff --git a/tests/testsuite/cargo_remove/dry_run/mod.rs b/tests/testsuite/cargo_remove/dry_run/mod.rs
index b3e01dabed5..b1b2280f51b 100644
--- a/tests/testsuite/cargo_remove/dry_run/mod.rs
+++ b/tests/testsuite/cargo_remove/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);
 }
diff --git a/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs b/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs
index f18c150fa4b..f27ef6f6fb6 100644
--- a/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs
+++ b/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs
@@ -22,8 +22,8 @@ fn case() {
         .args(["--package", "serde", "serde_derive"])
         .assert()
         .code(0)
-        .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);
 }
diff --git a/tests/testsuite/cargo_remove/gc_patch/mod.rs b/tests/testsuite/cargo_remove/gc_patch/mod.rs
index 003ff877872..ce9cad4ecb3 100644
--- a/tests/testsuite/cargo_remove/gc_patch/mod.rs
+++ b/tests/testsuite/cargo_remove/gc_patch/mod.rs
@@ -73,8 +73,8 @@ fn case() {
         .current_dir(&in_project.root())
         .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"), &in_project.root());
 }
diff --git a/tests/testsuite/cargo_remove/gc_profile/mod.rs b/tests/testsuite/cargo_remove/gc_profile/mod.rs
index 10601612dcd..a0e65886f60 100644
--- a/tests/testsuite/cargo_remove/gc_profile/mod.rs
+++ b/tests/testsuite/cargo_remove/gc_profile/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);
 }
diff --git a/tests/testsuite/cargo_remove/gc_replace/mod.rs b/tests/testsuite/cargo_remove/gc_replace/mod.rs
index 4ea4377ad37..e56e467d9e9 100644
--- a/tests/testsuite/cargo_remove/gc_replace/mod.rs
+++ b/tests/testsuite/cargo_remove/gc_replace/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);
 }
diff --git a/tests/testsuite/cargo_remove/help/mod.rs b/tests/testsuite/cargo_remove/help/mod.rs
index 9c87ea04672..4cad3dda300 100644
--- a/tests/testsuite/cargo_remove/help/mod.rs
+++ b/tests/testsuite/cargo_remove/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![""]);
 }
diff --git a/tests/testsuite/cargo_remove/invalid_arg/mod.rs b/tests/testsuite/cargo_remove/invalid_arg/mod.rs
index 70c3d0f2eb7..cf225b122ef 100644
--- a/tests/testsuite/cargo_remove/invalid_arg/mod.rs
+++ b/tests/testsuite/cargo_remove/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);
 }
diff --git a/tests/testsuite/cargo_remove/invalid_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_dep/mod.rs
index 13b266f02ac..3e225cf2fe9 100644
--- a/tests/testsuite/cargo_remove/invalid_dep/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_dep/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);
 }
diff --git a/tests/testsuite/cargo_remove/invalid_package/mod.rs b/tests/testsuite/cargo_remove/invalid_package/mod.rs
index dfcc8c2508d..fe90a957d19 100644
--- a/tests/testsuite/cargo_remove/invalid_package/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_package/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);
 }
diff --git a/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs b/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs
index efedd118b98..0fe7d12f35c 100644
--- a/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_package_multiple/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);
 }
diff --git a/tests/testsuite/cargo_remove/invalid_section/mod.rs b/tests/testsuite/cargo_remove/invalid_section/mod.rs
index 6364852afa6..7e5e43e18d9 100644
--- a/tests/testsuite/cargo_remove/invalid_section/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_section/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);
 }
diff --git a/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs
index f808a8cdf7b..601ebe8e65c 100644
--- a/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_section_dep/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);
 }
diff --git a/tests/testsuite/cargo_remove/invalid_target/mod.rs b/tests/testsuite/cargo_remove/invalid_target/mod.rs
index aedb0827b75..8e099128f3e 100644
--- a/tests/testsuite/cargo_remove/invalid_target/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_target/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);
 }
diff --git a/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs
index 846975ef1ed..de2db154295 100644
--- a/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_target_dep/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);
 }
diff --git a/tests/testsuite/cargo_remove/multiple_deps/mod.rs b/tests/testsuite/cargo_remove/multiple_deps/mod.rs
index 68b4b88fb79..1a86d276576 100644
--- a/tests/testsuite/cargo_remove/multiple_deps/mod.rs
+++ b/tests/testsuite/cargo_remove/multiple_deps/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);
 }
diff --git a/tests/testsuite/cargo_remove/multiple_dev/mod.rs b/tests/testsuite/cargo_remove/multiple_dev/mod.rs
index ac38f36a540..52831495f0d 100644
--- a/tests/testsuite/cargo_remove/multiple_dev/mod.rs
+++ b/tests/testsuite/cargo_remove/multiple_dev/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);
 }
diff --git a/tests/testsuite/cargo_remove/no_arg/mod.rs b/tests/testsuite/cargo_remove/no_arg/mod.rs
index c0c77766097..920826ac538 100644
--- a/tests/testsuite/cargo_remove/no_arg/mod.rs
+++ b/tests/testsuite/cargo_remove/no_arg/mod.rs
@@ -29,8 +29,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);
 }
diff --git a/tests/testsuite/cargo_remove/offline/mod.rs b/tests/testsuite/cargo_remove/offline/mod.rs
index ea75c66f0e7..1aed4a20f47 100644
--- a/tests/testsuite/cargo_remove/offline/mod.rs
+++ b/tests/testsuite/cargo_remove/offline/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);
 }
diff --git a/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs b/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs
index b85ef13b7ae..a4a08c2a03c 100644
--- a/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs
+++ b/tests/testsuite/cargo_remove/optional_dep_feature/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);
 }
diff --git a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs
index 421ec788d68..a88fd9995f3 100644
--- a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs
+++ b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/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);
 }
diff --git a/tests/testsuite/cargo_remove/optional_feature/mod.rs b/tests/testsuite/cargo_remove/optional_feature/mod.rs
index 9fe043486df..2d9a7680222 100644
--- a/tests/testsuite/cargo_remove/optional_feature/mod.rs
+++ b/tests/testsuite/cargo_remove/optional_feature/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);
 }
diff --git a/tests/testsuite/cargo_remove/package/mod.rs b/tests/testsuite/cargo_remove/package/mod.rs
index d2e7b2fdbc0..3c7298198c8 100644
--- a/tests/testsuite/cargo_remove/package/mod.rs
+++ b/tests/testsuite/cargo_remove/package/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);
 }
diff --git a/tests/testsuite/cargo_remove/remove_basic/mod.rs b/tests/testsuite/cargo_remove/remove_basic/mod.rs
index a0659cd9149..8d3ef22ef8d 100644
--- a/tests/testsuite/cargo_remove/remove_basic/mod.rs
+++ b/tests/testsuite/cargo_remove/remove_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);
 }
diff --git a/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs b/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs
index c684d8badce..40f0dde4633 100644
--- a/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs
+++ b/tests/testsuite/cargo_remove/skip_gc_glob_profile/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);
 }
diff --git a/tests/testsuite/cargo_remove/target/mod.rs b/tests/testsuite/cargo_remove/target/mod.rs
index be7923d869b..264b9ddb8aa 100644
--- a/tests/testsuite/cargo_remove/target/mod.rs
+++ b/tests/testsuite/cargo_remove/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);
 }
diff --git a/tests/testsuite/cargo_remove/target_build/mod.rs b/tests/testsuite/cargo_remove/target_build/mod.rs
index 2f94d85db95..11997bfdc64 100644
--- a/tests/testsuite/cargo_remove/target_build/mod.rs
+++ b/tests/testsuite/cargo_remove/target_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);
 }
diff --git a/tests/testsuite/cargo_remove/target_dev/mod.rs b/tests/testsuite/cargo_remove/target_dev/mod.rs
index 249d382cd64..2a5f0babda1 100644
--- a/tests/testsuite/cargo_remove/target_dev/mod.rs
+++ b/tests/testsuite/cargo_remove/target_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);
 }
diff --git a/tests/testsuite/cargo_remove/update_lock_file/mod.rs b/tests/testsuite/cargo_remove/update_lock_file/mod.rs
index bbc0a62fb6c..df1ecb42d7d 100644
--- a/tests/testsuite/cargo_remove/update_lock_file/mod.rs
+++ b/tests/testsuite/cargo_remove/update_lock_file/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);
 }
diff --git a/tests/testsuite/cargo_remove/workspace/mod.rs b/tests/testsuite/cargo_remove/workspace/mod.rs
index bce633f208f..ea9e4c1a8b9 100644
--- a/tests/testsuite/cargo_remove/workspace/mod.rs
+++ b/tests/testsuite/cargo_remove/workspace/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);
 }
diff --git a/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs b/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs
index bce633f208f..ea9e4c1a8b9 100644
--- a/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs
+++ b/tests/testsuite/cargo_remove/workspace_non_virtual/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);
 }
diff --git a/tests/testsuite/cargo_remove/workspace_preserved/mod.rs b/tests/testsuite/cargo_remove/workspace_preserved/mod.rs
index bce633f208f..ea9e4c1a8b9 100644
--- a/tests/testsuite/cargo_remove/workspace_preserved/mod.rs
+++ b/tests/testsuite/cargo_remove/workspace_preserved/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);
 }
diff --git a/tests/testsuite/cargo_report/help/mod.rs b/tests/testsuite/cargo_report/help/mod.rs
index 3f7bc9f9f71..c05e9e3372b 100644
--- a/tests/testsuite/cargo_report/help/mod.rs
+++ b/tests/testsuite/cargo_report/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![""]);
 }
diff --git a/tests/testsuite/cargo_run/help/mod.rs b/tests/testsuite/cargo_run/help/mod.rs
index 7f0ff7ec489..212ed276cdd 100644
--- a/tests/testsuite/cargo_run/help/mod.rs
+++ b/tests/testsuite/cargo_run/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![""]);
 }
diff --git a/tests/testsuite/cargo_rustc/help/mod.rs b/tests/testsuite/cargo_rustc/help/mod.rs
index 5d032da520d..87b66e825bc 100644
--- a/tests/testsuite/cargo_rustc/help/mod.rs
+++ b/tests/testsuite/cargo_rustc/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![""]);
 }
diff --git a/tests/testsuite/cargo_rustdoc/help/mod.rs b/tests/testsuite/cargo_rustdoc/help/mod.rs
index d04a1bb63e8..a1b2a0193f3 100644
--- a/tests/testsuite/cargo_rustdoc/help/mod.rs
+++ b/tests/testsuite/cargo_rustdoc/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![""]);
 }
diff --git a/tests/testsuite/cargo_search/help/mod.rs b/tests/testsuite/cargo_search/help/mod.rs
index 2bff19d428e..2b96bd572c9 100644
--- a/tests/testsuite/cargo_search/help/mod.rs
+++ b/tests/testsuite/cargo_search/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![""]);
 }
diff --git a/tests/testsuite/cargo_test/help/mod.rs b/tests/testsuite/cargo_test/help/mod.rs
index a9ae044de6e..a643dfdbe99 100644
--- a/tests/testsuite/cargo_test/help/mod.rs
+++ b/tests/testsuite/cargo_test/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![""]);
 }
diff --git a/tests/testsuite/cargo_test/no_keep_going/mod.rs b/tests/testsuite/cargo_test/no_keep_going/mod.rs
index 385a83c726c..a07cc64ae88 100644
--- a/tests/testsuite/cargo_test/no_keep_going/mod.rs
+++ b/tests/testsuite/cargo_test/no_keep_going/mod.rs
@@ -16,6 +16,6 @@ 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"]);
 }
diff --git a/tests/testsuite/cargo_tree/help/mod.rs b/tests/testsuite/cargo_tree/help/mod.rs
index bdeeb4caa58..6b10af23a31 100644
--- a/tests/testsuite/cargo_tree/help/mod.rs
+++ b/tests/testsuite/cargo_tree/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![""]);
 }
diff --git a/tests/testsuite/cargo_uninstall/help/mod.rs b/tests/testsuite/cargo_uninstall/help/mod.rs
index c9cdb66c972..48c84da1b47 100644
--- a/tests/testsuite/cargo_uninstall/help/mod.rs
+++ b/tests/testsuite/cargo_uninstall/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![""]);
 }
diff --git a/tests/testsuite/cargo_update/help/mod.rs b/tests/testsuite/cargo_update/help/mod.rs
index f7a2fb519aa..7bc15484cc7 100644
--- a/tests/testsuite/cargo_update/help/mod.rs
+++ b/tests/testsuite/cargo_update/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![""]);
 }
diff --git a/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs b/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs
index ccc373210c3..32055ac0ada 100644
--- a/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs
+++ b/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs
@@ -16,6 +16,6 @@ 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"]);
 }
diff --git a/tests/testsuite/cargo_vendor/help/mod.rs b/tests/testsuite/cargo_vendor/help/mod.rs
index d2669ca2f53..ede93a8f82c 100644
--- a/tests/testsuite/cargo_vendor/help/mod.rs
+++ b/tests/testsuite/cargo_vendor/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![""]);
 }
diff --git a/tests/testsuite/cargo_verify_project/help/mod.rs b/tests/testsuite/cargo_verify_project/help/mod.rs
index 882abde1a77..b5103db60ce 100644
--- a/tests/testsuite/cargo_verify_project/help/mod.rs
+++ b/tests/testsuite/cargo_verify_project/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![""]);
 }
diff --git a/tests/testsuite/cargo_version/help/mod.rs b/tests/testsuite/cargo_version/help/mod.rs
index dc303db184d..a86d204ae40 100644
--- a/tests/testsuite/cargo_version/help/mod.rs
+++ b/tests/testsuite/cargo_version/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![""]);
 }
diff --git a/tests/testsuite/cargo_yank/help/mod.rs b/tests/testsuite/cargo_yank/help/mod.rs
index 8d0473cafb8..93b5af05e1d 100644
--- a/tests/testsuite/cargo_yank/help/mod.rs
+++ b/tests/testsuite/cargo_yank/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![""]);
 }
diff --git a/tests/testsuite/lints/error/mod.rs b/tests/testsuite/lints/error/mod.rs
index c80c38313ca..bb4ff319aef 100644
--- a/tests/testsuite/lints/error/mod.rs
+++ b/tests/testsuite/lints/error/mod.rs
@@ -31,6 +31,6 @@ im_a_teapot = "deny"
         .arg("-Zcargo-lints")
         .assert()
         .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 }
diff --git a/tests/testsuite/lints/inherited/mod.rs b/tests/testsuite/lints/inherited/mod.rs
index 5085bea3748..81f4ffc6608 100644
--- a/tests/testsuite/lints/inherited/mod.rs
+++ b/tests/testsuite/lints/inherited/mod.rs
@@ -38,6 +38,6 @@ workspace = true
         .arg("-Zcargo-lints")
         .assert()
         .code(101)
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 }
diff --git a/tests/testsuite/lints/warning/mod.rs b/tests/testsuite/lints/warning/mod.rs
index 503261056e1..f1ec40f7655 100644
--- a/tests/testsuite/lints/warning/mod.rs
+++ b/tests/testsuite/lints/warning/mod.rs
@@ -31,6 +31,6 @@ im_a_teapot = "warn"
         .arg("-Zcargo-lints")
         .assert()
         .success()
-        .stdout_matches(str![""])
-        .stderr_matches(file!["stderr.term.svg"]);
+        .stdout_eq(str![""])
+        .stderr_eq(file!["stderr.term.svg"]);
 }