From 62cd5b544ebbb1528538ff354964ef3c198be378 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 ab0a236d69e5..03e8472fe1c1 100644 --- a/crates/cargo-test-support/src/compare.rs +++ b/crates/cargo-test-support/src/compare.rs @@ -94,7 +94,7 @@ pub fn assert_ui() -> snapbox::Assert { .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 fc9f2e746f58..6844642baef1 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 af5cf490b6e7..e40d56a1827a 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 323a9a71cfee..e890839845a7 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 0b545d010ad5..850a4a66b466 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 792e08c632fe..805d0089cad8 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 3cadfb3910c1..26f9880bed7f 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 936a5fe1aee9..5ca79c7c5e83 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 ab8d10f00972..23c1c5053c3d 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 e4c4e65cc2a7..9220aa7ed6b7 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 0a7e1e615f15..f72db7dd4a67 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 4c6c3ef026e0..be6f2a685c7d 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 fa0080332d3d..b60deb2ed995 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 70f3b8a01fac..275f7acd4c4f 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 89006b0127fc..c08a6bea906e 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 1b0f676ce3be..c25d40d22363 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 1b0f676ce3be..c25d40d22363 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 620dfad08a86..86545d3f4d08 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 cdfafd627732..197df7811951 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 35dd0f71dc43..d9f5193227df 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 2c30fe7eaf03..3d2424ebfc94 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 394316fa29f7..00f9bd8fd8f5 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 86b536d159a6..f4bb8786a300 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 fb64785448df..95391cb1636c 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 396c4eead362..515e975bcc75 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 2ac0c7b9c617..5e1c51403607 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 d880c50a7ddc..468587d7c4cb 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 fb44fa8a3da5..41075a98ae7e 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 ec679cf5a6bd..cce0d90420e3 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 50a8713f38ca..f7071d44d0f0 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 c1e6f3290c92..e149dc009878 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 eee7f7d840f4..0434d5bced13 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 6e346ec40579..4a689e7237a8 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 9ff253aa06a4..dc60e5dac754 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 984b9f1d9bb4..b0e229d8dc48 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 5e206686252e..cd8e4c38870d 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 e5ca8ec32cb6..e0b7049be603 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 3ddbb202b1a3..f0f031e8ebb8 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 57ddfad9b6ea..c0f6c6972074 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 f608f842b705..d11d31986f58 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 ac9bf5be7dc3..0ee595b870fb 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 cf1039c51566..1747b81f0642 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 b177cdb1fc7f..18c7ce4a5e4f 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 2a8f9f7dcb83..739468a651cc 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 b9f66af2ea3d..b1e5e6246f0c 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 69a5c3728fe0..3cd5759bffe7 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 d01d278bf41c..a29ae6d7d47b 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 f6152082e4be..a93be5e5de73 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 5e961d8c300d..eb9842b2db8a 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 a20bf56daf29..c8ef1f756f75 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 d853fd48f8b7..0a923250f53e 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 45627c9a7fdb..9aeea125127b 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 45627c9a7fdb..9aeea125127b 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 e4ddc98db7c0..c564fa4360fa 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 c7ff7671ef9e..f404cd2c7882 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 cb74d337ecc7..c15f9158cd32 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 aa42a61a1e85..d19260496ad4 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 af5b5f333975..92319f7914c4 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 250e04309644..9397c5a6caee 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 f756fff85421..b3184089ec5e 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 561ab96f852f..812be6142b25 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 683fd300edb8..891e0c3327c8 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 ac20d605b9bd..401a52f45b8a 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 31119e5cf7b9..e6172c001bcf 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 3674b6ea2c00..4f3f675c5f1e 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 43aa7098d61d..79c44a182669 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 47719cade87f..e256189bf1e1 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 03367bb05931..8f8732fd4166 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 a37411175695..d006d2b655db 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 f67373b07f9b..ceea4f1713bc 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 5ab1849dc63d..3ff29dc3377f 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 076044525175..05dc7b6b10cb 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 3f817962061f..c525cba65763 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 3acfff71c438..73ff19a5b6c3 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 46b3bbb910ee..9f4f9e643ef8 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 7083a91bce76..360bac45e704 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 3bdda2ba34cf..819e017f753d 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 4c982e878224..425eceaec684 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 89006b0127fc..c08a6bea906e 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 3acfff71c438..73ff19a5b6c3 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 52ffdf3e91e1..5a16c2416bf1 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 849594c82ef9..3729f9946d4d 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 620dfad08a86..86545d3f4d08 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 620dfad08a86..86545d3f4d08 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 620dfad08a86..86545d3f4d08 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 6448e1017e5e..212dba2ca981 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 7fa1a30b78cf..9ce9a97f7039 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 89ec7c248b4a..e735c848a8b6 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 3acfff71c438..73ff19a5b6c3 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 89006b0127fc..c08a6bea906e 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 46b3bbb910ee..9f4f9e643ef8 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 4c982e878224..425eceaec684 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 7083a91bce76..360bac45e704 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 3191f6afa875..7bee1aa5c18e 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 4c982e878224..425eceaec684 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 5e5abbddf7e3..917125c7827b 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 25647dde983d..d36043479273 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 994630ed493a..3a1c58bb5bb8 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 5dfd986cd9fd..a25883cb0117 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 52ffdf3e91e1..5a16c2416bf1 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 3191f6afa875..7bee1aa5c18e 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 7083a91bce76..360bac45e704 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 1159cac5e710..e253892b6491 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 cfd18954d586..f38df3033634 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 8d45f006584a..2708ad8c0959 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 8aa49d41f286..43ab3b667bd2 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 849594c82ef9..3729f9946d4d 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 28ccd2e5bc0d..05f9ed762c3d 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 3f4dcd800bde..cfd8fcb62ef0 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 3f4dcd800bde..cfd8fcb62ef0 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 849594c82ef9..3729f9946d4d 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 b2524ab1d5c5..49b7901c695c 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 849594c82ef9..3729f9946d4d 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 bde4707ec3f8..18ee86c93020 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 d25adbf70966..717be7aa3533 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 3074e9aa6a36..7c3381f3e5a7 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 417385baa201..c82c4a0a0764 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 3074e9aa6a36..7c3381f3e5a7 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 31885171c64a..d78863863c8a 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 95b6b2771957..40bc43e82ccc 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 95b6b2771957..40bc43e82ccc 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 3191f6afa875..7bee1aa5c18e 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 4b0532ac7b1e..7c409b6172bc 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 85883eff777d..db8f79b8ef92 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 a0be1e305bcb..c27075ae0d3e 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 3074e9aa6a36..7c3381f3e5a7 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 888b5e8d0b3b..37770685b11b 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 d6871b2f4c3d..e88720284607 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 3cbd3ad890c2..f20b4c4895b7 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 3cbd3ad890c2..f20b4c4895b7 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 d1b4b1ed4047..7fea1e6bbb3f 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 039ab560f373..892e423fcdb1 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 c331ec70df0f..56b919e09ea0 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 c331ec70df0f..56b919e09ea0 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 9c4f7ddf9620..2e11221b0b86 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 ef5484692644..ca7fa309170f 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 9ca1fc9d560b..762816b033af 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 fc9e69ee2dfd..5825d0a7f7d9 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 c5af9fb35a79..6bf38dbf14f0 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 3bb7113b6733..fabd90820860 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 849594c82ef9..3729f9946d4d 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 b2524ab1d5c5..49b7901c695c 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 57884b80066e..36bef3f10743 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 571a64c68ad2..4226dc1c66af 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 4fd400a267b3..0dbecdcfef14 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 ae41e817a314..b5836078c6a3 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 fc2e612b3c4e..2b4679ba7bff 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 ce2b86bd01cc..c1f51f970739 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 e1b5f1db3bcb..3f9f6a6dff7c 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 67ddf52f62dd..1f341daf5b8f 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 7d77a8dca8a3..22b3fdf14492 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 0ecbadee13bc..c2fbbfa6acc9 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 ccd6820de177..5828fcadfe46 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 2b557d7ae776..f5db7e12bb73 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 f0d1a705f834..06cb1eb44b33 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 334e7ebba36e..d2855639b1ab 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 22ba67ba02be..db152a15ed89 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 58cc075efc54..5a9603a5f7e9 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 5931792b4f6a..018fe73c39c7 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 07607640a1f8..219b54534a5e 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 5931792b4f6a..018fe73c39c7 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 fac4806704a3..81d1c791f685 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 73aa436b6615..2b34486bf3dc 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 bd78028314cd..f1d364258ef8 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 334e7ebba36e..d2855639b1ab 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 334e7ebba36e..d2855639b1ab 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 f6d03d649050..4e3cb8b7079e 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 1384a4622ad1..c0d70abe4a3a 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 b77e0eb494e6..b35ce6093b8d 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 21f1e8b9113e..132ea3eb99ce 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 526b6222bb3e..f0a78ed3da50 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 bae799836995..013db91cab99 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 48203f3b306c..fd1930fd4d9f 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 55a12bec3176..d42e5a9e07b3 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 211f2e9fd43d..7b59af80933f 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 211f2e9fd43d..7b59af80933f 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 c7f34a37c5b0..cd912bb03b06 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 c5ddef2b50e0..b6e4100c9728 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 07607640a1f8..219b54534a5e 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 07607640a1f8..219b54534a5e 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 21f1e8b9113e..132ea3eb99ce 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 3f796da176f0..7f87da08d880 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 7dfe7fff1eaa..92b3bba71b14 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 72502da8d53c..ad361e1038be 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 21f1e8b9113e..132ea3eb99ce 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 35cf325a3a59..91b4de8b4b33 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 2614d766e4fe..6706742ff749 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 909ddc234e12..e8af27f46644 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 7908a5a28a83..c8242fa42f35 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 84f67859e67a..c32455afa219 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 21f1e8b9113e..132ea3eb99ce 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 c4096c504ea4..9c19bcd52d85 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 879dbd60f088..9df19a755c0d 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 d2835c21c851..21862402ea56 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 40d826b43150..57d49dcb4e1a 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 9028cbba67d0..00dc6f7c49d0 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 34f408c569e5..6bede7a4296d 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 f7b094c070f3..5416ec10510d 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 ba8c1e575dc5..5bbb986bc5f0 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 ee8b069afebb..7d42b9e62124 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 eb531e5d636f..9a6e7c5486be 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 73bad2cb3c41..f3411259b3bc 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 73bad2cb3c41..f3411259b3bc 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 ae32f50f214d..d666c0aca71e 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 73bad2cb3c41..f3411259b3bc 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 73bad2cb3c41..f3411259b3bc 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 73bad2cb3c41..f3411259b3bc 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 eb531e5d636f..9a6e7c5486be 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 03c40c6b9a3a..da6fb0e2d64d 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 fee77d8866a9..55eeac5164bd 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 73bad2cb3c41..f3411259b3bc 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 73bad2cb3c41..f3411259b3bc 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 6c977833b731..9c8c2a404fde 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 a3ede70e51c4..51883bd49934 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 73bad2cb3c41..f3411259b3bc 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 0cd783e9a6e3..54796a00eb3b 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 bcd14983a7e9..8b7669a0ca74 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 9ad56200890d..73ff8b7bc80a 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 dda06f0aabb8..fb8d622dbd6c 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 39e4c30a3b7f..ef7802b5cf42 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 11f9848e4ffb..7308a92bc8c7 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 ccac2ac3a0de..e5f3e34815a9 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 36abb6795330..8320d8247449 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 a5a0313c573c..b8594662b790 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 649b9d4a36b8..b1b2280f51b7 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 0e84f782b072..f27ef6f6fb6d 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 598706fe2b1f..ce9cad4ecb3e 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 e63a41cc6278..a0e65886f60c 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 e60d610d6654..e56e467d9e9c 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 cfb93eb0e89f..4cad3dda300c 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 19f043b46203..cf225b122ef5 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 da1bd42d76bc..3e225cf2fe96 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 846beae66f24..fe90a957d19b 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 ffbe7a6f6da1..0fe7d12f35c6 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 47b42b74ca5e..7e5e43e18d9d 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 606816a1eda5..601ebe8e65cb 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 b2cc3971df4a..8e099128f3e8 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 8a028150504f..de2db1542958 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 c4cd6f510470..1a86d276576a 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 ea9cf74e49d1..52831495f0da 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 764e83bf137d..920826ac538c 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 f4083e0625f2..1aed4a20f47b 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 9c49b96afac0..a4a08c2a03cf 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 5fbe088a6ac7..a88fd9995f3a 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 856fccc44d2b..2d9a76802225 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 45727ba46dc8..3c7298198c83 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 824c10582703..8d3ef22ef8d6 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 49c61b789122..40f0dde4633f 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 40ceb893e03f..264b9ddb8aa2 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 6b6e5df277ae..11997bfdc647 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 383d0867a97e..2a5f0babda1c 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 08b0e8be731f..df1ecb42d7dd 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 adc95235a329..ea9e4c1a8b99 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 adc95235a329..ea9e4c1a8b99 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 adc95235a329..ea9e4c1a8b99 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 1b66cbf0536c..c05e9e3372b0 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 2fc68618a69b..212ed276cddd 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 ad7627c78407..87b66e825bc2 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 89d0860073b5..a1b2a0193f3a 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 adec59012012..2b96bd572c98 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 6fc4274f5e32..a643dfdbe99e 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 615524aae0e1..a07cc64ae88c 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 d459c4df2d36..6b10af23a31b 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 53f522b4c8f0..48c84da1b47f 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 654beec42897..7bc15484cc73 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 a09db9486fe4..32055ac0ada8 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 1acbe2856fb1..ede93a8f82cb 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 bce59fffd9dc..b5103db60cea 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 650e35f87bc1..a86d204ae40f 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 ea7dc7bcefc5..93b5af05e1d5 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 5031d5f5a8e0..bb4ff319aefc 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 54febe137753..81f4ffc6608f 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 927812317e34..f1ec40f7655e 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"]); }