From ac453f1c376dc737ac27833457653f03072e39f7 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 20 Feb 2024 13:29:09 -0600 Subject: [PATCH] test: Remove empty snapshots for UI tests --- tests/testsuite/cargo_add/add_basic/mod.rs | 3 ++- tests/testsuite/cargo_add/add_basic/stdout.log | 0 tests/testsuite/cargo_add/add_multiple/mod.rs | 3 ++- tests/testsuite/cargo_add/add_multiple/stdout.log | 0 tests/testsuite/cargo_add/add_normalized_name_external/mod.rs | 3 ++- .../cargo_add/add_normalized_name_external/stdout.log | 0 tests/testsuite/cargo_add/add_toolchain/mod.rs | 3 ++- tests/testsuite/cargo_add/add_toolchain/stdout.log | 0 tests/testsuite/cargo_add/build/mod.rs | 3 ++- tests/testsuite/cargo_add/build/stdout.log | 0 tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs | 3 ++- .../cargo_add/build_prefer_existing_version/stdout.log | 0 tests/testsuite/cargo_add/change_rename_target/mod.rs | 3 ++- tests/testsuite/cargo_add/change_rename_target/stdout.log | 0 tests/testsuite/cargo_add/cyclic_features/mod.rs | 3 ++- tests/testsuite/cargo_add/cyclic_features/stdout.log | 0 tests/testsuite/cargo_add/default_features/mod.rs | 3 ++- tests/testsuite/cargo_add/default_features/stdout.log | 0 tests/testsuite/cargo_add/deprecated_default_features/mod.rs | 3 ++- .../testsuite/cargo_add/deprecated_default_features/stdout.log | 0 tests/testsuite/cargo_add/deprecated_section/mod.rs | 3 ++- tests/testsuite/cargo_add/deprecated_section/stdout.log | 0 tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs | 3 ++- tests/testsuite/cargo_add/detect_workspace_inherit/stdout.log | 0 .../cargo_add/detect_workspace_inherit_features/mod.rs | 3 ++- .../cargo_add/detect_workspace_inherit_features/stdout.log | 0 .../cargo_add/detect_workspace_inherit_optional/mod.rs | 3 ++- .../cargo_add/detect_workspace_inherit_optional/stdout.log | 0 .../testsuite/cargo_add/detect_workspace_inherit_public/mod.rs | 3 ++- .../cargo_add/detect_workspace_inherit_public/stdout.log | 0 tests/testsuite/cargo_add/dev/mod.rs | 3 ++- tests/testsuite/cargo_add/dev/stdout.log | 0 tests/testsuite/cargo_add/dev_build_conflict/mod.rs | 3 ++- tests/testsuite/cargo_add/dev_build_conflict/stdout.log | 0 tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs | 3 ++- .../testsuite/cargo_add/dev_prefer_existing_version/stdout.log | 0 tests/testsuite/cargo_add/dry_run/mod.rs | 3 ++- tests/testsuite/cargo_add/dry_run/stdout.log | 0 tests/testsuite/cargo_add/empty_dep_name/mod.rs | 3 ++- tests/testsuite/cargo_add/empty_dep_name/stdout.log | 0 tests/testsuite/cargo_add/empty_dep_table/mod.rs | 3 ++- tests/testsuite/cargo_add/empty_dep_table/stdout.log | 0 tests/testsuite/cargo_add/features/mod.rs | 3 ++- tests/testsuite/cargo_add/features/stdout.log | 0 tests/testsuite/cargo_add/features_activated_over_limit/mod.rs | 3 ++- .../cargo_add/features_activated_over_limit/stdout.log | 0 .../testsuite/cargo_add/features_deactivated_over_limit/mod.rs | 3 ++- .../cargo_add/features_deactivated_over_limit/stdout.log | 0 tests/testsuite/cargo_add/features_empty/mod.rs | 3 ++- tests/testsuite/cargo_add/features_empty/stdout.log | 0 tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs | 3 ++- .../cargo_add/features_multiple_occurrences/stdout.log | 0 tests/testsuite/cargo_add/features_preserve/mod.rs | 3 ++- tests/testsuite/cargo_add/features_preserve/stdout.log | 0 tests/testsuite/cargo_add/features_spaced_values/mod.rs | 3 ++- tests/testsuite/cargo_add/features_spaced_values/stdout.log | 0 tests/testsuite/cargo_add/features_unknown/mod.rs | 3 ++- tests/testsuite/cargo_add/features_unknown/stdout.log | 0 tests/testsuite/cargo_add/features_unknown_no_features/mod.rs | 3 ++- .../cargo_add/features_unknown_no_features/stdout.log | 0 tests/testsuite/cargo_add/git/mod.rs | 3 ++- tests/testsuite/cargo_add/git/stdout.log | 0 tests/testsuite/cargo_add/git_branch/mod.rs | 3 ++- tests/testsuite/cargo_add/git_branch/stdout.log | 0 tests/testsuite/cargo_add/git_conflicts_namever/mod.rs | 3 ++- tests/testsuite/cargo_add/git_conflicts_namever/stdout.log | 0 tests/testsuite/cargo_add/git_dev/mod.rs | 3 ++- tests/testsuite/cargo_add/git_dev/stdout.log | 0 tests/testsuite/cargo_add/git_inferred_name/mod.rs | 3 ++- tests/testsuite/cargo_add/git_inferred_name/stdout.log | 0 tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs | 3 ++- .../testsuite/cargo_add/git_inferred_name_multiple/stdout.log | 0 tests/testsuite/cargo_add/git_multiple_names/mod.rs | 3 ++- tests/testsuite/cargo_add/git_multiple_names/stdout.log | 0 .../testsuite/cargo_add/git_multiple_packages_features/mod.rs | 3 ++- .../cargo_add/git_multiple_packages_features/stdout.log | 0 tests/testsuite/cargo_add/git_normalized_name/mod.rs | 3 ++- tests/testsuite/cargo_add/git_normalized_name/stdout.log | 0 tests/testsuite/cargo_add/git_registry/mod.rs | 3 ++- tests/testsuite/cargo_add/git_registry/stdout.log | 0 tests/testsuite/cargo_add/git_rev/mod.rs | 3 ++- tests/testsuite/cargo_add/git_rev/stdout.log | 0 tests/testsuite/cargo_add/git_tag/mod.rs | 3 ++- tests/testsuite/cargo_add/git_tag/stdout.log | 0 tests/testsuite/cargo_add/infer_prerelease/mod.rs | 3 ++- tests/testsuite/cargo_add/infer_prerelease/stdout.log | 0 tests/testsuite/cargo_add/invalid_arg/mod.rs | 3 ++- tests/testsuite/cargo_add/invalid_arg/stdout.log | 0 tests/testsuite/cargo_add/invalid_git_name/mod.rs | 3 ++- tests/testsuite/cargo_add/invalid_git_name/stdout.log | 0 .../testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs | 3 ++- .../cargo_add/invalid_key_inherit_dependency/stdout.log | 0 .../cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs | 3 ++- .../invalid_key_overwrite_inherit_dependency/stdout.log | 0 .../cargo_add/invalid_key_rename_inherit_dependency/mod.rs | 3 ++- .../cargo_add/invalid_key_rename_inherit_dependency/stdout.log | 0 tests/testsuite/cargo_add/invalid_manifest/mod.rs | 3 ++- tests/testsuite/cargo_add/invalid_manifest/stdout.log | 0 tests/testsuite/cargo_add/invalid_name_external/mod.rs | 3 ++- tests/testsuite/cargo_add/invalid_name_external/stdout.log | 0 tests/testsuite/cargo_add/invalid_path/mod.rs | 3 ++- tests/testsuite/cargo_add/invalid_path/stdout.log | 0 tests/testsuite/cargo_add/invalid_path_name/mod.rs | 3 ++- tests/testsuite/cargo_add/invalid_path_name/stdout.log | 0 tests/testsuite/cargo_add/invalid_path_self/mod.rs | 3 ++- tests/testsuite/cargo_add/invalid_path_self/stdout.log | 0 tests/testsuite/cargo_add/invalid_target_empty/mod.rs | 3 ++- tests/testsuite/cargo_add/invalid_target_empty/stdout.log | 0 tests/testsuite/cargo_add/invalid_vers/mod.rs | 3 ++- tests/testsuite/cargo_add/invalid_vers/stdout.log | 0 tests/testsuite/cargo_add/list_features/mod.rs | 3 ++- tests/testsuite/cargo_add/list_features/stdout.log | 0 tests/testsuite/cargo_add/list_features_path/mod.rs | 3 ++- tests/testsuite/cargo_add/list_features_path/stdout.log | 0 tests/testsuite/cargo_add/list_features_path_no_default/mod.rs | 3 ++- .../cargo_add/list_features_path_no_default/stdout.log | 0 tests/testsuite/cargo_add/locked_changed/mod.rs | 3 ++- tests/testsuite/cargo_add/locked_changed/stdout.log | 0 tests/testsuite/cargo_add/locked_unchanged/mod.rs | 3 ++- tests/testsuite/cargo_add/locked_unchanged/stdout.log | 0 tests/testsuite/cargo_add/lockfile_updated/mod.rs | 3 ++- tests/testsuite/cargo_add/lockfile_updated/stdout.log | 0 tests/testsuite/cargo_add/manifest_path_package/mod.rs | 3 ++- tests/testsuite/cargo_add/manifest_path_package/stdout.log | 0 tests/testsuite/cargo_add/merge_activated_features/mod.rs | 3 ++- tests/testsuite/cargo_add/merge_activated_features/stdout.log | 0 .../cargo_add/multiple_conflicts_with_features/mod.rs | 3 ++- .../cargo_add/multiple_conflicts_with_features/stdout.log | 0 .../testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs | 3 ++- .../cargo_add/multiple_conflicts_with_rename/stdout.log | 0 tests/testsuite/cargo_add/namever/mod.rs | 3 ++- tests/testsuite/cargo_add/namever/stdout.log | 0 tests/testsuite/cargo_add/no_args/mod.rs | 3 ++- tests/testsuite/cargo_add/no_args/stdout.log | 0 tests/testsuite/cargo_add/no_default_features/mod.rs | 3 ++- tests/testsuite/cargo_add/no_default_features/stdout.log | 0 tests/testsuite/cargo_add/no_optional/mod.rs | 3 ++- tests/testsuite/cargo_add/no_optional/stdout.log | 0 tests/testsuite/cargo_add/no_public/mod.rs | 3 ++- tests/testsuite/cargo_add/no_public/stdout.log | 0 tests/testsuite/cargo_add/offline_empty_cache/mod.rs | 3 ++- tests/testsuite/cargo_add/offline_empty_cache/stdout.log | 0 tests/testsuite/cargo_add/optional/mod.rs | 3 ++- tests/testsuite/cargo_add/optional/stdout.log | 0 tests/testsuite/cargo_add/overwrite_default_features/mod.rs | 3 ++- .../testsuite/cargo_add/overwrite_default_features/stdout.log | 0 .../overwrite_default_features_with_no_default_features/mod.rs | 3 ++- .../stdout.log | 0 tests/testsuite/cargo_add/overwrite_features/mod.rs | 3 ++- tests/testsuite/cargo_add/overwrite_features/stdout.log | 0 tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs | 3 ++- tests/testsuite/cargo_add/overwrite_git_with_path/stdout.log | 0 .../testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs | 3 ++- .../cargo_add/overwrite_inherit_features_noop/stdout.log | 0 tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs | 3 ++- tests/testsuite/cargo_add/overwrite_inherit_noop/stdout.log | 0 .../testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs | 3 ++- .../cargo_add/overwrite_inherit_optional_noop/stdout.log | 0 tests/testsuite/cargo_add/overwrite_inline_features/mod.rs | 3 ++- tests/testsuite/cargo_add/overwrite_inline_features/stdout.log | 0 tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs | 3 ++- tests/testsuite/cargo_add/overwrite_name_dev_noop/stdout.log | 0 tests/testsuite/cargo_add/overwrite_name_noop/mod.rs | 3 ++- tests/testsuite/cargo_add/overwrite_name_noop/stdout.log | 0 tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs | 3 ++- .../cargo_add/overwrite_no_default_features/stdout.log | 0 .../overwrite_no_default_features_with_default_features/mod.rs | 3 ++- .../stdout.log | 0 tests/testsuite/cargo_add/overwrite_no_optional/mod.rs | 3 ++- tests/testsuite/cargo_add/overwrite_no_optional/stdout.log | 0 .../cargo_add/overwrite_no_optional_with_optional/mod.rs | 3 ++- .../cargo_add/overwrite_no_optional_with_optional/stdout.log | 0 tests/testsuite/cargo_add/overwrite_no_public/mod.rs | 3 ++- tests/testsuite/cargo_add/overwrite_no_public/stdout.log | 0 .../testsuite/cargo_add/overwrite_no_public_with_public/mod.rs | 3 ++- .../cargo_add/overwrite_no_public_with_public/stdout.log | 0 tests/testsuite/cargo_add/overwrite_optional/mod.rs | 3 ++- tests/testsuite/cargo_add/overwrite_optional/stdout.log | 0 .../cargo_add/overwrite_optional_with_no_optional/mod.rs | 3 ++- .../cargo_add/overwrite_optional_with_no_optional/stdout.log | 0 .../cargo_add/overwrite_optional_with_optional/mod.rs | 3 ++- .../cargo_add/overwrite_optional_with_optional/stdout.log | 0 tests/testsuite/cargo_add/overwrite_path_noop/mod.rs | 3 ++- tests/testsuite/cargo_add/overwrite_path_noop/stdout.log | 0 tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs | 3 ++- .../testsuite/cargo_add/overwrite_path_with_version/stdout.log | 0 .../cargo_add/overwrite_preserves_inline_table/mod.rs | 3 ++- .../cargo_add/overwrite_preserves_inline_table/stdout.log | 0 tests/testsuite/cargo_add/overwrite_public/mod.rs | 3 ++- tests/testsuite/cargo_add/overwrite_public/stdout.log | 0 .../testsuite/cargo_add/overwrite_public_with_no_public/mod.rs | 3 ++- .../cargo_add/overwrite_public_with_no_public/stdout.log | 0 .../testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs | 3 ++- .../cargo_add/overwrite_rename_with_no_rename/stdout.log | 0 tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs | 3 ++- .../cargo_add/overwrite_rename_with_rename/stdout.log | 0 .../cargo_add/overwrite_rename_with_rename_noop/mod.rs | 3 ++- .../cargo_add/overwrite_rename_with_rename_noop/stdout.log | 0 tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs | 3 ++- .../testsuite/cargo_add/overwrite_version_with_git/stdout.log | 0 tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs | 3 ++- .../testsuite/cargo_add/overwrite_version_with_path/stdout.log | 0 tests/testsuite/cargo_add/overwrite_with_rename/mod.rs | 3 ++- tests/testsuite/cargo_add/overwrite_with_rename/stdout.log | 0 tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs | 3 ++- tests/testsuite/cargo_add/overwrite_workspace_dep/stdout.log | 0 .../cargo_add/overwrite_workspace_dep_features/mod.rs | 3 ++- .../cargo_add/overwrite_workspace_dep_features/stdout.log | 0 tests/testsuite/cargo_add/path/mod.rs | 3 ++- tests/testsuite/cargo_add/path/stdout.log | 0 tests/testsuite/cargo_add/path_dev/mod.rs | 3 ++- tests/testsuite/cargo_add/path_dev/stdout.log | 0 tests/testsuite/cargo_add/path_inferred_name/mod.rs | 3 ++- tests/testsuite/cargo_add/path_inferred_name/stdout.log | 0 .../cargo_add/path_inferred_name_conflicts_full_feature/mod.rs | 3 ++- .../path_inferred_name_conflicts_full_feature/stdout.log | 0 tests/testsuite/cargo_add/path_normalized_name/mod.rs | 3 ++- tests/testsuite/cargo_add/path_normalized_name/stdout.log | 0 tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs | 3 ++- tests/testsuite/cargo_add/preserve_dep_std_table/stdout.log | 0 tests/testsuite/cargo_add/preserve_features_table/mod.rs | 3 ++- tests/testsuite/cargo_add/preserve_features_table/stdout.log | 0 tests/testsuite/cargo_add/preserve_sorted/mod.rs | 3 ++- tests/testsuite/cargo_add/preserve_sorted/stdout.log | 0 tests/testsuite/cargo_add/preserve_unsorted/mod.rs | 3 ++- tests/testsuite/cargo_add/preserve_unsorted/stdout.log | 0 tests/testsuite/cargo_add/public/mod.rs | 3 ++- tests/testsuite/cargo_add/public/stdout.log | 0 tests/testsuite/cargo_add/quiet/mod.rs | 3 +-- tests/testsuite/cargo_add/quiet/stdout.log | 0 tests/testsuite/cargo_add/registry/mod.rs | 3 ++- tests/testsuite/cargo_add/registry/stdout.log | 0 tests/testsuite/cargo_add/rename/mod.rs | 3 ++- tests/testsuite/cargo_add/rename/stdout.log | 0 tests/testsuite/cargo_add/require_weak/mod.rs | 3 ++- tests/testsuite/cargo_add/require_weak/stdout.log | 0 tests/testsuite/cargo_add/rust_version_ignore/mod.rs | 3 ++- tests/testsuite/cargo_add/rust_version_ignore/stdout.log | 0 tests/testsuite/cargo_add/rust_version_incompatible/mod.rs | 3 ++- tests/testsuite/cargo_add/rust_version_incompatible/stdout.log | 0 tests/testsuite/cargo_add/rust_version_latest/mod.rs | 3 ++- tests/testsuite/cargo_add/rust_version_latest/stdout.log | 0 tests/testsuite/cargo_add/rust_version_older/mod.rs | 3 ++- tests/testsuite/cargo_add/rust_version_older/stdout.log | 0 tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs | 3 ++- .../cargo_add/sorted_table_with_dotted_item/stdout.log | 0 tests/testsuite/cargo_add/target/mod.rs | 3 ++- tests/testsuite/cargo_add/target/stdout.log | 0 tests/testsuite/cargo_add/target_cfg/mod.rs | 3 ++- tests/testsuite/cargo_add/target_cfg/stdout.log | 0 tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs | 3 ++- tests/testsuite/cargo_add/unknown_inherited_feature/stdout.log | 0 tests/testsuite/cargo_add/vers/mod.rs | 3 ++- tests/testsuite/cargo_add/vers/stdout.log | 0 tests/testsuite/cargo_add/workspace_name/mod.rs | 3 ++- tests/testsuite/cargo_add/workspace_name/stdout.log | 0 tests/testsuite/cargo_add/workspace_path/mod.rs | 3 ++- tests/testsuite/cargo_add/workspace_path/stdout.log | 0 tests/testsuite/cargo_add/workspace_path_dev/mod.rs | 3 ++- tests/testsuite/cargo_add/workspace_path_dev/stdout.log | 0 tests/testsuite/cargo_bench/no_keep_going/mod.rs | 3 ++- tests/testsuite/cargo_bench/no_keep_going/stdout.log | 0 tests/testsuite/cargo_init/auto_git/mod.rs | 3 ++- tests/testsuite/cargo_init/auto_git/stdout.log | 0 tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs | 3 ++- .../cargo_init/bin_already_exists_explicit/stdout.log | 0 .../cargo_init/bin_already_exists_explicit_nosrc/mod.rs | 3 ++- .../cargo_init/bin_already_exists_explicit_nosrc/stdout.log | 0 tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs | 3 ++- .../cargo_init/bin_already_exists_implicit/stdout.log | 0 .../cargo_init/bin_already_exists_implicit_namenosrc/mod.rs | 3 ++- .../bin_already_exists_implicit_namenosrc/stdout.log | 0 .../cargo_init/bin_already_exists_implicit_namesrc/mod.rs | 3 ++- .../cargo_init/bin_already_exists_implicit_namesrc/stdout.log | 0 .../cargo_init/bin_already_exists_implicit_nosrc/mod.rs | 3 ++- .../cargo_init/bin_already_exists_implicit_nosrc/stdout.log | 0 tests/testsuite/cargo_init/both_lib_and_bin/mod.rs | 3 ++- tests/testsuite/cargo_init/both_lib_and_bin/stdout.log | 0 .../cant_create_library_when_both_binlib_present/mod.rs | 3 ++- .../cant_create_library_when_both_binlib_present/stdout.log | 0 .../testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs | 3 ++- .../cargo_init/confused_by_multiple_lib_files/stdout.log | 0 .../cargo_init/creates_binary_when_both_binlib_present/mod.rs | 3 ++- .../creates_binary_when_both_binlib_present/stdout.log | 0 .../creates_binary_when_instructed_and_has_lib_file/mod.rs | 3 ++- .../creates_binary_when_instructed_and_has_lib_file/stdout.log | 0 .../creates_library_when_instructed_and_has_bin_file/mod.rs | 3 ++- .../stdout.log | 0 tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs | 3 ++- tests/testsuite/cargo_init/explicit_bin_with_git/stdout.log | 0 tests/testsuite/cargo_init/formats_source/mod.rs | 3 ++- tests/testsuite/cargo_init/formats_source/stdout.log | 0 tests/testsuite/cargo_init/fossil_autodetect/mod.rs | 3 ++- tests/testsuite/cargo_init/fossil_autodetect/stdout.log | 0 tests/testsuite/cargo_init/git_autodetect/mod.rs | 3 ++- tests/testsuite/cargo_init/git_autodetect/stdout.log | 0 .../cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs | 3 ++- .../git_ignore_exists_no_conflicting_entries/stdout.log | 0 .../cargo_init/ignores_failure_to_format_source/mod.rs | 3 ++- .../cargo_init/ignores_failure_to_format_source/stdout.log | 0 tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs | 3 ++- tests/testsuite/cargo_init/inferred_bin_with_git/stdout.log | 0 tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs | 3 ++- tests/testsuite/cargo_init/inferred_lib_with_git/stdout.log | 0 .../cargo_init/inherit_workspace_package_table/mod.rs | 3 ++- .../cargo_init/inherit_workspace_package_table/stdout.log | 0 tests/testsuite/cargo_init/invalid_dir_name/mod.rs | 3 ++- tests/testsuite/cargo_init/invalid_dir_name/stdout.log | 0 tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs | 3 ++- tests/testsuite/cargo_init/lib_already_exists_nosrc/stdout.log | 0 tests/testsuite/cargo_init/lib_already_exists_src/mod.rs | 3 ++- tests/testsuite/cargo_init/lib_already_exists_src/stdout.log | 0 tests/testsuite/cargo_init/mercurial_autodetect/mod.rs | 3 ++- tests/testsuite/cargo_init/mercurial_autodetect/stdout.log | 0 tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs | 3 ++- .../cargo_init/multibin_project_name_clash/stdout.log | 0 tests/testsuite/cargo_init/no_filename/mod.rs | 3 ++- tests/testsuite/cargo_init/no_filename/stdout.log | 0 tests/testsuite/cargo_init/path_contains_separator/mod.rs | 3 ++- tests/testsuite/cargo_init/path_contains_separator/stdout.log | 0 tests/testsuite/cargo_init/pijul_autodetect/mod.rs | 3 ++- tests/testsuite/cargo_init/pijul_autodetect/stdout.log | 0 tests/testsuite/cargo_init/reserved_name/mod.rs | 3 ++- tests/testsuite/cargo_init/reserved_name/stdout.log | 0 tests/testsuite/cargo_init/simple_bin/mod.rs | 3 ++- tests/testsuite/cargo_init/simple_bin/stdout.log | 0 tests/testsuite/cargo_init/simple_git/mod.rs | 3 ++- tests/testsuite/cargo_init/simple_git/stdout.log | 0 tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs | 3 ++- tests/testsuite/cargo_init/simple_git_ignore_exists/stdout.log | 0 tests/testsuite/cargo_init/simple_hg/mod.rs | 3 ++- tests/testsuite/cargo_init/simple_hg/stdout.log | 0 tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs | 3 ++- tests/testsuite/cargo_init/simple_hg_ignore_exists/stdout.log | 0 tests/testsuite/cargo_init/simple_lib/mod.rs | 3 ++- tests/testsuite/cargo_init/simple_lib/stdout.log | 0 tests/testsuite/cargo_init/unknown_flags/mod.rs | 3 ++- tests/testsuite/cargo_init/unknown_flags/stdout.log | 0 tests/testsuite/cargo_init/with_argument/mod.rs | 3 ++- tests/testsuite/cargo_init/with_argument/stdout.log | 0 tests/testsuite/cargo_init/workspace_add_member/mod.rs | 3 ++- tests/testsuite/cargo_init/workspace_add_member/stdout.log | 0 tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs | 3 ++- .../cargo_new/add_members_to_non_workspace/stdout.log | 0 .../add_members_to_workspace_format_previous_items/mod.rs | 3 ++- .../add_members_to_workspace_format_previous_items/stdout.log | 0 .../cargo_new/add_members_to_workspace_format_sorted/mod.rs | 3 ++- .../add_members_to_workspace_format_sorted/stdout.log | 0 .../add_members_to_workspace_with_absolute_package_path/mod.rs | 3 ++- .../stdout.log | 0 .../add_members_to_workspace_with_empty_members/mod.rs | 3 ++- .../add_members_to_workspace_with_empty_members/stdout.log | 0 .../add_members_to_workspace_with_exclude_list/mod.rs | 3 ++- .../add_members_to_workspace_with_exclude_list/stdout.log | 0 .../add_members_to_workspace_with_members_glob/mod.rs | 3 ++- .../add_members_to_workspace_with_members_glob/stdout.log | 0 .../cargo_new/add_members_to_workspace_without_members/mod.rs | 3 ++- .../add_members_to_workspace_without_members/stdout.log | 0 tests/testsuite/cargo_new/empty_name/mod.rs | 3 ++- tests/testsuite/cargo_new/empty_name/stdout.log | 0 tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs | 3 ++- tests/testsuite/cargo_new/inherit_workspace_lints/stdout.log | 0 .../testsuite/cargo_new/inherit_workspace_package_table/mod.rs | 3 ++- .../cargo_new/inherit_workspace_package_table/stdout.log | 0 .../inherit_workspace_package_table_with_edition/mod.rs | 3 ++- .../inherit_workspace_package_table_with_edition/stdout.log | 0 .../inherit_workspace_package_table_with_registry/mod.rs | 3 ++- .../inherit_workspace_package_table_with_registry/stdout.log | 0 .../inherit_workspace_package_table_without_version/mod.rs | 3 ++- .../inherit_workspace_package_table_without_version/stdout.log | 0 .../not_inherit_workspace_package_table_if_not_members/mod.rs | 3 ++- .../stdout.log | 0 tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs | 3 ++- tests/testsuite/cargo_remove/avoid_empty_tables/stdout.log | 0 tests/testsuite/cargo_remove/build/mod.rs | 3 ++- tests/testsuite/cargo_remove/build/stdout.log | 0 tests/testsuite/cargo_remove/dev/mod.rs | 3 ++- tests/testsuite/cargo_remove/dev/stdout.log | 0 tests/testsuite/cargo_remove/dry_run/mod.rs | 3 ++- tests/testsuite/cargo_remove/dry_run/stdout.log | 0 tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs | 3 ++- tests/testsuite/cargo_remove/gc_keep_used_patch/stdout.log | 0 tests/testsuite/cargo_remove/gc_patch/mod.rs | 3 ++- tests/testsuite/cargo_remove/gc_patch/stdout.log | 0 tests/testsuite/cargo_remove/gc_profile/mod.rs | 3 ++- tests/testsuite/cargo_remove/gc_profile/stdout.log | 0 tests/testsuite/cargo_remove/gc_replace/mod.rs | 3 ++- tests/testsuite/cargo_remove/gc_replace/stdout.log | 0 tests/testsuite/cargo_remove/invalid_arg/mod.rs | 3 ++- tests/testsuite/cargo_remove/invalid_arg/stdout.log | 0 tests/testsuite/cargo_remove/invalid_dep/mod.rs | 3 ++- tests/testsuite/cargo_remove/invalid_dep/stdout.log | 0 tests/testsuite/cargo_remove/invalid_package/mod.rs | 3 ++- tests/testsuite/cargo_remove/invalid_package/stdout.log | 0 tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs | 3 ++- .../testsuite/cargo_remove/invalid_package_multiple/stdout.log | 0 tests/testsuite/cargo_remove/invalid_section/mod.rs | 3 ++- tests/testsuite/cargo_remove/invalid_section/stdout.log | 0 tests/testsuite/cargo_remove/invalid_section_dep/mod.rs | 3 ++- tests/testsuite/cargo_remove/invalid_section_dep/stdout.log | 0 tests/testsuite/cargo_remove/invalid_target/mod.rs | 3 ++- tests/testsuite/cargo_remove/invalid_target/stdout.log | 0 tests/testsuite/cargo_remove/invalid_target_dep/mod.rs | 3 ++- tests/testsuite/cargo_remove/invalid_target_dep/stdout.log | 0 tests/testsuite/cargo_remove/multiple_deps/mod.rs | 3 ++- tests/testsuite/cargo_remove/multiple_deps/stdout.log | 0 tests/testsuite/cargo_remove/multiple_dev/mod.rs | 3 ++- tests/testsuite/cargo_remove/multiple_dev/stdout.log | 0 tests/testsuite/cargo_remove/no_arg/mod.rs | 3 ++- tests/testsuite/cargo_remove/no_arg/stdout.log | 0 tests/testsuite/cargo_remove/offline/mod.rs | 3 ++- tests/testsuite/cargo_remove/offline/stdout.log | 0 tests/testsuite/cargo_remove/optional_dep_feature/mod.rs | 3 ++- tests/testsuite/cargo_remove/optional_dep_feature/stdout.log | 0 .../cargo_remove/optional_dep_feature_formatting/mod.rs | 3 ++- .../cargo_remove/optional_dep_feature_formatting/stdout.log | 0 tests/testsuite/cargo_remove/optional_feature/mod.rs | 3 ++- tests/testsuite/cargo_remove/optional_feature/stdout.log | 0 tests/testsuite/cargo_remove/package/mod.rs | 3 ++- tests/testsuite/cargo_remove/package/stdout.log | 0 tests/testsuite/cargo_remove/remove_basic/mod.rs | 3 ++- tests/testsuite/cargo_remove/remove_basic/stdout.log | 0 tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs | 3 ++- tests/testsuite/cargo_remove/skip_gc_glob_profile/stdout.log | 0 tests/testsuite/cargo_remove/target/mod.rs | 3 ++- tests/testsuite/cargo_remove/target/stdout.log | 0 tests/testsuite/cargo_remove/target_build/mod.rs | 3 ++- tests/testsuite/cargo_remove/target_build/stdout.log | 0 tests/testsuite/cargo_remove/target_dev/mod.rs | 3 ++- tests/testsuite/cargo_remove/target_dev/stdout.log | 0 tests/testsuite/cargo_remove/update_lock_file/mod.rs | 3 ++- tests/testsuite/cargo_remove/update_lock_file/stdout.log | 0 tests/testsuite/cargo_remove/workspace/mod.rs | 3 ++- tests/testsuite/cargo_remove/workspace/stdout.log | 0 tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs | 3 ++- tests/testsuite/cargo_remove/workspace_non_virtual/stdout.log | 0 tests/testsuite/cargo_remove/workspace_preserved/mod.rs | 3 ++- tests/testsuite/cargo_remove/workspace_preserved/stdout.log | 0 tests/testsuite/cargo_test/no_keep_going/mod.rs | 3 ++- tests/testsuite/cargo_test/no_keep_going/stdout.log | 0 tests/testsuite/cargo_update/toolchain_pkgname/mod.rs | 3 ++- tests/testsuite/cargo_update/toolchain_pkgname/stdout.log | 0 442 files changed, 441 insertions(+), 222 deletions(-) delete mode 100644 tests/testsuite/cargo_add/add_basic/stdout.log delete mode 100644 tests/testsuite/cargo_add/add_multiple/stdout.log delete mode 100644 tests/testsuite/cargo_add/add_normalized_name_external/stdout.log delete mode 100644 tests/testsuite/cargo_add/add_toolchain/stdout.log delete mode 100644 tests/testsuite/cargo_add/build/stdout.log delete mode 100644 tests/testsuite/cargo_add/build_prefer_existing_version/stdout.log delete mode 100644 tests/testsuite/cargo_add/change_rename_target/stdout.log delete mode 100644 tests/testsuite/cargo_add/cyclic_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/default_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/deprecated_default_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/deprecated_section/stdout.log delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit/stdout.log delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_optional/stdout.log delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_public/stdout.log delete mode 100644 tests/testsuite/cargo_add/dev/stdout.log delete mode 100644 tests/testsuite/cargo_add/dev_build_conflict/stdout.log delete mode 100644 tests/testsuite/cargo_add/dev_prefer_existing_version/stdout.log delete mode 100644 tests/testsuite/cargo_add/dry_run/stdout.log delete mode 100644 tests/testsuite/cargo_add/empty_dep_name/stdout.log delete mode 100644 tests/testsuite/cargo_add/empty_dep_table/stdout.log delete mode 100644 tests/testsuite/cargo_add/features/stdout.log delete mode 100644 tests/testsuite/cargo_add/features_activated_over_limit/stdout.log delete mode 100644 tests/testsuite/cargo_add/features_deactivated_over_limit/stdout.log delete mode 100644 tests/testsuite/cargo_add/features_empty/stdout.log delete mode 100644 tests/testsuite/cargo_add/features_multiple_occurrences/stdout.log delete mode 100644 tests/testsuite/cargo_add/features_preserve/stdout.log delete mode 100644 tests/testsuite/cargo_add/features_spaced_values/stdout.log delete mode 100644 tests/testsuite/cargo_add/features_unknown/stdout.log delete mode 100644 tests/testsuite/cargo_add/features_unknown_no_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/git/stdout.log delete mode 100644 tests/testsuite/cargo_add/git_branch/stdout.log delete mode 100644 tests/testsuite/cargo_add/git_conflicts_namever/stdout.log delete mode 100644 tests/testsuite/cargo_add/git_dev/stdout.log delete mode 100644 tests/testsuite/cargo_add/git_inferred_name/stdout.log delete mode 100644 tests/testsuite/cargo_add/git_inferred_name_multiple/stdout.log delete mode 100644 tests/testsuite/cargo_add/git_multiple_names/stdout.log delete mode 100644 tests/testsuite/cargo_add/git_multiple_packages_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/git_normalized_name/stdout.log delete mode 100644 tests/testsuite/cargo_add/git_registry/stdout.log delete mode 100644 tests/testsuite/cargo_add/git_rev/stdout.log delete mode 100644 tests/testsuite/cargo_add/git_tag/stdout.log delete mode 100644 tests/testsuite/cargo_add/infer_prerelease/stdout.log delete mode 100644 tests/testsuite/cargo_add/invalid_arg/stdout.log delete mode 100644 tests/testsuite/cargo_add/invalid_git_name/stdout.log delete mode 100644 tests/testsuite/cargo_add/invalid_key_inherit_dependency/stdout.log delete mode 100644 tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stdout.log delete mode 100644 tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stdout.log delete mode 100644 tests/testsuite/cargo_add/invalid_manifest/stdout.log delete mode 100644 tests/testsuite/cargo_add/invalid_name_external/stdout.log delete mode 100644 tests/testsuite/cargo_add/invalid_path/stdout.log delete mode 100644 tests/testsuite/cargo_add/invalid_path_name/stdout.log delete mode 100644 tests/testsuite/cargo_add/invalid_path_self/stdout.log delete mode 100644 tests/testsuite/cargo_add/invalid_target_empty/stdout.log delete mode 100644 tests/testsuite/cargo_add/invalid_vers/stdout.log delete mode 100644 tests/testsuite/cargo_add/list_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/list_features_path/stdout.log delete mode 100644 tests/testsuite/cargo_add/list_features_path_no_default/stdout.log delete mode 100644 tests/testsuite/cargo_add/locked_changed/stdout.log delete mode 100644 tests/testsuite/cargo_add/locked_unchanged/stdout.log delete mode 100644 tests/testsuite/cargo_add/lockfile_updated/stdout.log delete mode 100644 tests/testsuite/cargo_add/manifest_path_package/stdout.log delete mode 100644 tests/testsuite/cargo_add/merge_activated_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/multiple_conflicts_with_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/multiple_conflicts_with_rename/stdout.log delete mode 100644 tests/testsuite/cargo_add/namever/stdout.log delete mode 100644 tests/testsuite/cargo_add/no_args/stdout.log delete mode 100644 tests/testsuite/cargo_add/no_default_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/no_optional/stdout.log delete mode 100644 tests/testsuite/cargo_add/no_public/stdout.log delete mode 100644 tests/testsuite/cargo_add/offline_empty_cache/stdout.log delete mode 100644 tests/testsuite/cargo_add/optional/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_default_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_git_with_path/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_inherit_features_noop/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_inherit_noop/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_inline_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_name_dev_noop/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_name_noop/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_no_default_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_no_optional/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_no_public/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_no_public_with_public/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_optional/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_optional_with_optional/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_path_noop/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_path_with_version/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_preserves_inline_table/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_public/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_public_with_no_public/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_rename/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_version_with_git/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_version_with_path/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_with_rename/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_workspace_dep/stdout.log delete mode 100644 tests/testsuite/cargo_add/overwrite_workspace_dep_features/stdout.log delete mode 100644 tests/testsuite/cargo_add/path/stdout.log delete mode 100644 tests/testsuite/cargo_add/path_dev/stdout.log delete mode 100644 tests/testsuite/cargo_add/path_inferred_name/stdout.log delete mode 100644 tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stdout.log delete mode 100644 tests/testsuite/cargo_add/path_normalized_name/stdout.log delete mode 100644 tests/testsuite/cargo_add/preserve_dep_std_table/stdout.log delete mode 100644 tests/testsuite/cargo_add/preserve_features_table/stdout.log delete mode 100644 tests/testsuite/cargo_add/preserve_sorted/stdout.log delete mode 100644 tests/testsuite/cargo_add/preserve_unsorted/stdout.log delete mode 100644 tests/testsuite/cargo_add/public/stdout.log delete mode 100644 tests/testsuite/cargo_add/quiet/stdout.log delete mode 100644 tests/testsuite/cargo_add/registry/stdout.log delete mode 100644 tests/testsuite/cargo_add/rename/stdout.log delete mode 100644 tests/testsuite/cargo_add/require_weak/stdout.log delete mode 100644 tests/testsuite/cargo_add/rust_version_ignore/stdout.log delete mode 100644 tests/testsuite/cargo_add/rust_version_incompatible/stdout.log delete mode 100644 tests/testsuite/cargo_add/rust_version_latest/stdout.log delete mode 100644 tests/testsuite/cargo_add/rust_version_older/stdout.log delete mode 100644 tests/testsuite/cargo_add/sorted_table_with_dotted_item/stdout.log delete mode 100644 tests/testsuite/cargo_add/target/stdout.log delete mode 100644 tests/testsuite/cargo_add/target_cfg/stdout.log delete mode 100644 tests/testsuite/cargo_add/unknown_inherited_feature/stdout.log delete mode 100644 tests/testsuite/cargo_add/vers/stdout.log delete mode 100644 tests/testsuite/cargo_add/workspace_name/stdout.log delete mode 100644 tests/testsuite/cargo_add/workspace_path/stdout.log delete mode 100644 tests/testsuite/cargo_add/workspace_path_dev/stdout.log delete mode 100644 tests/testsuite/cargo_bench/no_keep_going/stdout.log delete mode 100644 tests/testsuite/cargo_init/auto_git/stdout.log delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_explicit/stdout.log delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stdout.log delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit/stdout.log delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stdout.log delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stdout.log delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stdout.log delete mode 100644 tests/testsuite/cargo_init/both_lib_and_bin/stdout.log delete mode 100644 tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stdout.log delete mode 100644 tests/testsuite/cargo_init/confused_by_multiple_lib_files/stdout.log delete mode 100644 tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stdout.log delete mode 100644 tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stdout.log delete mode 100644 tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stdout.log delete mode 100644 tests/testsuite/cargo_init/explicit_bin_with_git/stdout.log delete mode 100644 tests/testsuite/cargo_init/formats_source/stdout.log delete mode 100644 tests/testsuite/cargo_init/fossil_autodetect/stdout.log delete mode 100644 tests/testsuite/cargo_init/git_autodetect/stdout.log delete mode 100644 tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stdout.log delete mode 100644 tests/testsuite/cargo_init/ignores_failure_to_format_source/stdout.log delete mode 100644 tests/testsuite/cargo_init/inferred_bin_with_git/stdout.log delete mode 100644 tests/testsuite/cargo_init/inferred_lib_with_git/stdout.log delete mode 100644 tests/testsuite/cargo_init/inherit_workspace_package_table/stdout.log delete mode 100644 tests/testsuite/cargo_init/invalid_dir_name/stdout.log delete mode 100644 tests/testsuite/cargo_init/lib_already_exists_nosrc/stdout.log delete mode 100644 tests/testsuite/cargo_init/lib_already_exists_src/stdout.log delete mode 100644 tests/testsuite/cargo_init/mercurial_autodetect/stdout.log delete mode 100644 tests/testsuite/cargo_init/multibin_project_name_clash/stdout.log delete mode 100644 tests/testsuite/cargo_init/no_filename/stdout.log delete mode 100644 tests/testsuite/cargo_init/path_contains_separator/stdout.log delete mode 100644 tests/testsuite/cargo_init/pijul_autodetect/stdout.log delete mode 100644 tests/testsuite/cargo_init/reserved_name/stdout.log delete mode 100644 tests/testsuite/cargo_init/simple_bin/stdout.log delete mode 100644 tests/testsuite/cargo_init/simple_git/stdout.log delete mode 100644 tests/testsuite/cargo_init/simple_git_ignore_exists/stdout.log delete mode 100644 tests/testsuite/cargo_init/simple_hg/stdout.log delete mode 100644 tests/testsuite/cargo_init/simple_hg_ignore_exists/stdout.log delete mode 100644 tests/testsuite/cargo_init/simple_lib/stdout.log delete mode 100644 tests/testsuite/cargo_init/unknown_flags/stdout.log delete mode 100644 tests/testsuite/cargo_init/with_argument/stdout.log delete mode 100644 tests/testsuite/cargo_init/workspace_add_member/stdout.log delete mode 100644 tests/testsuite/cargo_new/add_members_to_non_workspace/stdout.log delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stdout.log delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stdout.log delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stdout.log delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stdout.log delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stdout.log delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stdout.log delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_without_members/stdout.log delete mode 100644 tests/testsuite/cargo_new/empty_name/stdout.log delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_lints/stdout.log delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table/stdout.log delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stdout.log delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stdout.log delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stdout.log delete mode 100644 tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stdout.log delete mode 100644 tests/testsuite/cargo_remove/avoid_empty_tables/stdout.log delete mode 100644 tests/testsuite/cargo_remove/build/stdout.log delete mode 100644 tests/testsuite/cargo_remove/dev/stdout.log delete mode 100644 tests/testsuite/cargo_remove/dry_run/stdout.log delete mode 100644 tests/testsuite/cargo_remove/gc_keep_used_patch/stdout.log delete mode 100644 tests/testsuite/cargo_remove/gc_patch/stdout.log delete mode 100644 tests/testsuite/cargo_remove/gc_profile/stdout.log delete mode 100644 tests/testsuite/cargo_remove/gc_replace/stdout.log delete mode 100644 tests/testsuite/cargo_remove/invalid_arg/stdout.log delete mode 100644 tests/testsuite/cargo_remove/invalid_dep/stdout.log delete mode 100644 tests/testsuite/cargo_remove/invalid_package/stdout.log delete mode 100644 tests/testsuite/cargo_remove/invalid_package_multiple/stdout.log delete mode 100644 tests/testsuite/cargo_remove/invalid_section/stdout.log delete mode 100644 tests/testsuite/cargo_remove/invalid_section_dep/stdout.log delete mode 100644 tests/testsuite/cargo_remove/invalid_target/stdout.log delete mode 100644 tests/testsuite/cargo_remove/invalid_target_dep/stdout.log delete mode 100644 tests/testsuite/cargo_remove/multiple_deps/stdout.log delete mode 100644 tests/testsuite/cargo_remove/multiple_dev/stdout.log delete mode 100644 tests/testsuite/cargo_remove/no_arg/stdout.log delete mode 100644 tests/testsuite/cargo_remove/offline/stdout.log delete mode 100644 tests/testsuite/cargo_remove/optional_dep_feature/stdout.log delete mode 100644 tests/testsuite/cargo_remove/optional_dep_feature_formatting/stdout.log delete mode 100644 tests/testsuite/cargo_remove/optional_feature/stdout.log delete mode 100644 tests/testsuite/cargo_remove/package/stdout.log delete mode 100644 tests/testsuite/cargo_remove/remove_basic/stdout.log delete mode 100644 tests/testsuite/cargo_remove/skip_gc_glob_profile/stdout.log delete mode 100644 tests/testsuite/cargo_remove/target/stdout.log delete mode 100644 tests/testsuite/cargo_remove/target_build/stdout.log delete mode 100644 tests/testsuite/cargo_remove/target_dev/stdout.log delete mode 100644 tests/testsuite/cargo_remove/update_lock_file/stdout.log delete mode 100644 tests/testsuite/cargo_remove/workspace/stdout.log delete mode 100644 tests/testsuite/cargo_remove/workspace_non_virtual/stdout.log delete mode 100644 tests/testsuite/cargo_remove/workspace_preserved/stdout.log delete mode 100644 tests/testsuite/cargo_test/no_keep_going/stdout.log delete mode 100644 tests/testsuite/cargo_update/toolchain_pkgname/stdout.log diff --git a/tests/testsuite/cargo_add/add_basic/mod.rs b/tests/testsuite/cargo_add/add_basic/mod.rs index e7bf45e86b5..1e8c7dde2c2 100644 --- a/tests/testsuite/cargo_add/add_basic/mod.rs +++ b/tests/testsuite/cargo_add/add_basic/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/add_basic/stdout.log b/tests/testsuite/cargo_add/add_basic/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/add_multiple/mod.rs b/tests/testsuite/cargo_add/add_multiple/mod.rs index ffab903a6ce..cab3b4e4eaa 100644 --- a/tests/testsuite/cargo_add/add_multiple/mod.rs +++ b/tests/testsuite/cargo_add/add_multiple/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/add_multiple/stdout.log b/tests/testsuite/cargo_add/add_multiple/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 c455e9d88b8..bf5c57922f1 100644 --- a/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs +++ b/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -34,7 +35,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/add_normalized_name_external/stdout.log b/tests/testsuite/cargo_add/add_normalized_name_external/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/add_toolchain/mod.rs b/tests/testsuite/cargo_add/add_toolchain/mod.rs index 3be555f37a4..6b8aaf1855c 100644 --- a/tests/testsuite/cargo_add/add_toolchain/mod.rs +++ b/tests/testsuite/cargo_add/add_toolchain/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/add_toolchain/stdout.log b/tests/testsuite/cargo_add/add_toolchain/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/build/mod.rs b/tests/testsuite/cargo_add/build/mod.rs index 35ffd5674ff..2635db0d8b7 100644 --- a/tests/testsuite/cargo_add/build/mod.rs +++ b/tests/testsuite/cargo_add/build/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/build/stdout.log b/tests/testsuite/cargo_add/build/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 25462d5ec91..7d8d4118a12 100644 --- a/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs +++ b/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/stdout.log b/tests/testsuite/cargo_add/build_prefer_existing_version/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/change_rename_target/mod.rs b/tests/testsuite/cargo_add/change_rename_target/mod.rs index d6705379aff..563b1099715 100644 --- a/tests/testsuite/cargo_add/change_rename_target/mod.rs +++ b/tests/testsuite/cargo_add/change_rename_target/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/change_rename_target/stdout.log b/tests/testsuite/cargo_add/change_rename_target/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/cyclic_features/mod.rs b/tests/testsuite/cargo_add/cyclic_features/mod.rs index eeac50de51a..d2d1642742e 100644 --- a/tests/testsuite/cargo_add/cyclic_features/mod.rs +++ b/tests/testsuite/cargo_add/cyclic_features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -23,7 +24,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/cyclic_features/stdout.log b/tests/testsuite/cargo_add/cyclic_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/default_features/mod.rs b/tests/testsuite/cargo_add/default_features/mod.rs index 6994260abf6..b05f081e3a4 100644 --- a/tests/testsuite/cargo_add/default_features/mod.rs +++ b/tests/testsuite/cargo_add/default_features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/default_features/stdout.log b/tests/testsuite/cargo_add/default_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/deprecated_default_features/mod.rs b/tests/testsuite/cargo_add/deprecated_default_features/mod.rs index 6baa89265ef..55f0434e9b1 100644 --- a/tests/testsuite/cargo_add/deprecated_default_features/mod.rs +++ b/tests/testsuite/cargo_add/deprecated_default_features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(&cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/deprecated_default_features/stdout.log b/tests/testsuite/cargo_add/deprecated_default_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/deprecated_section/mod.rs b/tests/testsuite/cargo_add/deprecated_section/mod.rs index 6baa89265ef..55f0434e9b1 100644 --- a/tests/testsuite/cargo_add/deprecated_section/mod.rs +++ b/tests/testsuite/cargo_add/deprecated_section/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(&cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/deprecated_section/stdout.log b/tests/testsuite/cargo_add/deprecated_section/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs index 60b454d3255..cdaac6b9b18 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs +++ b/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -18,7 +19,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/stdout.log b/tests/testsuite/cargo_add/detect_workspace_inherit/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 9cf13026cc5..d2df34c2d02 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -18,7 +19,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/stdout.log b/tests/testsuite/cargo_add/detect_workspace_inherit_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 faac9b7facd..501d4dfe634 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -18,7 +19,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stdout.log b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 d920ddada1e..c474ffdc05d 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -19,7 +20,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/stdout.log b/tests/testsuite/cargo_add/detect_workspace_inherit_public/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/dev/mod.rs b/tests/testsuite/cargo_add/dev/mod.rs index 7e1532a9b6e..bd395ef72e6 100644 --- a/tests/testsuite/cargo_add/dev/mod.rs +++ b/tests/testsuite/cargo_add/dev/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/dev/stdout.log b/tests/testsuite/cargo_add/dev/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/dev_build_conflict/mod.rs b/tests/testsuite/cargo_add/dev_build_conflict/mod.rs index f836e301569..bf672e61a84 100644 --- a/tests/testsuite/cargo_add/dev_build_conflict/mod.rs +++ b/tests/testsuite/cargo_add/dev_build_conflict/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/dev_build_conflict/stdout.log b/tests/testsuite/cargo_add/dev_build_conflict/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 e7a09805dfa..46ebd2cf542 100644 --- a/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs +++ b/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/stdout.log b/tests/testsuite/cargo_add/dev_prefer_existing_version/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/dry_run/mod.rs b/tests/testsuite/cargo_add/dry_run/mod.rs index 8afffdc2acd..0100bc47a71 100644 --- a/tests/testsuite/cargo_add/dry_run/mod.rs +++ b/tests/testsuite/cargo_add/dry_run/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/dry_run/stdout.log b/tests/testsuite/cargo_add/dry_run/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/empty_dep_name/mod.rs b/tests/testsuite/cargo_add/empty_dep_name/mod.rs index 0c7dd0daa39..545ecd2dae7 100644 --- a/tests/testsuite/cargo_add/empty_dep_name/mod.rs +++ b/tests/testsuite/cargo_add/empty_dep_name/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -17,7 +18,7 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/empty_dep_name/stdout.log b/tests/testsuite/cargo_add/empty_dep_name/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/empty_dep_table/mod.rs b/tests/testsuite/cargo_add/empty_dep_table/mod.rs index f06d47cfb28..10675dd2f5e 100644 --- a/tests/testsuite/cargo_add/empty_dep_table/mod.rs +++ b/tests/testsuite/cargo_add/empty_dep_table/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -24,7 +25,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/empty_dep_table/stdout.log b/tests/testsuite/cargo_add/empty_dep_table/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/features/mod.rs b/tests/testsuite/cargo_add/features/mod.rs index d3e485a561f..79155d0facd 100644 --- a/tests/testsuite/cargo_add/features/mod.rs +++ b/tests/testsuite/cargo_add/features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -24,7 +25,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/features/stdout.log b/tests/testsuite/cargo_add/features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 689245de3ba..31ba1cdcbd8 100644 --- a/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs +++ b/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; use itertools::Itertools; @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/stdout.log b/tests/testsuite/cargo_add/features_activated_over_limit/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 287dce6674e..2cf3aab6782 100644 --- a/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs +++ b/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; use itertools::Itertools; @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/features_deactivated_over_limit/stdout.log b/tests/testsuite/cargo_add/features_deactivated_over_limit/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/features_empty/mod.rs b/tests/testsuite/cargo_add/features_empty/mod.rs index a18e1062bcd..7434bad89df 100644 --- a/tests/testsuite/cargo_add/features_empty/mod.rs +++ b/tests/testsuite/cargo_add/features_empty/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -24,7 +25,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/features_empty/stdout.log b/tests/testsuite/cargo_add/features_empty/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs b/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs index 535944f2c7c..a5a66680ecc 100644 --- a/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs +++ b/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -24,7 +25,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/stdout.log b/tests/testsuite/cargo_add/features_multiple_occurrences/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/features_preserve/mod.rs b/tests/testsuite/cargo_add/features_preserve/mod.rs index d06571d37d2..b9f3eb61b08 100644 --- a/tests/testsuite/cargo_add/features_preserve/mod.rs +++ b/tests/testsuite/cargo_add/features_preserve/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -24,7 +25,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/features_preserve/stdout.log b/tests/testsuite/cargo_add/features_preserve/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/features_spaced_values/mod.rs b/tests/testsuite/cargo_add/features_spaced_values/mod.rs index 7b31b535d51..d1520a1b240 100644 --- a/tests/testsuite/cargo_add/features_spaced_values/mod.rs +++ b/tests/testsuite/cargo_add/features_spaced_values/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -24,7 +25,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/features_spaced_values/stdout.log b/tests/testsuite/cargo_add/features_spaced_values/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/features_unknown/mod.rs b/tests/testsuite/cargo_add/features_unknown/mod.rs index 4f4dbc85a98..d29f0514c37 100644 --- a/tests/testsuite/cargo_add/features_unknown/mod.rs +++ b/tests/testsuite/cargo_add/features_unknown/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -24,7 +25,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/features_unknown/stdout.log b/tests/testsuite/cargo_add/features_unknown/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 25a62208e96..c3b8ca1187f 100644 --- a/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs +++ b/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/features_unknown_no_features/stdout.log b/tests/testsuite/cargo_add/features_unknown_no_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/git/mod.rs b/tests/testsuite/cargo_add/git/mod.rs index 8a4a6deebb3..7460071a24d 100644 --- a/tests/testsuite/cargo_add/git/mod.rs +++ b/tests/testsuite/cargo_add/git/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -27,7 +28,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/git/stdout.log b/tests/testsuite/cargo_add/git/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/git_branch/mod.rs b/tests/testsuite/cargo_add/git_branch/mod.rs index 7eb02246812..46f00a7d96b 100644 --- a/tests/testsuite/cargo_add/git_branch/mod.rs +++ b/tests/testsuite/cargo_add/git_branch/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -30,7 +31,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/git_branch/stdout.log b/tests/testsuite/cargo_add/git_branch/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs b/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs index fc71c56a6d4..515b6645820 100644 --- a/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs +++ b/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -33,7 +34,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/git_conflicts_namever/stdout.log b/tests/testsuite/cargo_add/git_conflicts_namever/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/git_dev/mod.rs b/tests/testsuite/cargo_add/git_dev/mod.rs index 767101c4743..2ad6a11e111 100644 --- a/tests/testsuite/cargo_add/git_dev/mod.rs +++ b/tests/testsuite/cargo_add/git_dev/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -27,7 +28,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/git_dev/stdout.log b/tests/testsuite/cargo_add/git_dev/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/git_inferred_name/mod.rs b/tests/testsuite/cargo_add/git_inferred_name/mod.rs index 43069653765..ec2ae613c70 100644 --- a/tests/testsuite/cargo_add/git_inferred_name/mod.rs +++ b/tests/testsuite/cargo_add/git_inferred_name/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -27,7 +28,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/git_inferred_name/stdout.log b/tests/testsuite/cargo_add/git_inferred_name/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 30254de726c..5da681c0741 100644 --- a/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs +++ b/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -67,7 +68,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/git_inferred_name_multiple/stdout.log b/tests/testsuite/cargo_add/git_inferred_name_multiple/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/git_multiple_names/mod.rs b/tests/testsuite/cargo_add/git_multiple_names/mod.rs index 61f8cc987b8..2bf2668aafb 100644 --- a/tests/testsuite/cargo_add/git_multiple_names/mod.rs +++ b/tests/testsuite/cargo_add/git_multiple_names/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -45,7 +46,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/git_multiple_names/stdout.log b/tests/testsuite/cargo_add/git_multiple_names/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 fe14f67b56c..085c3b9e4d0 100644 --- a/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs +++ b/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -56,7 +57,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/stdout.log b/tests/testsuite/cargo_add/git_multiple_packages_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/git_normalized_name/mod.rs b/tests/testsuite/cargo_add/git_normalized_name/mod.rs index f539f79866f..bb45065363f 100644 --- a/tests/testsuite/cargo_add/git_normalized_name/mod.rs +++ b/tests/testsuite/cargo_add/git_normalized_name/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -27,7 +28,7 @@ fn case() { .current_dir(cwd) .assert() .failure() // Fuzzy searching for paths isn't supported at this time - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/git_normalized_name/stdout.log b/tests/testsuite/cargo_add/git_normalized_name/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/git_registry/mod.rs b/tests/testsuite/cargo_add/git_registry/mod.rs index 35c0d7b06b8..638927de2b3 100644 --- a/tests/testsuite/cargo_add/git_registry/mod.rs +++ b/tests/testsuite/cargo_add/git_registry/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -46,7 +47,7 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/git_registry/stdout.log b/tests/testsuite/cargo_add/git_registry/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/git_rev/mod.rs b/tests/testsuite/cargo_add/git_rev/mod.rs index ee380023949..5104a351d71 100644 --- a/tests/testsuite/cargo_add/git_rev/mod.rs +++ b/tests/testsuite/cargo_add/git_rev/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/git_rev/stdout.log b/tests/testsuite/cargo_add/git_rev/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/git_tag/mod.rs b/tests/testsuite/cargo_add/git_tag/mod.rs index c3f50467502..fcac9731ef9 100644 --- a/tests/testsuite/cargo_add/git_tag/mod.rs +++ b/tests/testsuite/cargo_add/git_tag/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/git_tag/stdout.log b/tests/testsuite/cargo_add/git_tag/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/infer_prerelease/mod.rs b/tests/testsuite/cargo_add/infer_prerelease/mod.rs index e36b8dd0b80..b51be512596 100644 --- a/tests/testsuite/cargo_add/infer_prerelease/mod.rs +++ b/tests/testsuite/cargo_add/infer_prerelease/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -19,7 +20,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/infer_prerelease/stdout.log b/tests/testsuite/cargo_add/infer_prerelease/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/invalid_arg/mod.rs b/tests/testsuite/cargo_add/invalid_arg/mod.rs index 45627df2184..9aa5be32792 100644 --- a/tests/testsuite/cargo_add/invalid_arg/mod.rs +++ b/tests/testsuite/cargo_add/invalid_arg/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/invalid_arg/stdout.log b/tests/testsuite/cargo_add/invalid_arg/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/invalid_git_name/mod.rs b/tests/testsuite/cargo_add/invalid_git_name/mod.rs index e9b888d3586..bf3dd1c292e 100644 --- a/tests/testsuite/cargo_add/invalid_git_name/mod.rs +++ b/tests/testsuite/cargo_add/invalid_git_name/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -27,7 +28,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/invalid_git_name/stdout.log b/tests/testsuite/cargo_add/invalid_git_name/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 50acea2a655..d4a5f4bbfc9 100644 --- a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs +++ b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stdout.log b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 50acea2a655..d4a5f4bbfc9 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stdout.log b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 a56d7b5fce1..2b34aeda2fc 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stdout.log b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/invalid_manifest/mod.rs b/tests/testsuite/cargo_add/invalid_manifest/mod.rs index 488f543d468..bbcbce39701 100644 --- a/tests/testsuite/cargo_add/invalid_manifest/mod.rs +++ b/tests/testsuite/cargo_add/invalid_manifest/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/invalid_manifest/stdout.log b/tests/testsuite/cargo_add/invalid_manifest/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/invalid_name_external/mod.rs b/tests/testsuite/cargo_add/invalid_name_external/mod.rs index 7fc0868f4c3..1213ce51ea9 100644 --- a/tests/testsuite/cargo_add/invalid_name_external/mod.rs +++ b/tests/testsuite/cargo_add/invalid_name_external/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -18,7 +19,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/invalid_name_external/stdout.log b/tests/testsuite/cargo_add/invalid_name_external/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/invalid_path/mod.rs b/tests/testsuite/cargo_add/invalid_path/mod.rs index 0b3a5ec8d63..c22bbb4b8a4 100644 --- a/tests/testsuite/cargo_add/invalid_path/mod.rs +++ b/tests/testsuite/cargo_add/invalid_path/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -18,7 +19,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/invalid_path/stdout.log b/tests/testsuite/cargo_add/invalid_path/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/invalid_path_name/mod.rs b/tests/testsuite/cargo_add/invalid_path_name/mod.rs index 264a3f1ee97..8b28bde7e2b 100644 --- a/tests/testsuite/cargo_add/invalid_path_name/mod.rs +++ b/tests/testsuite/cargo_add/invalid_path_name/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -30,7 +31,7 @@ fn case() { .current_dir(&cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/invalid_path_name/stdout.log b/tests/testsuite/cargo_add/invalid_path_name/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/invalid_path_self/mod.rs b/tests/testsuite/cargo_add/invalid_path_self/mod.rs index 627d46a6b55..5f088a48e82 100644 --- a/tests/testsuite/cargo_add/invalid_path_self/mod.rs +++ b/tests/testsuite/cargo_add/invalid_path_self/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -18,7 +19,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/invalid_path_self/stdout.log b/tests/testsuite/cargo_add/invalid_path_self/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/invalid_target_empty/mod.rs b/tests/testsuite/cargo_add/invalid_target_empty/mod.rs index 93448e86592..35c1eb5d49b 100644 --- a/tests/testsuite/cargo_add/invalid_target_empty/mod.rs +++ b/tests/testsuite/cargo_add/invalid_target_empty/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/invalid_target_empty/stdout.log b/tests/testsuite/cargo_add/invalid_target_empty/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/invalid_vers/mod.rs b/tests/testsuite/cargo_add/invalid_vers/mod.rs index abaa1b29aaa..019dbbeedd2 100644 --- a/tests/testsuite/cargo_add/invalid_vers/mod.rs +++ b/tests/testsuite/cargo_add/invalid_vers/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/invalid_vers/stdout.log b/tests/testsuite/cargo_add/invalid_vers/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/list_features/mod.rs b/tests/testsuite/cargo_add/list_features/mod.rs index be5d0a05f0e..d882ec8be76 100644 --- a/tests/testsuite/cargo_add/list_features/mod.rs +++ b/tests/testsuite/cargo_add/list_features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -24,7 +25,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/list_features/stdout.log b/tests/testsuite/cargo_add/list_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/list_features_path/mod.rs b/tests/testsuite/cargo_add/list_features_path/mod.rs index 780c8485b58..722ef8bed01 100644 --- a/tests/testsuite/cargo_add/list_features_path/mod.rs +++ b/tests/testsuite/cargo_add/list_features_path/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -35,7 +36,7 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/list_features_path/stdout.log b/tests/testsuite/cargo_add/list_features_path/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 2e179e5ad8f..a961259abbc 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -40,7 +41,7 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/list_features_path_no_default/stdout.log b/tests/testsuite/cargo_add/list_features_path_no_default/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/locked_changed/mod.rs b/tests/testsuite/cargo_add/locked_changed/mod.rs index 7111027a477..f4dce4ac6f2 100644 --- a/tests/testsuite/cargo_add/locked_changed/mod.rs +++ b/tests/testsuite/cargo_add/locked_changed/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/locked_changed/stdout.log b/tests/testsuite/cargo_add/locked_changed/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/locked_unchanged/mod.rs b/tests/testsuite/cargo_add/locked_unchanged/mod.rs index dd76826583a..94a4dc3dc78 100644 --- a/tests/testsuite/cargo_add/locked_unchanged/mod.rs +++ b/tests/testsuite/cargo_add/locked_unchanged/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/locked_unchanged/stdout.log b/tests/testsuite/cargo_add/locked_unchanged/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/lockfile_updated/mod.rs b/tests/testsuite/cargo_add/lockfile_updated/mod.rs index b911d451cac..3036e4330cd 100644 --- a/tests/testsuite/cargo_add/lockfile_updated/mod.rs +++ b/tests/testsuite/cargo_add/lockfile_updated/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/lockfile_updated/stdout.log b/tests/testsuite/cargo_add/lockfile_updated/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/manifest_path_package/mod.rs b/tests/testsuite/cargo_add/manifest_path_package/mod.rs index ae015d49aa5..a8380e52961 100644 --- a/tests/testsuite/cargo_add/manifest_path_package/mod.rs +++ b/tests/testsuite/cargo_add/manifest_path_package/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -36,7 +37,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/manifest_path_package/stdout.log b/tests/testsuite/cargo_add/manifest_path_package/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/merge_activated_features/mod.rs b/tests/testsuite/cargo_add/merge_activated_features/mod.rs index 45b6b359dcd..0e742a9199b 100644 --- a/tests/testsuite/cargo_add/merge_activated_features/mod.rs +++ b/tests/testsuite/cargo_add/merge_activated_features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/merge_activated_features/stdout.log b/tests/testsuite/cargo_add/merge_activated_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 f818b1c68d0..ba4a00d0947 100644 --- a/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs +++ b/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -35,7 +36,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_features/stdout.log b/tests/testsuite/cargo_add/multiple_conflicts_with_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 ad68456df1e..b574b747ad3 100644 --- a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs +++ b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stdout.log b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/namever/mod.rs b/tests/testsuite/cargo_add/namever/mod.rs index 03c9ab4cc57..bc86ac22212 100644 --- a/tests/testsuite/cargo_add/namever/mod.rs +++ b/tests/testsuite/cargo_add/namever/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/namever/stdout.log b/tests/testsuite/cargo_add/namever/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/no_args/mod.rs b/tests/testsuite/cargo_add/no_args/mod.rs index 9a57b3c87d8..76960ab3c93 100644 --- a/tests/testsuite/cargo_add/no_args/mod.rs +++ b/tests/testsuite/cargo_add/no_args/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -17,7 +18,7 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/no_args/stdout.log b/tests/testsuite/cargo_add/no_args/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/no_default_features/mod.rs b/tests/testsuite/cargo_add/no_default_features/mod.rs index 6824244e641..6e982a17bed 100644 --- a/tests/testsuite/cargo_add/no_default_features/mod.rs +++ b/tests/testsuite/cargo_add/no_default_features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/no_default_features/stdout.log b/tests/testsuite/cargo_add/no_default_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/no_optional/mod.rs b/tests/testsuite/cargo_add/no_optional/mod.rs index 042f1de9faa..bc7a1bffe79 100644 --- a/tests/testsuite/cargo_add/no_optional/mod.rs +++ b/tests/testsuite/cargo_add/no_optional/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -19,7 +20,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/no_optional/stdout.log b/tests/testsuite/cargo_add/no_optional/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/no_public/mod.rs b/tests/testsuite/cargo_add/no_public/mod.rs index b435df9deab..5c63934a74b 100644 --- a/tests/testsuite/cargo_add/no_public/mod.rs +++ b/tests/testsuite/cargo_add/no_public/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -19,7 +20,7 @@ fn case() { .masquerade_as_nightly_cargo(&["public-dependency"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/no_public/stdout.log b/tests/testsuite/cargo_add/no_public/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/offline_empty_cache/mod.rs b/tests/testsuite/cargo_add/offline_empty_cache/mod.rs index 5fd1e56971f..9c50a7993e2 100644 --- a/tests/testsuite/cargo_add/offline_empty_cache/mod.rs +++ b/tests/testsuite/cargo_add/offline_empty_cache/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/offline_empty_cache/stdout.log b/tests/testsuite/cargo_add/offline_empty_cache/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/optional/mod.rs b/tests/testsuite/cargo_add/optional/mod.rs index 4a9ede95cd8..33c41808021 100644 --- a/tests/testsuite/cargo_add/optional/mod.rs +++ b/tests/testsuite/cargo_add/optional/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -19,7 +20,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/optional/stdout.log b/tests/testsuite/cargo_add/optional/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/overwrite_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_default_features/mod.rs index 6994260abf6..b05f081e3a4 100644 --- a/tests/testsuite/cargo_add/overwrite_default_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_default_features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_default_features/stdout.log b/tests/testsuite/cargo_add/overwrite_default_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 6824244e641..6e982a17bed 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stdout.log b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/overwrite_features/mod.rs b/tests/testsuite/cargo_add/overwrite_features/mod.rs index 6e6a258dee3..7f9437b97a9 100644 --- a/tests/testsuite/cargo_add/overwrite_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -24,7 +25,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_features/stdout.log b/tests/testsuite/cargo_add/overwrite_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 16999968639..a702d3d49fc 100644 --- a/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -30,7 +31,7 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/stdout.log b/tests/testsuite/cargo_add/overwrite_git_with_path/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 60b454d3255..cdaac6b9b18 100644 --- a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -18,7 +19,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stdout.log b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs index 60b454d3255..cdaac6b9b18 100644 --- a/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -18,7 +19,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/stdout.log b/tests/testsuite/cargo_add/overwrite_inherit_noop/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 60b454d3255..cdaac6b9b18 100644 --- a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -18,7 +19,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stdout.log b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs b/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs index 6ee3a244ab1..fab4998749d 100644 --- a/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -37,7 +38,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_inline_features/stdout.log b/tests/testsuite/cargo_add/overwrite_inline_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 934b249e836..783bace0fb2 100644 --- a/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -25,7 +26,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_name_dev_noop/stdout.log b/tests/testsuite/cargo_add/overwrite_name_dev_noop/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs index 0de6b7d2f81..611c5feeee1 100644 --- a/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -25,7 +26,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/stdout.log b/tests/testsuite/cargo_add/overwrite_name_noop/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 6824244e641..6e982a17bed 100644 --- a/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features/stdout.log b/tests/testsuite/cargo_add/overwrite_no_default_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 6994260abf6..b05f081e3a4 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stdout.log b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs index 042f1de9faa..bc7a1bffe79 100644 --- a/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -19,7 +20,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_no_optional/stdout.log b/tests/testsuite/cargo_add/overwrite_no_optional/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 4a9ede95cd8..33c41808021 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -19,7 +20,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stdout.log b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/overwrite_no_public/mod.rs b/tests/testsuite/cargo_add/overwrite_no_public/mod.rs index b435df9deab..5c63934a74b 100644 --- a/tests/testsuite/cargo_add/overwrite_no_public/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_no_public/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -19,7 +20,7 @@ fn case() { .masquerade_as_nightly_cargo(&["public-dependency"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_no_public/stdout.log b/tests/testsuite/cargo_add/overwrite_no_public/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 e95fceeeb63..adeb436061a 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -19,7 +20,7 @@ fn case() { .masquerade_as_nightly_cargo(&["public-dependency"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_no_public_with_public/stdout.log b/tests/testsuite/cargo_add/overwrite_no_public_with_public/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/overwrite_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional/mod.rs index 4a9ede95cd8..33c41808021 100644 --- a/tests/testsuite/cargo_add/overwrite_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_optional/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -19,7 +20,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_optional/stdout.log b/tests/testsuite/cargo_add/overwrite_optional/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 820613c18f7..de5a7276649 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -25,7 +26,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stdout.log b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 4f39b5613bf..4b99a500fa3 100644 --- a/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -19,7 +20,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_optional/stdout.log b/tests/testsuite/cargo_add/overwrite_optional_with_optional/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs index 147fb02c6b0..4b0aadd69c2 100644 --- a/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -25,7 +26,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/stdout.log b/tests/testsuite/cargo_add/overwrite_path_noop/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 769d5977423..dcaa0a750ee 100644 --- a/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -30,7 +31,7 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_path_with_version/stdout.log b/tests/testsuite/cargo_add/overwrite_path_with_version/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 6e6a258dee3..7f9437b97a9 100644 --- a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -24,7 +25,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stdout.log b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/overwrite_public/mod.rs b/tests/testsuite/cargo_add/overwrite_public/mod.rs index e95fceeeb63..adeb436061a 100644 --- a/tests/testsuite/cargo_add/overwrite_public/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_public/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -19,7 +20,7 @@ fn case() { .masquerade_as_nightly_cargo(&["public-dependency"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_public/stdout.log b/tests/testsuite/cargo_add/overwrite_public/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 b435df9deab..5c63934a74b 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -19,7 +20,7 @@ fn case() { .masquerade_as_nightly_cargo(&["public-dependency"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_public_with_no_public/stdout.log b/tests/testsuite/cargo_add/overwrite_public_with_no_public/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 e643e817ac7..e508c34db9f 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stdout.log b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 09edae3aa13..40a55ca09a5 100644 --- a/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename/stdout.log b/tests/testsuite/cargo_add/overwrite_rename_with_rename/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 35f27d38dca..42db5cbcc91 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stdout.log b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 91a4d3917dd..6203d7dc36e 100644 --- a/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -38,7 +39,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/stdout.log b/tests/testsuite/cargo_add/overwrite_version_with_git/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 16999968639..a702d3d49fc 100644 --- a/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -30,7 +31,7 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/stdout.log b/tests/testsuite/cargo_add/overwrite_version_with_path/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs index 0c00a2d2b1c..7634d1a004e 100644 --- a/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_with_rename/stdout.log b/tests/testsuite/cargo_add/overwrite_with_rename/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs b/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs index 9be71d5ea67..085d0c39943 100644 --- a/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -18,7 +19,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/stdout.log b/tests/testsuite/cargo_add/overwrite_workspace_dep/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 9be71d5ea67..085d0c39943 100644 --- a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -18,7 +19,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stdout.log b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/path/mod.rs b/tests/testsuite/cargo_add/path/mod.rs index 16999968639..a702d3d49fc 100644 --- a/tests/testsuite/cargo_add/path/mod.rs +++ b/tests/testsuite/cargo_add/path/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -30,7 +31,7 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/path/stdout.log b/tests/testsuite/cargo_add/path/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/path_dev/mod.rs b/tests/testsuite/cargo_add/path_dev/mod.rs index 29c71d0fddd..dce163829df 100644 --- a/tests/testsuite/cargo_add/path_dev/mod.rs +++ b/tests/testsuite/cargo_add/path_dev/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -30,7 +31,7 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/path_dev/stdout.log b/tests/testsuite/cargo_add/path_dev/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/path_inferred_name/mod.rs b/tests/testsuite/cargo_add/path_inferred_name/mod.rs index 16999968639..a702d3d49fc 100644 --- a/tests/testsuite/cargo_add/path_inferred_name/mod.rs +++ b/tests/testsuite/cargo_add/path_inferred_name/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -30,7 +31,7 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/path_inferred_name/stdout.log b/tests/testsuite/cargo_add/path_inferred_name/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 1313677a348..4cd09be05ac 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -18,7 +19,7 @@ fn case() { .current_dir(&cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stdout.log b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/path_normalized_name/mod.rs b/tests/testsuite/cargo_add/path_normalized_name/mod.rs index 22273d0fdee..87f44c66eb4 100644 --- a/tests/testsuite/cargo_add/path_normalized_name/mod.rs +++ b/tests/testsuite/cargo_add/path_normalized_name/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -30,7 +31,7 @@ fn case() { .current_dir(&cwd) .assert() .failure() // Fuzzy searching for paths isn't supported at this time - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/path_normalized_name/stdout.log b/tests/testsuite/cargo_add/path_normalized_name/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 d71529685e8..ab946625982 100644 --- a/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs +++ b/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -24,7 +25,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/preserve_dep_std_table/stdout.log b/tests/testsuite/cargo_add/preserve_dep_std_table/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/preserve_features_table/mod.rs b/tests/testsuite/cargo_add/preserve_features_table/mod.rs index d71529685e8..ab946625982 100644 --- a/tests/testsuite/cargo_add/preserve_features_table/mod.rs +++ b/tests/testsuite/cargo_add/preserve_features_table/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -24,7 +25,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/preserve_features_table/stdout.log b/tests/testsuite/cargo_add/preserve_features_table/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/preserve_sorted/mod.rs b/tests/testsuite/cargo_add/preserve_sorted/mod.rs index 57cd63a329f..1a951d69770 100644 --- a/tests/testsuite/cargo_add/preserve_sorted/mod.rs +++ b/tests/testsuite/cargo_add/preserve_sorted/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/preserve_sorted/stdout.log b/tests/testsuite/cargo_add/preserve_sorted/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/preserve_unsorted/mod.rs b/tests/testsuite/cargo_add/preserve_unsorted/mod.rs index 57cd63a329f..1a951d69770 100644 --- a/tests/testsuite/cargo_add/preserve_unsorted/mod.rs +++ b/tests/testsuite/cargo_add/preserve_unsorted/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/preserve_unsorted/stdout.log b/tests/testsuite/cargo_add/preserve_unsorted/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/public/mod.rs b/tests/testsuite/cargo_add/public/mod.rs index e95fceeeb63..adeb436061a 100644 --- a/tests/testsuite/cargo_add/public/mod.rs +++ b/tests/testsuite/cargo_add/public/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -19,7 +20,7 @@ fn case() { .masquerade_as_nightly_cargo(&["public-dependency"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/public/stdout.log b/tests/testsuite/cargo_add/public/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/quiet/mod.rs b/tests/testsuite/cargo_add/quiet/mod.rs index 7c8f9fd3f29..6d0a8d49c4f 100644 --- a/tests/testsuite/cargo_add/quiet/mod.rs +++ b/tests/testsuite/cargo_add/quiet/mod.rs @@ -1,6 +1,5 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; -use cargo_test_support::file; use cargo_test_support::prelude::*; use cargo_test_support::str; use cargo_test_support::Project; @@ -25,7 +24,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(str![""]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/quiet/stdout.log b/tests/testsuite/cargo_add/quiet/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/registry/mod.rs b/tests/testsuite/cargo_add/registry/mod.rs index c7693f13efa..85a342b3675 100644 --- a/tests/testsuite/cargo_add/registry/mod.rs +++ b/tests/testsuite/cargo_add/registry/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -33,7 +34,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/registry/stdout.log b/tests/testsuite/cargo_add/registry/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/rename/mod.rs b/tests/testsuite/cargo_add/rename/mod.rs index 754c078d036..77dd2bb5b9a 100644 --- a/tests/testsuite/cargo_add/rename/mod.rs +++ b/tests/testsuite/cargo_add/rename/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/rename/stdout.log b/tests/testsuite/cargo_add/rename/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/require_weak/mod.rs b/tests/testsuite/cargo_add/require_weak/mod.rs index d71529685e8..ab946625982 100644 --- a/tests/testsuite/cargo_add/require_weak/mod.rs +++ b/tests/testsuite/cargo_add/require_weak/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -24,7 +25,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/require_weak/stdout.log b/tests/testsuite/cargo_add/require_weak/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/rust_version_ignore/mod.rs b/tests/testsuite/cargo_add/rust_version_ignore/mod.rs index 198aecb7683..1aa4a701625 100644 --- a/tests/testsuite/cargo_add/rust_version_ignore/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_ignore/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -27,7 +28,7 @@ fn case() { .masquerade_as_nightly_cargo(&["msrv-policy"]) .assert() .code(0) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/rust_version_ignore/stdout.log b/tests/testsuite/cargo_add/rust_version_ignore/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs b/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs index 5aa25e36d1f..0b31c88759d 100644 --- a/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .masquerade_as_nightly_cargo(&["msrv-policy"]) .assert() .failure() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/rust_version_incompatible/stdout.log b/tests/testsuite/cargo_add/rust_version_incompatible/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/rust_version_latest/mod.rs b/tests/testsuite/cargo_add/rust_version_latest/mod.rs index 35247741c26..77988d59223 100644 --- a/tests/testsuite/cargo_add/rust_version_latest/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_latest/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -26,7 +27,7 @@ fn case() { .masquerade_as_nightly_cargo(&["msrv-policy"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/rust_version_latest/stdout.log b/tests/testsuite/cargo_add/rust_version_latest/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/rust_version_older/mod.rs b/tests/testsuite/cargo_add/rust_version_older/mod.rs index 35247741c26..77988d59223 100644 --- a/tests/testsuite/cargo_add/rust_version_older/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_older/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -26,7 +27,7 @@ fn case() { .masquerade_as_nightly_cargo(&["msrv-policy"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/rust_version_older/stdout.log b/tests/testsuite/cargo_add/rust_version_older/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 efa82f81e39..465c51150e5 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -36,7 +37,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stdout.log b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/target/mod.rs b/tests/testsuite/cargo_add/target/mod.rs index 23f0edfdc5a..fe0a1993791 100644 --- a/tests/testsuite/cargo_add/target/mod.rs +++ b/tests/testsuite/cargo_add/target/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/target/stdout.log b/tests/testsuite/cargo_add/target/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/target_cfg/mod.rs b/tests/testsuite/cargo_add/target_cfg/mod.rs index 9846f58379b..4932822889d 100644 --- a/tests/testsuite/cargo_add/target_cfg/mod.rs +++ b/tests/testsuite/cargo_add/target_cfg/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/target_cfg/stdout.log b/tests/testsuite/cargo_add/target_cfg/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs b/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs index d0d2213ea03..50bae81786f 100644 --- a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs +++ b/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/stdout.log b/tests/testsuite/cargo_add/unknown_inherited_feature/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/vers/mod.rs b/tests/testsuite/cargo_add/vers/mod.rs index 1f097d1b545..58907a95ff4 100644 --- a/tests/testsuite/cargo_add/vers/mod.rs +++ b/tests/testsuite/cargo_add/vers/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/vers/stdout.log b/tests/testsuite/cargo_add/vers/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/workspace_name/mod.rs b/tests/testsuite/cargo_add/workspace_name/mod.rs index 1e49edb57a4..ab541851e89 100644 --- a/tests/testsuite/cargo_add/workspace_name/mod.rs +++ b/tests/testsuite/cargo_add/workspace_name/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -30,7 +31,7 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/workspace_name/stdout.log b/tests/testsuite/cargo_add/workspace_name/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/workspace_path/mod.rs b/tests/testsuite/cargo_add/workspace_path/mod.rs index 16999968639..a702d3d49fc 100644 --- a/tests/testsuite/cargo_add/workspace_path/mod.rs +++ b/tests/testsuite/cargo_add/workspace_path/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -30,7 +31,7 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/workspace_path/stdout.log b/tests/testsuite/cargo_add/workspace_path/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_add/workspace_path_dev/mod.rs b/tests/testsuite/cargo_add/workspace_path_dev/mod.rs index 29c71d0fddd..dce163829df 100644 --- a/tests/testsuite/cargo_add/workspace_path_dev/mod.rs +++ b/tests/testsuite/cargo_add/workspace_path_dev/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -30,7 +31,7 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_add/workspace_path_dev/stdout.log b/tests/testsuite/cargo_add/workspace_path_dev/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_bench/no_keep_going/mod.rs b/tests/testsuite/cargo_bench/no_keep_going/mod.rs index f996444d6d2..8d32b17eb24 100644 --- a/tests/testsuite/cargo_bench/no_keep_going/mod.rs +++ b/tests/testsuite/cargo_bench/no_keep_going/mod.rs @@ -1,5 +1,6 @@ use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -15,6 +16,6 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); } diff --git a/tests/testsuite/cargo_bench/no_keep_going/stdout.log b/tests/testsuite/cargo_bench/no_keep_going/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/auto_git/mod.rs b/tests/testsuite/cargo_init/auto_git/mod.rs index 992fe1d122f..f2884590316 100644 --- a/tests/testsuite/cargo_init/auto_git/mod.rs +++ b/tests/testsuite/cargo_init/auto_git/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_init/auto_git/stdout.log b/tests/testsuite/cargo_init/auto_git/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 470f4b2de80..44f2963e45d 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_explicit/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 43f5a419409..6adab0b8641 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 bcbb78be180..c22fbb1deab 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_implicit/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 8c6ae8acbea..31c5af6b035 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 d07cd385c2c..355a37d1e24 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 8c6ae8acbea..31c5af6b035 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 2be40317722..8860745be89 100644 --- a/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs +++ b/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::file; use cargo_test_support::paths; use cargo_test_support::prelude::*; +use cargo_test_support::str; #[cargo_test] fn case() { @@ -11,7 +12,7 @@ fn case() { .current_dir(&cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert!(!cwd.join("Cargo.toml").is_file()); diff --git a/tests/testsuite/cargo_init/both_lib_and_bin/stdout.log b/tests/testsuite/cargo_init/both_lib_and_bin/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 cc398155c15..882f0914886 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 @@ -1,6 +1,7 @@ use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -13,6 +14,6 @@ fn case() { .current_dir(project_root) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); } diff --git a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stdout.log b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 62fd751d65d..671f755be6b 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stdout.log b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 470f4b2de80..44f2963e45d 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stdout.log b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 470f4b2de80..44f2963e45d 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); 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/stdout.log b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 cd1d2046d33..942de0148dc 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); 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/stdout.log b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 7c1efb243e8..8f9a618d737 100644 --- a/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs +++ b/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/explicit_bin_with_git/stdout.log b/tests/testsuite/cargo_init/explicit_bin_with_git/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/formats_source/mod.rs b/tests/testsuite/cargo_init/formats_source/mod.rs index 5d2c72b157c..32f3ecf3ef2 100644 --- a/tests/testsuite/cargo_init/formats_source/mod.rs +++ b/tests/testsuite/cargo_init/formats_source/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::{process, Project}; #[cargo_test] @@ -22,7 +23,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/formats_source/stdout.log b/tests/testsuite/cargo_init/formats_source/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/fossil_autodetect/mod.rs b/tests/testsuite/cargo_init/fossil_autodetect/mod.rs index 0a5ba570e5b..b198fac5314 100644 --- a/tests/testsuite/cargo_init/fossil_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/fossil_autodetect/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/fossil_autodetect/stdout.log b/tests/testsuite/cargo_init/fossil_autodetect/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/git_autodetect/mod.rs b/tests/testsuite/cargo_init/git_autodetect/mod.rs index ae6963aba6c..b572aa4c147 100644 --- a/tests/testsuite/cargo_init/git_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/git_autodetect/mod.rs @@ -3,6 +3,7 @@ use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::paths; use cargo_test_support::prelude::*; +use cargo_test_support::str; use std::fs; #[cargo_test] @@ -16,7 +17,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/git_autodetect/stdout.log b/tests/testsuite/cargo_init/git_autodetect/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 3522534caba..f71fb04489f 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stdout.log b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 b2b927a4e33..5ca689fced7 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 @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -15,7 +16,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/ignores_failure_to_format_source/stdout.log b/tests/testsuite/cargo_init/ignores_failure_to_format_source/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 619045a0c6b..59b6eb5e3e2 100644 --- a/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs +++ b/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/inferred_bin_with_git/stdout.log b/tests/testsuite/cargo_init/inferred_bin_with_git/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 619045a0c6b..59b6eb5e3e2 100644 --- a/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs +++ b/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/inferred_lib_with_git/stdout.log b/tests/testsuite/cargo_init/inferred_lib_with_git/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 3132705f3bd..ce783bbd255 100644 --- a/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs +++ b/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_init/inherit_workspace_package_table/stdout.log b/tests/testsuite/cargo_init/inherit_workspace_package_table/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/invalid_dir_name/mod.rs b/tests/testsuite/cargo_init/invalid_dir_name/mod.rs index 52f96cf35cc..fe081113438 100644 --- a/tests/testsuite/cargo_init/invalid_dir_name/mod.rs +++ b/tests/testsuite/cargo_init/invalid_dir_name/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::file; use cargo_test_support::paths; use cargo_test_support::prelude::*; +use cargo_test_support::str; use std::fs; #[cargo_test] @@ -13,7 +14,7 @@ fn case() { .current_dir(foo) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert!(!foo.join("Cargo.toml").is_file()); diff --git a/tests/testsuite/cargo_init/invalid_dir_name/stdout.log b/tests/testsuite/cargo_init/invalid_dir_name/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 d07cd385c2c..355a37d1e24 100644 --- a/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs +++ b/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/lib_already_exists_nosrc/stdout.log b/tests/testsuite/cargo_init/lib_already_exists_nosrc/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 d07cd385c2c..355a37d1e24 100644 --- a/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs +++ b/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/lib_already_exists_src/stdout.log b/tests/testsuite/cargo_init/lib_already_exists_src/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs b/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs index 0a5ba570e5b..b198fac5314 100644 --- a/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/mercurial_autodetect/stdout.log b/tests/testsuite/cargo_init/mercurial_autodetect/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 5f2693e3f45..cc023a6f257 100644 --- a/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs +++ b/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/multibin_project_name_clash/stdout.log b/tests/testsuite/cargo_init/multibin_project_name_clash/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/no_filename/mod.rs b/tests/testsuite/cargo_init/no_filename/mod.rs index aca139169f9..650d8358048 100644 --- a/tests/testsuite/cargo_init/no_filename/mod.rs +++ b/tests/testsuite/cargo_init/no_filename/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::file; use cargo_test_support::paths; use cargo_test_support::prelude::*; +use cargo_test_support::str; #[cfg(not(windows))] #[cargo_test] @@ -10,6 +11,6 @@ fn case() { .current_dir(paths::root()) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); } diff --git a/tests/testsuite/cargo_init/no_filename/stdout.log b/tests/testsuite/cargo_init/no_filename/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/path_contains_separator/mod.rs b/tests/testsuite/cargo_init/path_contains_separator/mod.rs index 7ec3707d5e2..784c751db10 100644 --- a/tests/testsuite/cargo_init/path_contains_separator/mod.rs +++ b/tests/testsuite/cargo_init/path_contains_separator/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::{t, Project}; #[cargo_test] @@ -18,7 +19,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/path_contains_separator/stdout.log b/tests/testsuite/cargo_init/path_contains_separator/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/pijul_autodetect/mod.rs b/tests/testsuite/cargo_init/pijul_autodetect/mod.rs index 0a5ba570e5b..b198fac5314 100644 --- a/tests/testsuite/cargo_init/pijul_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/pijul_autodetect/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/pijul_autodetect/stdout.log b/tests/testsuite/cargo_init/pijul_autodetect/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/reserved_name/mod.rs b/tests/testsuite/cargo_init/reserved_name/mod.rs index 2c9c5409177..ff77b12d836 100644 --- a/tests/testsuite/cargo_init/reserved_name/mod.rs +++ b/tests/testsuite/cargo_init/reserved_name/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::file; use cargo_test_support::paths; use cargo_test_support::prelude::*; +use cargo_test_support::str; use std::fs; #[cargo_test] @@ -13,7 +14,7 @@ fn case() { .current_dir(project_root) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert!(!project_root.join("Cargo.toml").is_file()); diff --git a/tests/testsuite/cargo_init/reserved_name/stdout.log b/tests/testsuite/cargo_init/reserved_name/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/simple_bin/mod.rs b/tests/testsuite/cargo_init/simple_bin/mod.rs index b9aabc8b586..a2c8360cebf 100644 --- a/tests/testsuite/cargo_init/simple_bin/mod.rs +++ b/tests/testsuite/cargo_init/simple_bin/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/simple_bin/stdout.log b/tests/testsuite/cargo_init/simple_bin/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/simple_git/mod.rs b/tests/testsuite/cargo_init/simple_git/mod.rs index 177f640e8f9..115f4d459b7 100644 --- a/tests/testsuite/cargo_init/simple_git/mod.rs +++ b/tests/testsuite/cargo_init/simple_git/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/simple_git/stdout.log b/tests/testsuite/cargo_init/simple_git/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 93320c284eb..b8b4777528a 100644 --- a/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs +++ b/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/simple_git_ignore_exists/stdout.log b/tests/testsuite/cargo_init/simple_git_ignore_exists/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/simple_hg/mod.rs b/tests/testsuite/cargo_init/simple_hg/mod.rs index 1d272737e21..0a56e30370a 100644 --- a/tests/testsuite/cargo_init/simple_hg/mod.rs +++ b/tests/testsuite/cargo_init/simple_hg/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test(requires_hg)] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/simple_hg/stdout.log b/tests/testsuite/cargo_init/simple_hg/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 0a5ba570e5b..b198fac5314 100644 --- a/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs +++ b/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/simple_hg_ignore_exists/stdout.log b/tests/testsuite/cargo_init/simple_hg_ignore_exists/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/simple_lib/mod.rs b/tests/testsuite/cargo_init/simple_lib/mod.rs index 2f46c9356e6..03d367eec6b 100644 --- a/tests/testsuite/cargo_init/simple_lib/mod.rs +++ b/tests/testsuite/cargo_init/simple_lib/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/simple_lib/stdout.log b/tests/testsuite/cargo_init/simple_lib/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/unknown_flags/mod.rs b/tests/testsuite/cargo_init/unknown_flags/mod.rs index 4b61f9235ad..c283bf25276 100644 --- a/tests/testsuite/cargo_init/unknown_flags/mod.rs +++ b/tests/testsuite/cargo_init/unknown_flags/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::file; use cargo_test_support::paths; use cargo_test_support::prelude::*; +use cargo_test_support::str; #[cargo_test] fn case() { @@ -9,6 +10,6 @@ fn case() { .current_dir(paths::root()) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); } diff --git a/tests/testsuite/cargo_init/unknown_flags/stdout.log b/tests/testsuite/cargo_init/unknown_flags/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/with_argument/mod.rs b/tests/testsuite/cargo_init/with_argument/mod.rs index 54db7d293f2..fe24473f8ff 100644 --- a/tests/testsuite/cargo_init/with_argument/mod.rs +++ b/tests/testsuite/cargo_init/with_argument/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); diff --git a/tests/testsuite/cargo_init/with_argument/stdout.log b/tests/testsuite/cargo_init/with_argument/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_init/workspace_add_member/mod.rs b/tests/testsuite/cargo_init/workspace_add_member/mod.rs index 6dc2885a20f..23929f9436c 100644 --- a/tests/testsuite/cargo_init/workspace_add_member/mod.rs +++ b/tests/testsuite/cargo_init/workspace_add_member/mod.rs @@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -14,7 +15,7 @@ fn case() { .current_dir(project_root.join("crates").join("foo")) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_init/workspace_add_member/stdout.log b/tests/testsuite/cargo_init/workspace_add_member/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 23ae2e31a58..10f826491e2 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 @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_new/add_members_to_non_workspace/stdout.log b/tests/testsuite/cargo_new/add_members_to_non_workspace/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 4655b5f365a..07be1fac7c5 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 @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stdout.log b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 4655b5f365a..07be1fac7c5 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 @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stdout.log b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 c1d7ac48530..bdbb2c894f8 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 @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -17,7 +18,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); 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/stdout.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 4655b5f365a..07be1fac7c5 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 @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stdout.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 4655b5f365a..07be1fac7c5 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 @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stdout.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 4655b5f365a..07be1fac7c5 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 @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stdout.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 23ae2e31a58..10f826491e2 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 @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stdout.log b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_new/empty_name/mod.rs b/tests/testsuite/cargo_new/empty_name/mod.rs index 73f4296e02e..7a3f3164631 100644 --- a/tests/testsuite/cargo_new/empty_name/mod.rs +++ b/tests/testsuite/cargo_new/empty_name/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_new/empty_name/stdout.log b/tests/testsuite/cargo_new/empty_name/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs index 4655b5f365a..07be1fac7c5 100644 --- a/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs +++ b/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_new/inherit_workspace_lints/stdout.log b/tests/testsuite/cargo_new/inherit_workspace_lints/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 4655b5f365a..07be1fac7c5 100644 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table/stdout.log b/tests/testsuite/cargo_new/inherit_workspace_package_table/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 b5ac01fa7a4..b9f348f4d85 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 @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stdout.log b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 85fbb21e7b7..196b1494235 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 @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stdout.log b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 4655b5f365a..07be1fac7c5 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 @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stdout.log b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 94508c7e6f5..595425c7e74 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 @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -16,7 +17,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); 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/stdout.log b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs b/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs index 929332dd3e7..52dd9dadf76 100644 --- a/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs +++ b/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/avoid_empty_tables/stdout.log b/tests/testsuite/cargo_remove/avoid_empty_tables/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/build/mod.rs b/tests/testsuite/cargo_remove/build/mod.rs index fdde6f0d4bd..036c96c2645 100644 --- a/tests/testsuite/cargo_remove/build/mod.rs +++ b/tests/testsuite/cargo_remove/build/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/build/stdout.log b/tests/testsuite/cargo_remove/build/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/dev/mod.rs b/tests/testsuite/cargo_remove/dev/mod.rs index bb3ff4e84cf..6d603014728 100644 --- a/tests/testsuite/cargo_remove/dev/mod.rs +++ b/tests/testsuite/cargo_remove/dev/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/dev/stdout.log b/tests/testsuite/cargo_remove/dev/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/dry_run/mod.rs b/tests/testsuite/cargo_remove/dry_run/mod.rs index 7b1ce0c3eb8..ea6b962bd4a 100644 --- a/tests/testsuite/cargo_remove/dry_run/mod.rs +++ b/tests/testsuite/cargo_remove/dry_run/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/dry_run/stdout.log b/tests/testsuite/cargo_remove/dry_run/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 007f314a10a..e1f62987a90 100644 --- a/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs +++ b/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -21,7 +22,7 @@ fn case() { .args(["--package", "serde", "serde_derive"]) .assert() .code(0) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/gc_keep_used_patch/stdout.log b/tests/testsuite/cargo_remove/gc_keep_used_patch/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/gc_patch/mod.rs b/tests/testsuite/cargo_remove/gc_patch/mod.rs index 4d68c216c78..14c9b42e890 100644 --- a/tests/testsuite/cargo_remove/gc_patch/mod.rs +++ b/tests/testsuite/cargo_remove/gc_patch/mod.rs @@ -4,6 +4,7 @@ use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::git; use cargo_test_support::project; +use cargo_test_support::str; use cargo_test_support::CargoCommand; #[cargo_test] @@ -71,7 +72,7 @@ fn case() { .current_dir(&in_project.root()) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &in_project.root()); diff --git a/tests/testsuite/cargo_remove/gc_patch/stdout.log b/tests/testsuite/cargo_remove/gc_patch/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/gc_profile/mod.rs b/tests/testsuite/cargo_remove/gc_profile/mod.rs index c1c52b1c612..3df85c1326c 100644 --- a/tests/testsuite/cargo_remove/gc_profile/mod.rs +++ b/tests/testsuite/cargo_remove/gc_profile/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -30,7 +31,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/gc_profile/stdout.log b/tests/testsuite/cargo_remove/gc_profile/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/gc_replace/mod.rs b/tests/testsuite/cargo_remove/gc_replace/mod.rs index 2f44c7427d7..abc5715612d 100644 --- a/tests/testsuite/cargo_remove/gc_replace/mod.rs +++ b/tests/testsuite/cargo_remove/gc_replace/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -30,7 +31,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/gc_replace/stdout.log b/tests/testsuite/cargo_remove/gc_replace/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/invalid_arg/mod.rs b/tests/testsuite/cargo_remove/invalid_arg/mod.rs index 2f442751720..9a78cba93c7 100644 --- a/tests/testsuite/cargo_remove/invalid_arg/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_arg/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/invalid_arg/stdout.log b/tests/testsuite/cargo_remove/invalid_arg/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/invalid_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_dep/mod.rs index 93466218c04..479ca91e2ad 100644 --- a/tests/testsuite/cargo_remove/invalid_dep/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_dep/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/invalid_dep/stdout.log b/tests/testsuite/cargo_remove/invalid_dep/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/invalid_package/mod.rs b/tests/testsuite/cargo_remove/invalid_package/mod.rs index 9376500ef89..f7332a4f048 100644 --- a/tests/testsuite/cargo_remove/invalid_package/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_package/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/invalid_package/stdout.log b/tests/testsuite/cargo_remove/invalid_package/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs b/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs index 4f8cd367053..9f03a085b37 100644 --- a/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/invalid_package_multiple/stdout.log b/tests/testsuite/cargo_remove/invalid_package_multiple/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/invalid_section/mod.rs b/tests/testsuite/cargo_remove/invalid_section/mod.rs index 91bf47b7de8..eb3c2894212 100644 --- a/tests/testsuite/cargo_remove/invalid_section/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_section/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/invalid_section/stdout.log b/tests/testsuite/cargo_remove/invalid_section/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs index f7537a4ffc9..69f6151fb6f 100644 --- a/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/invalid_section_dep/stdout.log b/tests/testsuite/cargo_remove/invalid_section_dep/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/invalid_target/mod.rs b/tests/testsuite/cargo_remove/invalid_target/mod.rs index 7f1b1c1138a..2d5742e38e1 100644 --- a/tests/testsuite/cargo_remove/invalid_target/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_target/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/invalid_target/stdout.log b/tests/testsuite/cargo_remove/invalid_target/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs index bd045832940..f70225470f2 100644 --- a/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/invalid_target_dep/stdout.log b/tests/testsuite/cargo_remove/invalid_target_dep/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/multiple_deps/mod.rs b/tests/testsuite/cargo_remove/multiple_deps/mod.rs index a897114df55..60ec40559be 100644 --- a/tests/testsuite/cargo_remove/multiple_deps/mod.rs +++ b/tests/testsuite/cargo_remove/multiple_deps/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/multiple_deps/stdout.log b/tests/testsuite/cargo_remove/multiple_deps/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/multiple_dev/mod.rs b/tests/testsuite/cargo_remove/multiple_dev/mod.rs index 17d658ba9bb..4f7fe93c670 100644 --- a/tests/testsuite/cargo_remove/multiple_dev/mod.rs +++ b/tests/testsuite/cargo_remove/multiple_dev/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/multiple_dev/stdout.log b/tests/testsuite/cargo_remove/multiple_dev/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/no_arg/mod.rs b/tests/testsuite/cargo_remove/no_arg/mod.rs index 794fa69c2e2..f0a3b82c8c9 100644 --- a/tests/testsuite/cargo_remove/no_arg/mod.rs +++ b/tests/testsuite/cargo_remove/no_arg/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -28,7 +29,7 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/no_arg/stdout.log b/tests/testsuite/cargo_remove/no_arg/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/offline/mod.rs b/tests/testsuite/cargo_remove/offline/mod.rs index a09fa197890..62b57ae70c4 100644 --- a/tests/testsuite/cargo_remove/offline/mod.rs +++ b/tests/testsuite/cargo_remove/offline/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -36,7 +37,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/offline/stdout.log b/tests/testsuite/cargo_remove/offline/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs b/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs index 89999c97351..e7b774ea112 100644 --- a/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs +++ b/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/optional_dep_feature/stdout.log b/tests/testsuite/cargo_remove/optional_dep_feature/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 ed024fbbeaf..41a419a2065 100644 --- a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs +++ b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stdout.log b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/optional_feature/mod.rs b/tests/testsuite/cargo_remove/optional_feature/mod.rs index 45f1d7c6124..e1cf95e7cc5 100644 --- a/tests/testsuite/cargo_remove/optional_feature/mod.rs +++ b/tests/testsuite/cargo_remove/optional_feature/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/optional_feature/stdout.log b/tests/testsuite/cargo_remove/optional_feature/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/package/mod.rs b/tests/testsuite/cargo_remove/package/mod.rs index 6704532315b..bb2056cf643 100644 --- a/tests/testsuite/cargo_remove/package/mod.rs +++ b/tests/testsuite/cargo_remove/package/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/package/stdout.log b/tests/testsuite/cargo_remove/package/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/remove_basic/mod.rs b/tests/testsuite/cargo_remove/remove_basic/mod.rs index 886f24204ba..f078b093004 100644 --- a/tests/testsuite/cargo_remove/remove_basic/mod.rs +++ b/tests/testsuite/cargo_remove/remove_basic/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/remove_basic/stdout.log b/tests/testsuite/cargo_remove/remove_basic/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 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 f8ea82a9f94..5fc17fad695 100644 --- a/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs +++ b/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -19,7 +20,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/skip_gc_glob_profile/stdout.log b/tests/testsuite/cargo_remove/skip_gc_glob_profile/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/target/mod.rs b/tests/testsuite/cargo_remove/target/mod.rs index b9c966a1f41..310540c30a4 100644 --- a/tests/testsuite/cargo_remove/target/mod.rs +++ b/tests/testsuite/cargo_remove/target/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/target/stdout.log b/tests/testsuite/cargo_remove/target/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/target_build/mod.rs b/tests/testsuite/cargo_remove/target_build/mod.rs index 54beb798b36..c7c6022384b 100644 --- a/tests/testsuite/cargo_remove/target_build/mod.rs +++ b/tests/testsuite/cargo_remove/target_build/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/target_build/stdout.log b/tests/testsuite/cargo_remove/target_build/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/target_dev/mod.rs b/tests/testsuite/cargo_remove/target_dev/mod.rs index 12a3a10286b..29d9607611b 100644 --- a/tests/testsuite/cargo_remove/target_dev/mod.rs +++ b/tests/testsuite/cargo_remove/target_dev/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -31,7 +32,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/target_dev/stdout.log b/tests/testsuite/cargo_remove/target_dev/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/update_lock_file/mod.rs b/tests/testsuite/cargo_remove/update_lock_file/mod.rs index a589aa9759b..70200287e90 100644 --- a/tests/testsuite/cargo_remove/update_lock_file/mod.rs +++ b/tests/testsuite/cargo_remove/update_lock_file/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/update_lock_file/stdout.log b/tests/testsuite/cargo_remove/update_lock_file/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/workspace/mod.rs b/tests/testsuite/cargo_remove/workspace/mod.rs index cdc707e8069..79ea17b8448 100644 --- a/tests/testsuite/cargo_remove/workspace/mod.rs +++ b/tests/testsuite/cargo_remove/workspace/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/workspace/stdout.log b/tests/testsuite/cargo_remove/workspace/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs b/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs index cdc707e8069..79ea17b8448 100644 --- a/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs +++ b/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/workspace_non_virtual/stdout.log b/tests/testsuite/cargo_remove/workspace_non_virtual/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_remove/workspace_preserved/mod.rs b/tests/testsuite/cargo_remove/workspace_preserved/mod.rs index cdc707e8069..79ea17b8448 100644 --- a/tests/testsuite/cargo_remove/workspace_preserved/mod.rs +++ b/tests/testsuite/cargo_remove/workspace_preserved/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::compare::assert_ui; use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -29,7 +30,7 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); diff --git a/tests/testsuite/cargo_remove/workspace_preserved/stdout.log b/tests/testsuite/cargo_remove/workspace_preserved/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_test/no_keep_going/mod.rs b/tests/testsuite/cargo_test/no_keep_going/mod.rs index 17c65fa3da5..c8247863ed1 100644 --- a/tests/testsuite/cargo_test/no_keep_going/mod.rs +++ b/tests/testsuite/cargo_test/no_keep_going/mod.rs @@ -1,5 +1,6 @@ use cargo_test_support::current_dir; use cargo_test_support::file; +use cargo_test_support::str; use cargo_test_support::CargoCommand; use cargo_test_support::Project; @@ -15,6 +16,6 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); } diff --git a/tests/testsuite/cargo_test/no_keep_going/stdout.log b/tests/testsuite/cargo_test/no_keep_going/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs b/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs index f5e9d1f640c..23ad8fbb028 100644 --- a/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs +++ b/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs @@ -1,6 +1,7 @@ use cargo_test_support::current_dir; use cargo_test_support::file; use cargo_test_support::prelude::*; +use cargo_test_support::str; use cargo_test_support::Project; #[cargo_test] @@ -15,6 +16,6 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) + .stdout_matches(str![""]) .stderr_matches(file!["stderr.log"]); } diff --git a/tests/testsuite/cargo_update/toolchain_pkgname/stdout.log b/tests/testsuite/cargo_update/toolchain_pkgname/stdout.log deleted file mode 100644 index e69de29bb2d..00000000000