From 9af864ee550a1b62c7a3856d95813a97db072080 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Fri, 24 May 2024 12:22:19 -0500 Subject: [PATCH] refactor: Resolve deprecations --- crates/cargo-test-support/src/compare.rs | 2 +- credential/cargo-credential/tests/examples.rs | 8 ++++---- tests/testsuite/cargo/help/mod.rs | 4 ++-- tests/testsuite/cargo/z_help/mod.rs | 4 ++-- tests/testsuite/cargo_add/add_basic/mod.rs | 4 ++-- tests/testsuite/cargo_add/add_multiple/mod.rs | 4 ++-- .../add_no_vendored_package_with_alter_registry/mod.rs | 4 ++-- .../cargo_add/add_no_vendored_package_with_vendor/mod.rs | 4 ++-- .../cargo_add/add_normalized_name_external/mod.rs | 4 ++-- tests/testsuite/cargo_add/add_toolchain/mod.rs | 4 ++-- tests/testsuite/cargo_add/build/mod.rs | 4 ++-- .../cargo_add/build_prefer_existing_version/mod.rs | 4 ++-- tests/testsuite/cargo_add/change_rename_target/mod.rs | 4 ++-- tests/testsuite/cargo_add/cyclic_features/mod.rs | 4 ++-- tests/testsuite/cargo_add/default_features/mod.rs | 4 ++-- .../cargo_add/deprecated_default_features/mod.rs | 4 ++-- tests/testsuite/cargo_add/deprecated_section/mod.rs | 4 ++-- tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs | 4 ++-- .../cargo_add/detect_workspace_inherit_features/mod.rs | 4 ++-- .../cargo_add/detect_workspace_inherit_optional/mod.rs | 4 ++-- .../cargo_add/detect_workspace_inherit_public/mod.rs | 4 ++-- tests/testsuite/cargo_add/dev/mod.rs | 4 ++-- tests/testsuite/cargo_add/dev_build_conflict/mod.rs | 4 ++-- .../cargo_add/dev_prefer_existing_version/mod.rs | 4 ++-- tests/testsuite/cargo_add/dry_run/mod.rs | 4 ++-- tests/testsuite/cargo_add/empty_dep_name/mod.rs | 4 ++-- tests/testsuite/cargo_add/features/mod.rs | 4 ++-- .../cargo_add/features_activated_over_limit/mod.rs | 4 ++-- .../cargo_add/features_deactivated_over_limit/mod.rs | 4 ++-- tests/testsuite/cargo_add/features_empty/mod.rs | 4 ++-- .../cargo_add/features_multiple_occurrences/mod.rs | 4 ++-- tests/testsuite/cargo_add/features_preserve/mod.rs | 4 ++-- tests/testsuite/cargo_add/features_spaced_values/mod.rs | 4 ++-- tests/testsuite/cargo_add/features_unknown/mod.rs | 4 ++-- .../cargo_add/features_unknown_no_features/mod.rs | 4 ++-- tests/testsuite/cargo_add/git/mod.rs | 4 ++-- tests/testsuite/cargo_add/git_branch/mod.rs | 4 ++-- tests/testsuite/cargo_add/git_conflicts_namever/mod.rs | 4 ++-- tests/testsuite/cargo_add/git_dev/mod.rs | 4 ++-- tests/testsuite/cargo_add/git_inferred_name/mod.rs | 4 ++-- .../testsuite/cargo_add/git_inferred_name_multiple/mod.rs | 4 ++-- tests/testsuite/cargo_add/git_multiple_names/mod.rs | 4 ++-- .../cargo_add/git_multiple_packages_features/mod.rs | 4 ++-- tests/testsuite/cargo_add/git_normalized_name/mod.rs | 4 ++-- tests/testsuite/cargo_add/git_registry/mod.rs | 4 ++-- tests/testsuite/cargo_add/git_rev/mod.rs | 4 ++-- tests/testsuite/cargo_add/git_tag/mod.rs | 4 ++-- tests/testsuite/cargo_add/help/mod.rs | 4 ++-- tests/testsuite/cargo_add/infer_prerelease/mod.rs | 4 ++-- tests/testsuite/cargo_add/invalid_arg/mod.rs | 4 ++-- tests/testsuite/cargo_add/invalid_git_name/mod.rs | 4 ++-- .../cargo_add/invalid_key_inherit_dependency/mod.rs | 4 ++-- .../invalid_key_overwrite_inherit_dependency/mod.rs | 4 ++-- .../invalid_key_rename_inherit_dependency/mod.rs | 4 ++-- tests/testsuite/cargo_add/invalid_manifest/mod.rs | 4 ++-- tests/testsuite/cargo_add/invalid_name_external/mod.rs | 4 ++-- tests/testsuite/cargo_add/invalid_path/mod.rs | 4 ++-- tests/testsuite/cargo_add/invalid_path_name/mod.rs | 4 ++-- tests/testsuite/cargo_add/invalid_path_self/mod.rs | 4 ++-- tests/testsuite/cargo_add/invalid_target_empty/mod.rs | 4 ++-- tests/testsuite/cargo_add/invalid_vers/mod.rs | 4 ++-- tests/testsuite/cargo_add/list_features/mod.rs | 4 ++-- tests/testsuite/cargo_add/list_features_path/mod.rs | 4 ++-- .../cargo_add/list_features_path_no_default/mod.rs | 4 ++-- tests/testsuite/cargo_add/locked_changed/mod.rs | 4 ++-- tests/testsuite/cargo_add/locked_unchanged/mod.rs | 4 ++-- tests/testsuite/cargo_add/lockfile_updated/mod.rs | 4 ++-- tests/testsuite/cargo_add/manifest_path_package/mod.rs | 4 ++-- tests/testsuite/cargo_add/merge_activated_features/mod.rs | 4 ++-- .../cargo_add/multiple_conflicts_with_features/mod.rs | 4 ++-- .../cargo_add/multiple_conflicts_with_rename/mod.rs | 4 ++-- tests/testsuite/cargo_add/namever/mod.rs | 4 ++-- tests/testsuite/cargo_add/no_args/mod.rs | 4 ++-- tests/testsuite/cargo_add/no_default_features/mod.rs | 4 ++-- tests/testsuite/cargo_add/no_optional/mod.rs | 4 ++-- tests/testsuite/cargo_add/no_public/mod.rs | 4 ++-- tests/testsuite/cargo_add/offline_empty_cache/mod.rs | 4 ++-- tests/testsuite/cargo_add/optional/mod.rs | 4 ++-- .../testsuite/cargo_add/overwrite_default_features/mod.rs | 4 ++-- .../mod.rs | 4 ++-- tests/testsuite/cargo_add/overwrite_features/mod.rs | 4 ++-- tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs | 4 ++-- .../cargo_add/overwrite_inherit_features_noop/mod.rs | 4 ++-- tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs | 4 ++-- .../cargo_add/overwrite_inherit_optional_noop/mod.rs | 4 ++-- .../testsuite/cargo_add/overwrite_inline_features/mod.rs | 4 ++-- tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs | 4 ++-- tests/testsuite/cargo_add/overwrite_name_noop/mod.rs | 4 ++-- .../cargo_add/overwrite_no_default_features/mod.rs | 4 ++-- .../mod.rs | 4 ++-- tests/testsuite/cargo_add/overwrite_no_optional/mod.rs | 4 ++-- .../cargo_add/overwrite_no_optional_with_optional/mod.rs | 4 ++-- tests/testsuite/cargo_add/overwrite_no_public/mod.rs | 4 ++-- .../cargo_add/overwrite_no_public_with_public/mod.rs | 4 ++-- tests/testsuite/cargo_add/overwrite_optional/mod.rs | 4 ++-- .../cargo_add/overwrite_optional_with_no_optional/mod.rs | 4 ++-- .../cargo_add/overwrite_optional_with_optional/mod.rs | 4 ++-- tests/testsuite/cargo_add/overwrite_path_noop/mod.rs | 4 ++-- .../cargo_add/overwrite_path_with_version/mod.rs | 4 ++-- .../cargo_add/overwrite_preserves_inline_table/mod.rs | 4 ++-- tests/testsuite/cargo_add/overwrite_public/mod.rs | 4 ++-- .../cargo_add/overwrite_public_with_no_public/mod.rs | 4 ++-- .../cargo_add/overwrite_rename_with_no_rename/mod.rs | 4 ++-- .../cargo_add/overwrite_rename_with_rename/mod.rs | 4 ++-- .../cargo_add/overwrite_rename_with_rename_noop/mod.rs | 4 ++-- .../testsuite/cargo_add/overwrite_version_with_git/mod.rs | 4 ++-- .../cargo_add/overwrite_version_with_path/mod.rs | 4 ++-- tests/testsuite/cargo_add/overwrite_with_rename/mod.rs | 4 ++-- tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs | 4 ++-- .../cargo_add/overwrite_workspace_dep_features/mod.rs | 4 ++-- tests/testsuite/cargo_add/path/mod.rs | 4 ++-- tests/testsuite/cargo_add/path_dev/mod.rs | 4 ++-- tests/testsuite/cargo_add/path_inferred_name/mod.rs | 4 ++-- .../path_inferred_name_conflicts_full_feature/mod.rs | 4 ++-- tests/testsuite/cargo_add/path_normalized_name/mod.rs | 4 ++-- tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs | 4 ++-- tests/testsuite/cargo_add/preserve_features_sorted/mod.rs | 4 ++-- tests/testsuite/cargo_add/preserve_features_table/mod.rs | 4 ++-- .../testsuite/cargo_add/preserve_features_unsorted/mod.rs | 4 ++-- tests/testsuite/cargo_add/preserve_sorted/mod.rs | 4 ++-- tests/testsuite/cargo_add/preserve_unsorted/mod.rs | 4 ++-- tests/testsuite/cargo_add/public/mod.rs | 4 ++-- tests/testsuite/cargo_add/quiet/mod.rs | 4 ++-- tests/testsuite/cargo_add/registry/mod.rs | 4 ++-- tests/testsuite/cargo_add/rename/mod.rs | 4 ++-- tests/testsuite/cargo_add/require_weak/mod.rs | 4 ++-- tests/testsuite/cargo_add/rust_version_ignore/mod.rs | 4 ++-- .../testsuite/cargo_add/rust_version_incompatible/mod.rs | 4 ++-- tests/testsuite/cargo_add/rust_version_latest/mod.rs | 4 ++-- tests/testsuite/cargo_add/rust_version_older/mod.rs | 4 ++-- tests/testsuite/cargo_add/rustc_ignore/mod.rs | 4 ++-- tests/testsuite/cargo_add/rustc_incompatible/mod.rs | 4 ++-- tests/testsuite/cargo_add/rustc_latest/mod.rs | 4 ++-- tests/testsuite/cargo_add/rustc_older/mod.rs | 4 ++-- .../cargo_add/sorted_table_with_dotted_item/mod.rs | 4 ++-- tests/testsuite/cargo_add/target/mod.rs | 4 ++-- tests/testsuite/cargo_add/target_cfg/mod.rs | 4 ++-- .../testsuite/cargo_add/unknown_inherited_feature/mod.rs | 4 ++-- tests/testsuite/cargo_add/vers/mod.rs | 4 ++-- tests/testsuite/cargo_add/workspace_name/mod.rs | 4 ++-- tests/testsuite/cargo_add/workspace_path/mod.rs | 4 ++-- tests/testsuite/cargo_add/workspace_path_dev/mod.rs | 4 ++-- tests/testsuite/cargo_bench/help/mod.rs | 4 ++-- tests/testsuite/cargo_bench/no_keep_going/mod.rs | 4 ++-- tests/testsuite/cargo_build/help/mod.rs | 4 ++-- tests/testsuite/cargo_check/help/mod.rs | 4 ++-- tests/testsuite/cargo_clean/help/mod.rs | 4 ++-- tests/testsuite/cargo_config/help/mod.rs | 4 ++-- tests/testsuite/cargo_doc/help/mod.rs | 4 ++-- tests/testsuite/cargo_fetch/help/mod.rs | 4 ++-- tests/testsuite/cargo_fix/help/mod.rs | 4 ++-- tests/testsuite/cargo_generate_lockfile/help/mod.rs | 4 ++-- tests/testsuite/cargo_git_checkout/help/mod.rs | 4 ++-- tests/testsuite/cargo_help/help/mod.rs | 4 ++-- tests/testsuite/cargo_init/auto_git/mod.rs | 4 ++-- .../cargo_init/bin_already_exists_explicit/mod.rs | 4 ++-- .../cargo_init/bin_already_exists_explicit_nosrc/mod.rs | 4 ++-- .../cargo_init/bin_already_exists_implicit/mod.rs | 4 ++-- .../bin_already_exists_implicit_namenosrc/mod.rs | 4 ++-- .../cargo_init/bin_already_exists_implicit_namesrc/mod.rs | 4 ++-- .../cargo_init/bin_already_exists_implicit_nosrc/mod.rs | 4 ++-- tests/testsuite/cargo_init/both_lib_and_bin/mod.rs | 4 ++-- .../cant_create_library_when_both_binlib_present/mod.rs | 4 ++-- .../cargo_init/confused_by_multiple_lib_files/mod.rs | 4 ++-- .../creates_binary_when_both_binlib_present/mod.rs | 4 ++-- .../mod.rs | 4 ++-- .../mod.rs | 4 ++-- tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs | 4 ++-- tests/testsuite/cargo_init/formats_source/mod.rs | 4 ++-- tests/testsuite/cargo_init/fossil_autodetect/mod.rs | 4 ++-- tests/testsuite/cargo_init/git_autodetect/mod.rs | 4 ++-- .../git_ignore_exists_no_conflicting_entries/mod.rs | 4 ++-- tests/testsuite/cargo_init/help/mod.rs | 4 ++-- .../cargo_init/ignores_failure_to_format_source/mod.rs | 4 ++-- tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs | 4 ++-- tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs | 4 ++-- .../cargo_init/inherit_workspace_package_table/mod.rs | 4 ++-- tests/testsuite/cargo_init/invalid_dir_name/mod.rs | 4 ++-- .../testsuite/cargo_init/lib_already_exists_nosrc/mod.rs | 4 ++-- tests/testsuite/cargo_init/lib_already_exists_src/mod.rs | 4 ++-- tests/testsuite/cargo_init/mercurial_autodetect/mod.rs | 4 ++-- .../cargo_init/multibin_project_name_clash/mod.rs | 4 ++-- tests/testsuite/cargo_init/no_filename/mod.rs | 4 ++-- tests/testsuite/cargo_init/path_contains_separator/mod.rs | 4 ++-- tests/testsuite/cargo_init/pijul_autodetect/mod.rs | 4 ++-- tests/testsuite/cargo_init/reserved_name/mod.rs | 4 ++-- tests/testsuite/cargo_init/simple_bin/mod.rs | 4 ++-- tests/testsuite/cargo_init/simple_git/mod.rs | 4 ++-- .../testsuite/cargo_init/simple_git_ignore_exists/mod.rs | 4 ++-- tests/testsuite/cargo_init/simple_hg/mod.rs | 4 ++-- tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs | 4 ++-- tests/testsuite/cargo_init/simple_lib/mod.rs | 4 ++-- tests/testsuite/cargo_init/unknown_flags/mod.rs | 4 ++-- tests/testsuite/cargo_init/with_argument/mod.rs | 4 ++-- tests/testsuite/cargo_init/workspace_add_member/mod.rs | 4 ++-- tests/testsuite/cargo_install/help/mod.rs | 4 ++-- tests/testsuite/cargo_locate_project/help/mod.rs | 4 ++-- tests/testsuite/cargo_login/help/mod.rs | 4 ++-- tests/testsuite/cargo_logout/help/mod.rs | 4 ++-- tests/testsuite/cargo_metadata/help/mod.rs | 4 ++-- .../cargo_new/add_members_to_non_workspace/mod.rs | 4 ++-- .../add_members_to_workspace_format_previous_items/mod.rs | 4 ++-- .../add_members_to_workspace_format_sorted/mod.rs | 4 ++-- .../mod.rs | 4 ++-- .../add_members_to_workspace_with_empty_members/mod.rs | 4 ++-- .../add_members_to_workspace_with_exclude_list/mod.rs | 4 ++-- .../add_members_to_workspace_with_members_glob/mod.rs | 4 ++-- .../add_members_to_workspace_without_members/mod.rs | 4 ++-- tests/testsuite/cargo_new/empty_name/mod.rs | 4 ++-- tests/testsuite/cargo_new/help/mod.rs | 4 ++-- tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs | 4 ++-- .../cargo_new/inherit_workspace_package_table/mod.rs | 4 ++-- .../inherit_workspace_package_table_with_edition/mod.rs | 4 ++-- .../inherit_workspace_package_table_with_registry/mod.rs | 4 ++-- .../mod.rs | 4 ++-- .../mod.rs | 4 ++-- tests/testsuite/cargo_owner/help/mod.rs | 4 ++-- tests/testsuite/cargo_package/help/mod.rs | 4 ++-- tests/testsuite/cargo_pkgid/help/mod.rs | 4 ++-- tests/testsuite/cargo_publish/help/mod.rs | 4 ++-- tests/testsuite/cargo_read_manifest/help/mod.rs | 4 ++-- tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs | 4 ++-- tests/testsuite/cargo_remove/build/mod.rs | 4 ++-- tests/testsuite/cargo_remove/dev/mod.rs | 4 ++-- tests/testsuite/cargo_remove/dry_run/mod.rs | 4 ++-- tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs | 4 ++-- tests/testsuite/cargo_remove/gc_patch/mod.rs | 4 ++-- tests/testsuite/cargo_remove/gc_profile/mod.rs | 4 ++-- tests/testsuite/cargo_remove/gc_replace/mod.rs | 4 ++-- tests/testsuite/cargo_remove/help/mod.rs | 4 ++-- tests/testsuite/cargo_remove/invalid_arg/mod.rs | 4 ++-- tests/testsuite/cargo_remove/invalid_dep/mod.rs | 4 ++-- tests/testsuite/cargo_remove/invalid_package/mod.rs | 4 ++-- .../cargo_remove/invalid_package_multiple/mod.rs | 4 ++-- tests/testsuite/cargo_remove/invalid_section/mod.rs | 4 ++-- tests/testsuite/cargo_remove/invalid_section_dep/mod.rs | 4 ++-- tests/testsuite/cargo_remove/invalid_target/mod.rs | 4 ++-- tests/testsuite/cargo_remove/invalid_target_dep/mod.rs | 4 ++-- tests/testsuite/cargo_remove/multiple_deps/mod.rs | 4 ++-- tests/testsuite/cargo_remove/multiple_dev/mod.rs | 4 ++-- tests/testsuite/cargo_remove/no_arg/mod.rs | 4 ++-- tests/testsuite/cargo_remove/offline/mod.rs | 4 ++-- tests/testsuite/cargo_remove/optional_dep_feature/mod.rs | 4 ++-- .../cargo_remove/optional_dep_feature_formatting/mod.rs | 4 ++-- tests/testsuite/cargo_remove/optional_feature/mod.rs | 4 ++-- tests/testsuite/cargo_remove/package/mod.rs | 4 ++-- tests/testsuite/cargo_remove/remove_basic/mod.rs | 4 ++-- tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs | 4 ++-- tests/testsuite/cargo_remove/target/mod.rs | 4 ++-- tests/testsuite/cargo_remove/target_build/mod.rs | 4 ++-- tests/testsuite/cargo_remove/target_dev/mod.rs | 4 ++-- tests/testsuite/cargo_remove/update_lock_file/mod.rs | 4 ++-- tests/testsuite/cargo_remove/workspace/mod.rs | 4 ++-- tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs | 4 ++-- tests/testsuite/cargo_remove/workspace_preserved/mod.rs | 4 ++-- tests/testsuite/cargo_report/help/mod.rs | 4 ++-- tests/testsuite/cargo_run/help/mod.rs | 4 ++-- tests/testsuite/cargo_rustc/help/mod.rs | 4 ++-- tests/testsuite/cargo_rustdoc/help/mod.rs | 4 ++-- tests/testsuite/cargo_search/help/mod.rs | 4 ++-- tests/testsuite/cargo_test/help/mod.rs | 4 ++-- tests/testsuite/cargo_test/no_keep_going/mod.rs | 4 ++-- tests/testsuite/cargo_tree/help/mod.rs | 4 ++-- tests/testsuite/cargo_uninstall/help/mod.rs | 4 ++-- tests/testsuite/cargo_update/help/mod.rs | 4 ++-- tests/testsuite/cargo_update/toolchain_pkgname/mod.rs | 4 ++-- tests/testsuite/cargo_vendor/help/mod.rs | 4 ++-- tests/testsuite/cargo_verify_project/help/mod.rs | 4 ++-- tests/testsuite/cargo_version/help/mod.rs | 4 ++-- tests/testsuite/cargo_yank/help/mod.rs | 4 ++-- tests/testsuite/lints/error/mod.rs | 4 ++-- tests/testsuite/lints/inherited/mod.rs | 4 ++-- tests/testsuite/lints/warning/mod.rs | 4 ++-- 273 files changed, 547 insertions(+), 547 deletions(-) diff --git a/crates/cargo-test-support/src/compare.rs b/crates/cargo-test-support/src/compare.rs index 4ccc7f26361..92745bb8690 100644 --- a/crates/cargo-test-support/src/compare.rs +++ b/crates/cargo-test-support/src/compare.rs @@ -88,7 +88,7 @@ pub fn assert_ui() -> snapbox::Assert { subs.insert("[ROOTURL]", root_url).unwrap(); snapbox::Assert::new() .action_env(snapbox::assert::DEFAULT_ACTION_ENV) - .substitutions(subs) + .redact_with(subs) } /// Normalizes the output so that it can be compared against the expected value. diff --git a/credential/cargo-credential/tests/examples.rs b/credential/cargo-credential/tests/examples.rs index fc9f2e746f5..6844642baef 100644 --- a/credential/cargo-credential/tests/examples.rs +++ b/credential/cargo-credential/tests/examples.rs @@ -15,8 +15,8 @@ fn stdout_redirected() { .stdin(format!("{get_request}\n")) .arg("--cargo-plugin") .assert() - .stdout_eq_(format!("{hello}\n{err_not_supported}\n").raw()) - .stderr_eq_("message on stderr should be sent to the parent process\n".raw()) + .stdout_eq(format!("{hello}\n{err_not_supported}\n").raw()) + .stderr_eq("message on stderr should be sent to the parent process\n".raw()) .success(); } @@ -39,8 +39,8 @@ fn file_provider() { .stdin(format!("{login_request}\n{get_request}\n")) .arg("--cargo-plugin") .assert() - .stdout_eq_(format!("{hello}\n{login_response}\n{get_response}\n").raw()) - .stderr_eq_("".raw()) + .stdout_eq(format!("{hello}\n{login_response}\n{get_response}\n").raw()) + .stderr_eq("".raw()) .success(); std::fs::remove_dir_all(&dir).unwrap(); } diff --git a/tests/testsuite/cargo/help/mod.rs b/tests/testsuite/cargo/help/mod.rs index af5cf490b6e..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(str![""]); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(str![""]); } diff --git a/tests/testsuite/cargo/z_help/mod.rs b/tests/testsuite/cargo/z_help/mod.rs index 323a9a71cfe..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(str![""]); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(str![""]); } diff --git a/tests/testsuite/cargo_add/add_basic/mod.rs b/tests/testsuite/cargo_add/add_basic/mod.rs index 0b545d010ad..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/add_multiple/mod.rs b/tests/testsuite/cargo_add/add_multiple/mod.rs index 792e08c632f..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/mod.rs b/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/mod.rs index 3cadfb3910c..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs b/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs index 936a5fe1aee..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs b/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs index ab8d10f0097..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/add_toolchain/mod.rs b/tests/testsuite/cargo_add/add_toolchain/mod.rs index e4c4e65cc2a..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/build/mod.rs b/tests/testsuite/cargo_add/build/mod.rs index 0a7e1e615f1..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs b/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs index 4c6c3ef026e..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/change_rename_target/mod.rs b/tests/testsuite/cargo_add/change_rename_target/mod.rs index fa0080332d3..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/cyclic_features/mod.rs b/tests/testsuite/cargo_add/cyclic_features/mod.rs index 70f3b8a01fa..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/default_features/mod.rs b/tests/testsuite/cargo_add/default_features/mod.rs index 89006b0127f..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/deprecated_default_features/mod.rs b/tests/testsuite/cargo_add/deprecated_default_features/mod.rs index 1b0f676ce3b..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/deprecated_section/mod.rs b/tests/testsuite/cargo_add/deprecated_section/mod.rs index 1b0f676ce3b..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs index 620dfad08a8..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs index cdfafd62773..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs index 35dd0f71dc4..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs index 2c30fe7eaf0..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/dev/mod.rs b/tests/testsuite/cargo_add/dev/mod.rs index 394316fa29f..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/dev_build_conflict/mod.rs b/tests/testsuite/cargo_add/dev_build_conflict/mod.rs index 86b536d159a..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs b/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs index fb64785448d..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/dry_run/mod.rs b/tests/testsuite/cargo_add/dry_run/mod.rs index 396c4eead36..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/empty_dep_name/mod.rs b/tests/testsuite/cargo_add/empty_dep_name/mod.rs index 2ac0c7b9c61..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features/mod.rs b/tests/testsuite/cargo_add/features/mod.rs index d880c50a7dd..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs b/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs index fb44fa8a3da..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs b/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs index ec679cf5a6b..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_empty/mod.rs b/tests/testsuite/cargo_add/features_empty/mod.rs index 50a8713f38c..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs b/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs index c1e6f3290c9..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_preserve/mod.rs b/tests/testsuite/cargo_add/features_preserve/mod.rs index eee7f7d840f..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_spaced_values/mod.rs b/tests/testsuite/cargo_add/features_spaced_values/mod.rs index 6e346ec4057..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_unknown/mod.rs b/tests/testsuite/cargo_add/features_unknown/mod.rs index 9ff253aa06a..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs b/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs index 984b9f1d9bb..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git/mod.rs b/tests/testsuite/cargo_add/git/mod.rs index 5e206686252..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_branch/mod.rs b/tests/testsuite/cargo_add/git_branch/mod.rs index e5ca8ec32cb..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs b/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs index 3ddbb202b1a..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_dev/mod.rs b/tests/testsuite/cargo_add/git_dev/mod.rs index 57ddfad9b6e..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_inferred_name/mod.rs b/tests/testsuite/cargo_add/git_inferred_name/mod.rs index f608f842b70..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs b/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs index ac9bf5be7dc..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_multiple_names/mod.rs b/tests/testsuite/cargo_add/git_multiple_names/mod.rs index cf1039c5156..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs b/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs index b177cdb1fc7..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_normalized_name/mod.rs b/tests/testsuite/cargo_add/git_normalized_name/mod.rs index 2a8f9f7dcb8..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_registry/mod.rs b/tests/testsuite/cargo_add/git_registry/mod.rs index b9f66af2ea3..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_rev/mod.rs b/tests/testsuite/cargo_add/git_rev/mod.rs index 69a5c3728fe..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_tag/mod.rs b/tests/testsuite/cargo_add/git_tag/mod.rs index d01d278bf41..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/help/mod.rs b/tests/testsuite/cargo_add/help/mod.rs index f6152082e4b..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 5e961d8c300..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_arg/mod.rs b/tests/testsuite/cargo_add/invalid_arg/mod.rs index a20bf56daf2..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_git_name/mod.rs b/tests/testsuite/cargo_add/invalid_git_name/mod.rs index d853fd48f8b..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs index 45627c9a7fd..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs index 45627c9a7fd..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs index e4ddc98db7c..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_manifest/mod.rs b/tests/testsuite/cargo_add/invalid_manifest/mod.rs index c7ff7671ef9..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_name_external/mod.rs b/tests/testsuite/cargo_add/invalid_name_external/mod.rs index cb74d337ecc..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_path/mod.rs b/tests/testsuite/cargo_add/invalid_path/mod.rs index aa42a61a1e8..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_path_name/mod.rs b/tests/testsuite/cargo_add/invalid_path_name/mod.rs index af5b5f33397..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_path_self/mod.rs b/tests/testsuite/cargo_add/invalid_path_self/mod.rs index 250e0430964..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_target_empty/mod.rs b/tests/testsuite/cargo_add/invalid_target_empty/mod.rs index f756fff8542..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_vers/mod.rs b/tests/testsuite/cargo_add/invalid_vers/mod.rs index 561ab96f852..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/list_features/mod.rs b/tests/testsuite/cargo_add/list_features/mod.rs index 683fd300edb..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/list_features_path/mod.rs b/tests/testsuite/cargo_add/list_features_path/mod.rs index ac20d605b9b..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs b/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs index 31119e5cf7b..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/locked_changed/mod.rs b/tests/testsuite/cargo_add/locked_changed/mod.rs index 3674b6ea2c0..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/locked_unchanged/mod.rs b/tests/testsuite/cargo_add/locked_unchanged/mod.rs index 43aa7098d61..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/lockfile_updated/mod.rs b/tests/testsuite/cargo_add/lockfile_updated/mod.rs index 47719cade87..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/manifest_path_package/mod.rs b/tests/testsuite/cargo_add/manifest_path_package/mod.rs index 03367bb0593..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/merge_activated_features/mod.rs b/tests/testsuite/cargo_add/merge_activated_features/mod.rs index a3741117569..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs b/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs index f67373b07f9..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs index 5ab1849dc63..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/namever/mod.rs b/tests/testsuite/cargo_add/namever/mod.rs index 07604452517..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/no_args/mod.rs b/tests/testsuite/cargo_add/no_args/mod.rs index 3f817962061..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/no_default_features/mod.rs b/tests/testsuite/cargo_add/no_default_features/mod.rs index 3acfff71c43..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/no_optional/mod.rs b/tests/testsuite/cargo_add/no_optional/mod.rs index 46b3bbb910e..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/no_public/mod.rs b/tests/testsuite/cargo_add/no_public/mod.rs index 7083a91bce7..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/offline_empty_cache/mod.rs b/tests/testsuite/cargo_add/offline_empty_cache/mod.rs index 3bdda2ba34c..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/optional/mod.rs b/tests/testsuite/cargo_add/optional/mod.rs index 4c982e87822..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_default_features/mod.rs index 89006b0127f..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs index 3acfff71c43..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_features/mod.rs b/tests/testsuite/cargo_add/overwrite_features/mod.rs index 52ffdf3e91e..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs b/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs index 849594c82ef..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs index 620dfad08a8..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs index 620dfad08a8..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs index 620dfad08a8..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs b/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs index 6448e1017e5..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs index 7fa1a30b78c..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs index 89ec7c248b4..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs index 3acfff71c43..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/mod.rs index 89006b0127f..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs index 46b3bbb910e..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs index 4c982e87822..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_public/mod.rs b/tests/testsuite/cargo_add/overwrite_no_public/mod.rs index 7083a91bce7..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs b/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs index 3191f6afa87..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional/mod.rs index 4c982e87822..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs index 5e5abbddf7e..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs index 25647dde983..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs index 994630ed493..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs b/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs index 5dfd986cd9f..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs index 52ffdf3e91e..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_public/mod.rs b/tests/testsuite/cargo_add/overwrite_public/mod.rs index 3191f6afa87..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs b/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs index 7083a91bce7..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs index 1159cac5e71..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs index cfd18954d58..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs index 8d45f006584..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs b/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs index 8aa49d41f28..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs b/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs index 849594c82ef..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs index 28ccd2e5bc0..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs b/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs index 3f4dcd800bd..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs index 3f4dcd800bd..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/path/mod.rs b/tests/testsuite/cargo_add/path/mod.rs index 849594c82ef..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/path_dev/mod.rs b/tests/testsuite/cargo_add/path_dev/mod.rs index b2524ab1d5c..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/path_inferred_name/mod.rs b/tests/testsuite/cargo_add/path_inferred_name/mod.rs index 849594c82ef..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs index bde4707ec3f..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/path_normalized_name/mod.rs b/tests/testsuite/cargo_add/path_normalized_name/mod.rs index d25adbf7096..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs b/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs index 3074e9aa6a3..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/preserve_features_sorted/mod.rs b/tests/testsuite/cargo_add/preserve_features_sorted/mod.rs index 417385baa20..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/preserve_features_table/mod.rs b/tests/testsuite/cargo_add/preserve_features_table/mod.rs index 3074e9aa6a3..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/preserve_features_unsorted/mod.rs b/tests/testsuite/cargo_add/preserve_features_unsorted/mod.rs index 31885171c64..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/preserve_sorted/mod.rs b/tests/testsuite/cargo_add/preserve_sorted/mod.rs index 95b6b277195..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/preserve_unsorted/mod.rs b/tests/testsuite/cargo_add/preserve_unsorted/mod.rs index 95b6b277195..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/public/mod.rs b/tests/testsuite/cargo_add/public/mod.rs index 3191f6afa87..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/quiet/mod.rs b/tests/testsuite/cargo_add/quiet/mod.rs index 4b0532ac7b1..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_eq_(str![""]) - .stderr_eq_(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 85883eff777..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rename/mod.rs b/tests/testsuite/cargo_add/rename/mod.rs index a0be1e305bc..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/require_weak/mod.rs b/tests/testsuite/cargo_add/require_weak/mod.rs index 3074e9aa6a3..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rust_version_ignore/mod.rs b/tests/testsuite/cargo_add/rust_version_ignore/mod.rs index 888b5e8d0b3..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs b/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs index d6871b2f4c3..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rust_version_latest/mod.rs b/tests/testsuite/cargo_add/rust_version_latest/mod.rs index 3cbd3ad890c..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rust_version_older/mod.rs b/tests/testsuite/cargo_add/rust_version_older/mod.rs index 3cbd3ad890c..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rustc_ignore/mod.rs b/tests/testsuite/cargo_add/rustc_ignore/mod.rs index d1b4b1ed404..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rustc_incompatible/mod.rs b/tests/testsuite/cargo_add/rustc_incompatible/mod.rs index 039ab560f37..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rustc_latest/mod.rs b/tests/testsuite/cargo_add/rustc_latest/mod.rs index c331ec70df0..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rustc_older/mod.rs b/tests/testsuite/cargo_add/rustc_older/mod.rs index c331ec70df0..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs index 9c4f7ddf962..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/target/mod.rs b/tests/testsuite/cargo_add/target/mod.rs index ef548469264..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/target_cfg/mod.rs b/tests/testsuite/cargo_add/target_cfg/mod.rs index 9ca1fc9d560..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs b/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs index fc9e69ee2df..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/vers/mod.rs b/tests/testsuite/cargo_add/vers/mod.rs index c5af9fb35a7..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/workspace_name/mod.rs b/tests/testsuite/cargo_add/workspace_name/mod.rs index 3bb7113b673..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/workspace_path/mod.rs b/tests/testsuite/cargo_add/workspace_path/mod.rs index 849594c82ef..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/workspace_path_dev/mod.rs b/tests/testsuite/cargo_add/workspace_path_dev/mod.rs index b2524ab1d5c..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_bench/help/mod.rs b/tests/testsuite/cargo_bench/help/mod.rs index 57884b80066..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 571a64c68ad..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_eq_(str![""]) - .stderr_eq_(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 4fd400a267b..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 ae41e817a31..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 fc2e612b3c4..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 ce2b86bd01c..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 e1b5f1db3bc..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 67ddf52f62d..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 7d77a8dca8a..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 0ecbadee13b..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 ccd6820de17..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 2b557d7ae77..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 f0d1a705f83..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); 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 334e7ebba36..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs index 22ba67ba02b..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 58cc075efc5..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs index 5931792b4f6..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 07607640a1f..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 5931792b4f6..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 fac4806704a..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_eq_(str![""]) - .stderr_eq_(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 73aa436b661..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_eq_(str![""]) - .stderr_eq_(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 bd78028314c..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 334e7ebba36..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_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 334e7ebba36..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_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 f6d03d64905..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs b/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs index 1384a4622ad..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/formats_source/mod.rs b/tests/testsuite/cargo_init/formats_source/mod.rs index b77e0eb494e..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/fossil_autodetect/mod.rs b/tests/testsuite/cargo_init/fossil_autodetect/mod.rs index 21f1e8b9113..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 526b6222bb3..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 bae79983699..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 48203f3b306..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 55a12bec317..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs b/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs index 211f2e9fd43..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs b/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs index 211f2e9fd43..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs b/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs index c7f34a37c5b..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_init/invalid_dir_name/mod.rs b/tests/testsuite/cargo_init/invalid_dir_name/mod.rs index c5ddef2b50e..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_eq_(str![""]) - .stderr_eq_(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 07607640a1f..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 07607640a1f..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 21f1e8b9113..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 3f796da176f..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 7dfe7fff1ea..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_eq_(str![""]) - .stderr_eq_(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 72502da8d53..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 21f1e8b9113..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 35cf325a3a5..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_eq_(str![""]) - .stderr_eq_(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 2614d766e4f..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 909ddc234e1..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 7908a5a28a8..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 84f67859e67..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 21f1e8b9113..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 c4096c504ea..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); 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 879dbd60f08..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_eq_(str![""]) - .stderr_eq_(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 d2835c21c85..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/workspace_add_member/mod.rs b/tests/testsuite/cargo_init/workspace_add_member/mod.rs index 40d826b4315..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_install/help/mod.rs b/tests/testsuite/cargo_install/help/mod.rs index 9028cbba67d..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 34f408c569e..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 f7b094c070f..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 ba8c1e575dc..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 ee8b069afeb..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 eb531e5d636..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_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 73bad2cb3c4..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs index 73bad2cb3c4..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_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 ae32f50f214..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_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 73bad2cb3c4..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_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 73bad2cb3c4..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_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 73bad2cb3c4..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs index eb531e5d636..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/empty_name/mod.rs b/tests/testsuite/cargo_new/empty_name/mod.rs index 03c40c6b9a3..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/help/mod.rs b/tests/testsuite/cargo_new/help/mod.rs index fee77d8866a..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 73bad2cb3c4..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs index 73bad2cb3c4..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs index 6c977833b73..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs index a3ede70e51c..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs index 73bad2cb3c4..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_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 0cd783e9a6e..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_owner/help/mod.rs b/tests/testsuite/cargo_owner/help/mod.rs index bcd14983a7e..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 9ad56200890..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 dda06f0aabb..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 39e4c30a3b7..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 11f9848e4ff..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 ccac2ac3a0d..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/build/mod.rs b/tests/testsuite/cargo_remove/build/mod.rs index 36abb679533..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/dev/mod.rs b/tests/testsuite/cargo_remove/dev/mod.rs index a5a0313c573..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/dry_run/mod.rs b/tests/testsuite/cargo_remove/dry_run/mod.rs index 649b9d4a36b..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs b/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs index 0e84f782b07..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/gc_patch/mod.rs b/tests/testsuite/cargo_remove/gc_patch/mod.rs index 598706fe2b1..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &in_project.root()); } diff --git a/tests/testsuite/cargo_remove/gc_profile/mod.rs b/tests/testsuite/cargo_remove/gc_profile/mod.rs index e63a41cc627..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/gc_replace/mod.rs b/tests/testsuite/cargo_remove/gc_replace/mod.rs index e60d610d665..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/help/mod.rs b/tests/testsuite/cargo_remove/help/mod.rs index cfb93eb0e89..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 19f043b4620..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_dep/mod.rs index da1bd42d76b..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_package/mod.rs b/tests/testsuite/cargo_remove/invalid_package/mod.rs index 846beae66f2..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs b/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs index ffbe7a6f6da..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_section/mod.rs b/tests/testsuite/cargo_remove/invalid_section/mod.rs index 47b42b74ca5..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs index 606816a1eda..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_target/mod.rs b/tests/testsuite/cargo_remove/invalid_target/mod.rs index b2cc3971df4..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs index 8a028150504..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/multiple_deps/mod.rs b/tests/testsuite/cargo_remove/multiple_deps/mod.rs index c4cd6f51047..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/multiple_dev/mod.rs b/tests/testsuite/cargo_remove/multiple_dev/mod.rs index ea9cf74e49d..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/no_arg/mod.rs b/tests/testsuite/cargo_remove/no_arg/mod.rs index 764e83bf137..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/offline/mod.rs b/tests/testsuite/cargo_remove/offline/mod.rs index f4083e0625f..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs b/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs index 9c49b96afac..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs index 5fbe088a6ac..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/optional_feature/mod.rs b/tests/testsuite/cargo_remove/optional_feature/mod.rs index 856fccc44d2..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/package/mod.rs b/tests/testsuite/cargo_remove/package/mod.rs index 45727ba46dc..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/remove_basic/mod.rs b/tests/testsuite/cargo_remove/remove_basic/mod.rs index 824c1058270..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs b/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs index 49c61b78912..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/target/mod.rs b/tests/testsuite/cargo_remove/target/mod.rs index 40ceb893e03..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/target_build/mod.rs b/tests/testsuite/cargo_remove/target_build/mod.rs index 6b6e5df277a..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/target_dev/mod.rs b/tests/testsuite/cargo_remove/target_dev/mod.rs index 383d0867a97..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/update_lock_file/mod.rs b/tests/testsuite/cargo_remove/update_lock_file/mod.rs index 08b0e8be731..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/workspace/mod.rs b/tests/testsuite/cargo_remove/workspace/mod.rs index adc95235a32..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs b/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs index adc95235a32..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/workspace_preserved/mod.rs b/tests/testsuite/cargo_remove/workspace_preserved/mod.rs index adc95235a32..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_report/help/mod.rs b/tests/testsuite/cargo_report/help/mod.rs index 1b66cbf0536..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 2fc68618a69..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 ad7627c7840..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 89d0860073b..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 adec5901201..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 6fc4274f5e3..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 615524aae0e..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_eq_(str![""]) - .stderr_eq_(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 d459c4df2d3..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 53f522b4c8f..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 654beec4289..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 a09db9486fe..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_eq_(str![""]) - .stderr_eq_(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 1acbe2856fb..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 bce59fffd9d..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 650e35f87bc..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 ea7dc7bcefc..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_eq_(file!["stdout.term.svg"]) - .stderr_eq_(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 5031d5f5a8e..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_eq_(str![""]) - .stderr_eq_(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 54febe13775..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_eq_(str![""]) - .stderr_eq_(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 927812317e3..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_eq_(str![""]) - .stderr_eq_(file!["stderr.term.svg"]); + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); }