From 174e03bad5468c50842ddf8b73f37cef0ac82da0 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 19 Feb 2024 13:45:59 -0600 Subject: [PATCH] test(cli): Verify terminal styling This uses a new feature from snapbox that let's us render terminal styling in SVG files. This let's us see / visualize ANSI escape codes, including in github's UI (will render images, including side-by-side images for diffs). --- Cargo.lock | 43 ++- Cargo.toml | 2 +- crates/cargo-test-support/src/lib.rs | 1 + tests/testsuite/cargo/help/mod.rs | 4 +- tests/testsuite/cargo/help/stderr.log | 0 tests/testsuite/cargo/help/stderr.term.svg | 20 ++ tests/testsuite/cargo/help/stdout.log | 40 --- tests/testsuite/cargo/help/stdout.term.svg | 102 ++++++ tests/testsuite/cargo/z_help/mod.rs | 4 +- tests/testsuite/cargo/z_help/stderr.log | 0 tests/testsuite/cargo/z_help/stderr.term.svg | 20 ++ tests/testsuite/cargo/z_help/stdout.log | 38 --- tests/testsuite/cargo/z_help/stdout.term.svg | 98 ++++++ tests/testsuite/cargo_add/add_basic/mod.rs | 4 +- .../testsuite/cargo_add/add_basic/stderr.log | 2 - .../cargo_add/add_basic/stderr.term.svg | 28 ++ .../testsuite/cargo_add/add_basic/stdout.log | 0 .../cargo_add/add_basic/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/add_multiple/mod.rs | 4 +- .../cargo_add/add_multiple/stderr.log | 3 - .../cargo_add/add_multiple/stderr.term.svg | 30 ++ .../cargo_add/add_multiple/stdout.log | 0 .../cargo_add/add_multiple/stdout.term.svg | 20 ++ .../add_normalized_name_external/mod.rs | 4 +- .../add_normalized_name_external/stderr.log | 18 -- .../stderr.term.svg | 62 ++++ .../add_normalized_name_external/stdout.log | 0 .../stdout.term.svg | 20 ++ .../testsuite/cargo_add/add_toolchain/mod.rs | 4 +- .../cargo_add/add_toolchain/stderr.log | 2 - .../cargo_add/add_toolchain/stderr.term.svg | 28 ++ .../cargo_add/add_toolchain/stdout.log | 0 .../cargo_add/add_toolchain/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/build/mod.rs | 4 +- tests/testsuite/cargo_add/build/stderr.log | 3 - .../testsuite/cargo_add/build/stderr.term.svg | 30 ++ tests/testsuite/cargo_add/build/stdout.log | 0 .../testsuite/cargo_add/build/stdout.term.svg | 20 ++ .../build_prefer_existing_version/mod.rs | 4 +- .../build_prefer_existing_version/stderr.log | 4 - .../stderr.term.svg | 33 ++ .../build_prefer_existing_version/stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_add/change_rename_target/mod.rs | 4 +- .../cargo_add/change_rename_target/stderr.log | 3 - .../change_rename_target/stderr.term.svg | 30 ++ .../cargo_add/change_rename_target/stdout.log | 0 .../change_rename_target/stdout.term.svg | 20 ++ .../cargo_add/cyclic_features/mod.rs | 4 +- .../cargo_add/cyclic_features/stderr.log | 5 - .../cargo_add/cyclic_features/stderr.term.svg | 34 ++ .../cargo_add/cyclic_features/stdout.log | 0 .../cargo_add/cyclic_features/stdout.term.svg | 20 ++ .../cargo_add/default_features/mod.rs | 4 +- .../cargo_add/default_features/stderr.log | 3 - .../default_features/stderr.term.svg | 30 ++ .../cargo_add/default_features/stdout.log | 0 .../default_features/stdout.term.svg | 20 ++ .../deprecated_default_features/mod.rs | 4 +- .../deprecated_default_features/stderr.log | 1 - .../stderr.term.svg | 26 ++ .../deprecated_default_features/stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_add/deprecated_section/mod.rs | 4 +- .../cargo_add/deprecated_section/stderr.log | 1 - .../deprecated_section/stderr.term.svg | 26 ++ .../cargo_add/deprecated_section/stdout.log | 0 .../deprecated_section/stdout.term.svg | 20 ++ .../cargo_add/detect_workspace_inherit/mod.rs | 4 +- .../detect_workspace_inherit/stderr.log | 1 - .../detect_workspace_inherit/stderr.term.svg | 26 ++ .../detect_workspace_inherit/stdout.log | 0 .../detect_workspace_inherit/stdout.term.svg | 20 ++ .../detect_workspace_inherit_features/mod.rs | 4 +- .../stderr.log | 10 - .../stderr.term.svg | 45 +++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../detect_workspace_inherit_optional/mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 28 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../detect_workspace_inherit_public/mod.rs | 4 +- .../stderr.log | 1 - .../stderr.term.svg | 26 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ tests/testsuite/cargo_add/dev/mod.rs | 4 +- tests/testsuite/cargo_add/dev/stderr.log | 3 - tests/testsuite/cargo_add/dev/stderr.term.svg | 30 ++ tests/testsuite/cargo_add/dev/stdout.log | 0 tests/testsuite/cargo_add/dev/stdout.term.svg | 20 ++ .../cargo_add/dev_build_conflict/mod.rs | 4 +- .../cargo_add/dev_build_conflict/stderr.log | 7 - .../dev_build_conflict/stderr.term.svg | 36 +++ .../cargo_add/dev_build_conflict/stdout.log | 0 .../dev_build_conflict/stdout.term.svg | 20 ++ .../dev_prefer_existing_version/mod.rs | 4 +- .../dev_prefer_existing_version/stderr.log | 4 - .../stderr.term.svg | 33 ++ .../dev_prefer_existing_version/stdout.log | 0 .../stdout.term.svg | 20 ++ tests/testsuite/cargo_add/dry_run/mod.rs | 4 +- tests/testsuite/cargo_add/dry_run/stderr.log | 3 - .../cargo_add/dry_run/stderr.term.svg | 31 ++ tests/testsuite/cargo_add/dry_run/stdout.log | 0 .../cargo_add/dry_run/stdout.term.svg | 20 ++ .../testsuite/cargo_add/empty_dep_name/mod.rs | 4 +- .../cargo_add/empty_dep_name/stderr.log | 1 - .../cargo_add/empty_dep_name/stderr.term.svg | 26 ++ .../cargo_add/empty_dep_name/stdout.log | 0 .../cargo_add/empty_dep_name/stdout.term.svg | 20 ++ .../cargo_add/empty_dep_table/mod.rs | 4 +- .../cargo_add/empty_dep_table/stderr.log | 1 - .../cargo_add/empty_dep_table/stderr.term.svg | 26 ++ .../cargo_add/empty_dep_table/stdout.log | 0 .../cargo_add/empty_dep_table/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/features/mod.rs | 4 +- tests/testsuite/cargo_add/features/stderr.log | 7 - .../cargo_add/features/stderr.term.svg | 39 +++ tests/testsuite/cargo_add/features/stdout.log | 0 .../cargo_add/features/stdout.term.svg | 20 ++ .../features_activated_over_limit/mod.rs | 4 +- .../features_activated_over_limit/stderr.log | 5 - .../stderr.term.svg | 34 ++ .../features_activated_over_limit/stdout.log | 0 .../stdout.term.svg | 20 ++ .../features_deactivated_over_limit/mod.rs | 4 +- .../stderr.log | 34 -- .../stderr.term.svg | 92 ++++++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../testsuite/cargo_add/features_empty/mod.rs | 4 +- .../cargo_add/features_empty/stderr.log | 7 - .../cargo_add/features_empty/stderr.term.svg | 39 +++ .../cargo_add/features_empty/stdout.log | 0 .../cargo_add/features_empty/stdout.term.svg | 20 ++ .../features_multiple_occurrences/mod.rs | 4 +- .../features_multiple_occurrences/stderr.log | 7 - .../stderr.term.svg | 39 +++ .../features_multiple_occurrences/stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_add/features_preserve/mod.rs | 4 +- .../cargo_add/features_preserve/stderr.log | 7 - .../features_preserve/stderr.term.svg | 39 +++ .../cargo_add/features_preserve/stdout.log | 0 .../features_preserve/stdout.term.svg | 20 ++ .../cargo_add/features_spaced_values/mod.rs | 4 +- .../features_spaced_values/stderr.log | 7 - .../features_spaced_values/stderr.term.svg | 39 +++ .../features_spaced_values/stdout.log | 0 .../features_spaced_values/stdout.term.svg | 20 ++ .../cargo_add/features_unknown/mod.rs | 4 +- .../cargo_add/features_unknown/stderr.log | 5 - .../features_unknown/stderr.term.svg | 35 +++ .../cargo_add/features_unknown/stdout.log | 0 .../features_unknown/stdout.term.svg | 20 ++ .../features_unknown_no_features/mod.rs | 4 +- .../features_unknown_no_features/stderr.log | 4 - .../stderr.term.svg | 33 ++ .../features_unknown_no_features/stdout.log | 0 .../stdout.term.svg | 20 ++ tests/testsuite/cargo_add/git/mod.rs | 4 +- tests/testsuite/cargo_add/git/stderr.log | 3 - tests/testsuite/cargo_add/git/stderr.term.svg | 30 ++ tests/testsuite/cargo_add/git/stdout.log | 0 tests/testsuite/cargo_add/git/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/git_branch/mod.rs | 4 +- .../testsuite/cargo_add/git_branch/stderr.log | 3 - .../cargo_add/git_branch/stderr.term.svg | 30 ++ .../testsuite/cargo_add/git_branch/stdout.log | 0 .../cargo_add/git_branch/stdout.term.svg | 20 ++ .../cargo_add/git_conflicts_namever/mod.rs | 4 +- .../git_conflicts_namever/stderr.log | 1 - .../git_conflicts_namever/stderr.term.svg | 26 ++ .../git_conflicts_namever/stdout.log | 0 .../git_conflicts_namever/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/git_dev/mod.rs | 4 +- tests/testsuite/cargo_add/git_dev/stderr.log | 3 - .../cargo_add/git_dev/stderr.term.svg | 30 ++ tests/testsuite/cargo_add/git_dev/stdout.log | 0 .../cargo_add/git_dev/stdout.term.svg | 20 ++ .../cargo_add/git_inferred_name/mod.rs | 4 +- .../cargo_add/git_inferred_name/stderr.log | 4 - .../git_inferred_name/stderr.term.svg | 32 ++ .../cargo_add/git_inferred_name/stdout.log | 0 .../git_inferred_name/stdout.term.svg | 20 ++ .../git_inferred_name_multiple/mod.rs | 4 +- .../git_inferred_name_multiple/stderr.log | 5 - .../stderr.term.svg | 35 +++ .../git_inferred_name_multiple/stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_add/git_multiple_names/mod.rs | 4 +- .../cargo_add/git_multiple_names/stderr.log | 4 - .../git_multiple_names/stderr.term.svg | 32 ++ .../cargo_add/git_multiple_names/stdout.log | 0 .../git_multiple_names/stdout.term.svg | 20 ++ .../git_multiple_packages_features/mod.rs | 4 +- .../git_multiple_packages_features/stderr.log | 5 - .../stderr.term.svg | 34 ++ .../git_multiple_packages_features/stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_add/git_normalized_name/mod.rs | 4 +- .../cargo_add/git_normalized_name/stderr.log | 2 - .../git_normalized_name/stderr.term.svg | 29 ++ .../cargo_add/git_normalized_name/stdout.log | 0 .../git_normalized_name/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/git_registry/mod.rs | 4 +- .../cargo_add/git_registry/stderr.log | 6 - .../cargo_add/git_registry/stderr.term.svg | 37 +++ .../cargo_add/git_registry/stdout.log | 0 .../cargo_add/git_registry/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/git_rev/mod.rs | 4 +- tests/testsuite/cargo_add/git_rev/stderr.log | 3 - .../cargo_add/git_rev/stderr.term.svg | 30 ++ tests/testsuite/cargo_add/git_rev/stdout.log | 0 .../cargo_add/git_rev/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/git_tag/mod.rs | 4 +- tests/testsuite/cargo_add/git_tag/stderr.log | 3 - .../cargo_add/git_tag/stderr.term.svg | 30 ++ tests/testsuite/cargo_add/git_tag/stdout.log | 0 .../cargo_add/git_tag/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/help/mod.rs | 4 +- tests/testsuite/cargo_add/help/stderr.log | 0 .../testsuite/cargo_add/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_add/help/stdout.log | 135 -------- .../testsuite/cargo_add/help/stdout.term.svg | 292 ++++++++++++++++++ .../cargo_add/infer_prerelease/mod.rs | 4 +- .../cargo_add/infer_prerelease/stderr.log | 2 - .../infer_prerelease/stderr.term.svg | 28 ++ .../cargo_add/infer_prerelease/stdout.log | 0 .../infer_prerelease/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/invalid_arg/mod.rs | 4 +- .../cargo_add/invalid_arg/stderr.log | 9 - .../cargo_add/invalid_arg/stderr.term.svg | 40 +++ .../cargo_add/invalid_arg/stdout.log | 0 .../cargo_add/invalid_arg/stdout.term.svg | 20 ++ .../cargo_add/invalid_git_name/mod.rs | 4 +- .../cargo_add/invalid_git_name/stderr.log | 2 - .../invalid_git_name/stderr.term.svg | 29 ++ .../cargo_add/invalid_git_name/stdout.log | 0 .../invalid_git_name/stdout.term.svg | 20 ++ .../invalid_key_inherit_dependency/mod.rs | 4 +- .../invalid_key_inherit_dependency/stderr.log | 1 - .../stderr.term.svg | 26 ++ .../invalid_key_inherit_dependency/stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 1 - .../stderr.term.svg | 26 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 1 - .../stderr.term.svg | 26 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_add/invalid_manifest/mod.rs | 4 +- .../cargo_add/invalid_manifest/stderr.log | 7 - .../invalid_manifest/stderr.term.svg | 39 +++ .../cargo_add/invalid_manifest/stdout.log | 0 .../invalid_manifest/stdout.term.svg | 20 ++ .../cargo_add/invalid_name_external/mod.rs | 4 +- .../invalid_name_external/stderr.log | 2 - .../invalid_name_external/stderr.term.svg | 29 ++ .../invalid_name_external/stdout.log | 0 .../invalid_name_external/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/invalid_path/mod.rs | 4 +- .../cargo_add/invalid_path/stderr.log | 10 - .../cargo_add/invalid_path/stderr.term.svg | 44 +++ .../cargo_add/invalid_path/stdout.log | 0 .../cargo_add/invalid_path/stdout.term.svg | 20 ++ .../cargo_add/invalid_path_name/mod.rs | 4 +- .../cargo_add/invalid_path_name/stderr.log | 1 - .../invalid_path_name/stderr.term.svg | 26 ++ .../cargo_add/invalid_path_name/stdout.log | 0 .../invalid_path_name/stdout.term.svg | 20 ++ .../cargo_add/invalid_path_self/mod.rs | 4 +- .../cargo_add/invalid_path_self/stderr.log | 2 - .../invalid_path_self/stderr.term.svg | 29 ++ .../cargo_add/invalid_path_self/stdout.log | 0 .../invalid_path_self/stdout.term.svg | 20 ++ .../cargo_add/invalid_target_empty/mod.rs | 4 +- .../cargo_add/invalid_target_empty/stderr.log | 3 - .../invalid_target_empty/stderr.term.svg | 28 ++ .../cargo_add/invalid_target_empty/stdout.log | 0 .../invalid_target_empty/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/invalid_vers/mod.rs | 4 +- .../cargo_add/invalid_vers/stderr.log | 4 - .../cargo_add/invalid_vers/stderr.term.svg | 32 ++ .../cargo_add/invalid_vers/stdout.log | 0 .../cargo_add/invalid_vers/stdout.term.svg | 20 ++ .../testsuite/cargo_add/list_features/mod.rs | 4 +- .../cargo_add/list_features/stderr.log | 7 - .../cargo_add/list_features/stderr.term.svg | 39 +++ .../cargo_add/list_features/stdout.log | 0 .../cargo_add/list_features/stdout.term.svg | 20 ++ .../cargo_add/list_features_path/mod.rs | 4 +- .../cargo_add/list_features_path/stderr.log | 7 - .../list_features_path/stderr.term.svg | 39 +++ .../cargo_add/list_features_path/stdout.log | 0 .../list_features_path/stdout.term.svg | 20 ++ .../list_features_path_no_default/mod.rs | 4 +- .../list_features_path_no_default/stderr.log | 7 - .../stderr.term.svg | 39 +++ .../list_features_path_no_default/stdout.log | 0 .../stdout.term.svg | 20 ++ .../testsuite/cargo_add/locked_changed/mod.rs | 4 +- .../cargo_add/locked_changed/stderr.log | 3 - .../cargo_add/locked_changed/stderr.term.svg | 31 ++ .../cargo_add/locked_changed/stdout.log | 0 .../cargo_add/locked_changed/stdout.term.svg | 20 ++ .../cargo_add/locked_unchanged/mod.rs | 4 +- .../cargo_add/locked_unchanged/stderr.log | 2 - .../locked_unchanged/stderr.term.svg | 28 ++ .../cargo_add/locked_unchanged/stdout.log | 0 .../locked_unchanged/stdout.term.svg | 20 ++ .../cargo_add/lockfile_updated/mod.rs | 4 +- .../cargo_add/lockfile_updated/stderr.log | 2 - .../lockfile_updated/stderr.term.svg | 28 ++ .../cargo_add/lockfile_updated/stdout.log | 0 .../lockfile_updated/stdout.term.svg | 20 ++ .../cargo_add/manifest_path_package/mod.rs | 4 +- .../manifest_path_package/stderr.log | 1 - .../manifest_path_package/stderr.term.svg | 26 ++ .../manifest_path_package/stdout.log | 0 .../manifest_path_package/stdout.term.svg | 20 ++ .../cargo_add/merge_activated_features/mod.rs | 4 +- .../merge_activated_features/stderr.log | 10 - .../merge_activated_features/stderr.term.svg | 45 +++ .../merge_activated_features/stdout.log | 0 .../merge_activated_features/stdout.term.svg | 20 ++ .../multiple_conflicts_with_features/mod.rs | 4 +- .../stderr.log | 1 - .../stderr.term.svg | 26 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../multiple_conflicts_with_rename/mod.rs | 4 +- .../multiple_conflicts_with_rename/stderr.log | 1 - .../stderr.term.svg | 26 ++ .../multiple_conflicts_with_rename/stdout.log | 0 .../stdout.term.svg | 20 ++ tests/testsuite/cargo_add/namever/mod.rs | 4 +- tests/testsuite/cargo_add/namever/stderr.log | 4 - .../cargo_add/namever/stderr.term.svg | 32 ++ tests/testsuite/cargo_add/namever/stdout.log | 0 .../cargo_add/namever/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/no_args/mod.rs | 4 +- tests/testsuite/cargo_add/no_args/stderr.log | 8 - .../cargo_add/no_args/stderr.term.svg | 38 +++ tests/testsuite/cargo_add/no_args/stdout.log | 0 .../cargo_add/no_args/stdout.term.svg | 20 ++ .../cargo_add/no_default_features/mod.rs | 4 +- .../cargo_add/no_default_features/stderr.log | 3 - .../no_default_features/stderr.term.svg | 30 ++ .../cargo_add/no_default_features/stdout.log | 0 .../no_default_features/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/no_optional/mod.rs | 4 +- .../cargo_add/no_optional/stderr.log | 2 - .../cargo_add/no_optional/stderr.term.svg | 28 ++ .../cargo_add/no_optional/stdout.log | 0 .../cargo_add/no_optional/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/no_public/mod.rs | 4 +- .../testsuite/cargo_add/no_public/stderr.log | 2 - .../cargo_add/no_public/stderr.term.svg | 28 ++ .../testsuite/cargo_add/no_public/stdout.log | 0 .../cargo_add/no_public/stdout.term.svg | 20 ++ .../cargo_add/offline_empty_cache/mod.rs | 4 +- .../cargo_add/offline_empty_cache/stderr.log | 1 - .../offline_empty_cache/stderr.term.svg | 26 ++ .../cargo_add/offline_empty_cache/stdout.log | 0 .../offline_empty_cache/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/optional/mod.rs | 4 +- tests/testsuite/cargo_add/optional/stderr.log | 3 - .../cargo_add/optional/stderr.term.svg | 30 ++ tests/testsuite/cargo_add/optional/stdout.log | 0 .../cargo_add/optional/stdout.term.svg | 20 ++ .../overwrite_default_features/mod.rs | 4 +- .../overwrite_default_features/stderr.log | 3 - .../stderr.term.svg | 30 ++ .../overwrite_default_features/stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 3 - .../stderr.term.svg | 30 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_add/overwrite_features/mod.rs | 4 +- .../cargo_add/overwrite_features/stderr.log | 7 - .../overwrite_features/stderr.term.svg | 39 +++ .../cargo_add/overwrite_features/stdout.log | 0 .../overwrite_features/stdout.term.svg | 20 ++ .../cargo_add/overwrite_git_with_path/mod.rs | 4 +- .../overwrite_git_with_path/stderr.log | 2 - .../overwrite_git_with_path/stderr.term.svg | 28 ++ .../overwrite_git_with_path/stdout.log | 0 .../overwrite_git_with_path/stdout.term.svg | 20 ++ .../overwrite_inherit_features_noop/mod.rs | 4 +- .../stderr.log | 3 - .../stderr.term.svg | 30 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_add/overwrite_inherit_noop/mod.rs | 4 +- .../overwrite_inherit_noop/stderr.log | 1 - .../overwrite_inherit_noop/stderr.term.svg | 26 ++ .../overwrite_inherit_noop/stdout.log | 0 .../overwrite_inherit_noop/stdout.term.svg | 20 ++ .../overwrite_inherit_optional_noop/mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 28 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../overwrite_inline_features/mod.rs | 4 +- .../overwrite_inline_features/stderr.log | 8 - .../overwrite_inline_features/stderr.term.svg | 40 +++ .../overwrite_inline_features/stdout.log | 0 .../overwrite_inline_features/stdout.term.svg | 20 ++ .../cargo_add/overwrite_name_dev_noop/mod.rs | 4 +- .../overwrite_name_dev_noop/stderr.log | 4 - .../overwrite_name_dev_noop/stderr.term.svg | 32 ++ .../overwrite_name_dev_noop/stdout.log | 0 .../overwrite_name_dev_noop/stdout.term.svg | 20 ++ .../cargo_add/overwrite_name_noop/mod.rs | 4 +- .../cargo_add/overwrite_name_noop/stderr.log | 5 - .../overwrite_name_noop/stderr.term.svg | 34 ++ .../cargo_add/overwrite_name_noop/stdout.log | 0 .../overwrite_name_noop/stdout.term.svg | 20 ++ .../overwrite_no_default_features/mod.rs | 4 +- .../overwrite_no_default_features/stderr.log | 3 - .../stderr.term.svg | 30 ++ .../overwrite_no_default_features/stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 3 - .../stderr.term.svg | 30 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_add/overwrite_no_optional/mod.rs | 4 +- .../overwrite_no_optional/stderr.log | 2 - .../overwrite_no_optional/stderr.term.svg | 28 ++ .../overwrite_no_optional/stdout.log | 0 .../overwrite_no_optional/stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 3 - .../stderr.term.svg | 30 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_add/overwrite_no_public/mod.rs | 4 +- .../cargo_add/overwrite_no_public/stderr.log | 2 - .../overwrite_no_public/stderr.term.svg | 28 ++ .../cargo_add/overwrite_no_public/stdout.log | 0 .../overwrite_no_public/stdout.term.svg | 20 ++ .../overwrite_no_public_with_public/mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 28 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_add/overwrite_optional/mod.rs | 4 +- .../cargo_add/overwrite_optional/stderr.log | 3 - .../overwrite_optional/stderr.term.svg | 30 ++ .../cargo_add/overwrite_optional/stdout.log | 0 .../overwrite_optional/stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 7 - .../stderr.term.svg | 39 +++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../overwrite_optional_with_optional/mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 28 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_add/overwrite_path_noop/mod.rs | 4 +- .../cargo_add/overwrite_path_noop/stderr.log | 5 - .../overwrite_path_noop/stderr.term.svg | 34 ++ .../cargo_add/overwrite_path_noop/stdout.log | 0 .../overwrite_path_noop/stdout.term.svg | 20 ++ .../overwrite_path_with_version/mod.rs | 4 +- .../overwrite_path_with_version/stderr.log | 3 - .../stderr.term.svg | 30 ++ .../overwrite_path_with_version/stdout.log | 0 .../stdout.term.svg | 20 ++ .../overwrite_preserves_inline_table/mod.rs | 4 +- .../stderr.log | 7 - .../stderr.term.svg | 39 +++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_add/overwrite_public/mod.rs | 4 +- .../cargo_add/overwrite_public/stderr.log | 2 - .../overwrite_public/stderr.term.svg | 28 ++ .../cargo_add/overwrite_public/stdout.log | 0 .../overwrite_public/stdout.term.svg | 20 ++ .../overwrite_public_with_no_public/mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 28 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../overwrite_rename_with_no_rename/mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 28 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../overwrite_rename_with_rename/mod.rs | 4 +- .../overwrite_rename_with_rename/stderr.log | 2 - .../stderr.term.svg | 28 ++ .../overwrite_rename_with_rename/stdout.log | 0 .../stdout.term.svg | 20 ++ .../overwrite_rename_with_rename_noop/mod.rs | 4 +- .../stderr.log | 3 - .../stderr.term.svg | 30 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../overwrite_version_with_git/mod.rs | 4 +- .../overwrite_version_with_git/stderr.log | 4 - .../stderr.term.svg | 32 ++ .../overwrite_version_with_git/stdout.log | 0 .../stdout.term.svg | 20 ++ .../overwrite_version_with_path/mod.rs | 4 +- .../overwrite_version_with_path/stderr.log | 2 - .../stderr.term.svg | 28 ++ .../overwrite_version_with_path/stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_add/overwrite_with_rename/mod.rs | 4 +- .../overwrite_with_rename/stderr.log | 2 - .../overwrite_with_rename/stderr.term.svg | 28 ++ .../overwrite_with_rename/stdout.log | 0 .../overwrite_with_rename/stdout.term.svg | 20 ++ .../cargo_add/overwrite_workspace_dep/mod.rs | 4 +- .../overwrite_workspace_dep/stderr.log | 1 - .../overwrite_workspace_dep/stderr.term.svg | 26 ++ .../overwrite_workspace_dep/stdout.log | 0 .../overwrite_workspace_dep/stdout.term.svg | 20 ++ .../overwrite_workspace_dep_features/mod.rs | 4 +- .../stderr.log | 10 - .../stderr.term.svg | 45 +++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ tests/testsuite/cargo_add/path/mod.rs | 4 +- tests/testsuite/cargo_add/path/stderr.log | 1 - .../testsuite/cargo_add/path/stderr.term.svg | 26 ++ tests/testsuite/cargo_add/path/stdout.log | 0 .../testsuite/cargo_add/path/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/path_dev/mod.rs | 4 +- tests/testsuite/cargo_add/path_dev/stderr.log | 1 - .../cargo_add/path_dev/stderr.term.svg | 26 ++ tests/testsuite/cargo_add/path_dev/stdout.log | 0 .../cargo_add/path_dev/stdout.term.svg | 20 ++ .../cargo_add/path_inferred_name/mod.rs | 4 +- .../cargo_add/path_inferred_name/stderr.log | 1 - .../path_inferred_name/stderr.term.svg | 26 ++ .../cargo_add/path_inferred_name/stdout.log | 0 .../path_inferred_name/stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 1 - .../stderr.term.svg | 26 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_add/path_normalized_name/mod.rs | 4 +- .../cargo_add/path_normalized_name/stderr.log | 1 - .../path_normalized_name/stderr.term.svg | 26 ++ .../cargo_add/path_normalized_name/stdout.log | 0 .../path_normalized_name/stdout.term.svg | 20 ++ .../cargo_add/preserve_dep_std_table/mod.rs | 4 +- .../preserve_dep_std_table/stderr.log | 7 - .../preserve_dep_std_table/stderr.term.svg | 39 +++ .../preserve_dep_std_table/stdout.log | 0 .../preserve_dep_std_table/stdout.term.svg | 20 ++ .../cargo_add/preserve_features_table/mod.rs | 4 +- .../preserve_features_table/stderr.log | 7 - .../preserve_features_table/stderr.term.svg | 39 +++ .../preserve_features_table/stdout.log | 0 .../preserve_features_table/stdout.term.svg | 20 ++ .../cargo_add/preserve_sorted/mod.rs | 4 +- .../cargo_add/preserve_sorted/stderr.log | 2 - .../cargo_add/preserve_sorted/stderr.term.svg | 28 ++ .../cargo_add/preserve_sorted/stdout.log | 0 .../cargo_add/preserve_sorted/stdout.term.svg | 20 ++ .../cargo_add/preserve_unsorted/mod.rs | 4 +- .../cargo_add/preserve_unsorted/stderr.log | 2 - .../preserve_unsorted/stderr.term.svg | 28 ++ .../cargo_add/preserve_unsorted/stdout.log | 0 .../preserve_unsorted/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/public/mod.rs | 4 +- tests/testsuite/cargo_add/public/stderr.log | 2 - .../cargo_add/public/stderr.term.svg | 28 ++ tests/testsuite/cargo_add/public/stdout.log | 0 .../cargo_add/public/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/quiet/mod.rs | 4 +- tests/testsuite/cargo_add/quiet/stderr.log | 0 .../testsuite/cargo_add/quiet/stderr.term.svg | 20 ++ tests/testsuite/cargo_add/quiet/stdout.log | 0 .../testsuite/cargo_add/quiet/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/registry/mod.rs | 4 +- tests/testsuite/cargo_add/registry/stderr.log | 3 - .../cargo_add/registry/stderr.term.svg | 30 ++ tests/testsuite/cargo_add/registry/stdout.log | 0 .../cargo_add/registry/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/rename/mod.rs | 4 +- tests/testsuite/cargo_add/rename/stderr.log | 2 - .../cargo_add/rename/stderr.term.svg | 28 ++ tests/testsuite/cargo_add/rename/stdout.log | 0 .../cargo_add/rename/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/require_weak/mod.rs | 4 +- .../cargo_add/require_weak/stderr.log | 7 - .../cargo_add/require_weak/stderr.term.svg | 39 +++ .../cargo_add/require_weak/stdout.log | 0 .../cargo_add/require_weak/stdout.term.svg | 20 ++ .../cargo_add/rust_version_ignore/mod.rs | 4 +- .../cargo_add/rust_version_ignore/stderr.log | 2 - .../rust_version_ignore/stderr.term.svg | 28 ++ .../cargo_add/rust_version_ignore/stdout.log | 0 .../rust_version_ignore/stdout.term.svg | 20 ++ .../rust_version_incompatible/mod.rs | 4 +- .../rust_version_incompatible/stderr.log | 4 - .../rust_version_incompatible/stderr.term.svg | 33 ++ .../rust_version_incompatible/stdout.log | 0 .../rust_version_incompatible/stdout.term.svg | 20 ++ .../cargo_add/rust_version_latest/mod.rs | 4 +- .../cargo_add/rust_version_latest/stderr.log | 2 - .../rust_version_latest/stderr.term.svg | 28 ++ .../cargo_add/rust_version_latest/stdout.log | 0 .../rust_version_latest/stdout.term.svg | 20 ++ .../cargo_add/rust_version_older/mod.rs | 4 +- .../cargo_add/rust_version_older/stderr.log | 3 - .../rust_version_older/stderr.term.svg | 31 ++ .../cargo_add/rust_version_older/stdout.log | 0 .../rust_version_older/stdout.term.svg | 20 ++ .../sorted_table_with_dotted_item/mod.rs | 4 +- .../sorted_table_with_dotted_item/stderr.log | 2 - .../stderr.term.svg | 28 ++ .../sorted_table_with_dotted_item/stdout.log | 0 .../stdout.term.svg | 20 ++ tests/testsuite/cargo_add/target/mod.rs | 4 +- tests/testsuite/cargo_add/target/stderr.log | 3 - .../cargo_add/target/stderr.term.svg | 30 ++ tests/testsuite/cargo_add/target/stdout.log | 0 .../cargo_add/target/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/target_cfg/mod.rs | 4 +- .../testsuite/cargo_add/target_cfg/stderr.log | 3 - .../cargo_add/target_cfg/stderr.term.svg | 30 ++ .../testsuite/cargo_add/target_cfg/stdout.log | 0 .../cargo_add/target_cfg/stdout.term.svg | 20 ++ .../unknown_inherited_feature/mod.rs | 4 +- .../unknown_inherited_feature/stderr.log | 7 - .../unknown_inherited_feature/stderr.term.svg | 39 +++ .../unknown_inherited_feature/stdout.log | 0 .../unknown_inherited_feature/stdout.term.svg | 20 ++ tests/testsuite/cargo_add/vers/mod.rs | 4 +- tests/testsuite/cargo_add/vers/stderr.log | 2 - .../testsuite/cargo_add/vers/stderr.term.svg | 28 ++ tests/testsuite/cargo_add/vers/stdout.log | 0 .../testsuite/cargo_add/vers/stdout.term.svg | 20 ++ .../testsuite/cargo_add/workspace_name/mod.rs | 4 +- .../cargo_add/workspace_name/stderr.log | 1 - .../cargo_add/workspace_name/stderr.term.svg | 26 ++ .../cargo_add/workspace_name/stdout.log | 0 .../cargo_add/workspace_name/stdout.term.svg | 20 ++ .../testsuite/cargo_add/workspace_path/mod.rs | 4 +- .../cargo_add/workspace_path/stderr.log | 1 - .../cargo_add/workspace_path/stderr.term.svg | 26 ++ .../cargo_add/workspace_path/stdout.log | 0 .../cargo_add/workspace_path/stdout.term.svg | 20 ++ .../cargo_add/workspace_path_dev/mod.rs | 4 +- .../cargo_add/workspace_path_dev/stderr.log | 1 - .../workspace_path_dev/stderr.term.svg | 26 ++ .../cargo_add/workspace_path_dev/stdout.log | 0 .../workspace_path_dev/stdout.term.svg | 20 ++ tests/testsuite/cargo_bench/help/mod.rs | 4 +- tests/testsuite/cargo_bench/help/stderr.log | 0 .../cargo_bench/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_bench/help/stdout.log | 59 ---- .../cargo_bench/help/stdout.term.svg | 140 +++++++++ .../cargo_bench/no_keep_going/mod.rs | 4 +- .../cargo_bench/no_keep_going/stderr.log | 7 - .../cargo_bench/no_keep_going/stderr.term.svg | 36 +++ .../cargo_bench/no_keep_going/stdout.log | 0 .../cargo_bench/no_keep_going/stdout.term.svg | 20 ++ tests/testsuite/cargo_build/help/mod.rs | 4 +- tests/testsuite/cargo_build/help/stderr.log | 0 .../cargo_build/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_build/help/stdout.log | 58 ---- .../cargo_build/help/stdout.term.svg | 138 +++++++++ tests/testsuite/cargo_check/help/mod.rs | 4 +- tests/testsuite/cargo_check/help/stderr.log | 0 .../cargo_check/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_check/help/stdout.log | 56 ---- .../cargo_check/help/stdout.term.svg | 134 ++++++++ tests/testsuite/cargo_clean/help/mod.rs | 4 +- tests/testsuite/cargo_clean/help/stderr.log | 0 .../cargo_clean/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_clean/help/stdout.log | 30 -- .../cargo_clean/help/stdout.term.svg | 82 +++++ tests/testsuite/cargo_config/help/mod.rs | 4 +- tests/testsuite/cargo_config/help/stderr.log | 0 .../cargo_config/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_config/help/stdout.log | 19 -- .../cargo_config/help/stdout.term.svg | 60 ++++ tests/testsuite/cargo_doc/help/mod.rs | 4 +- tests/testsuite/cargo_doc/help/stderr.log | 0 .../testsuite/cargo_doc/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_doc/help/stdout.log | 53 ---- .../testsuite/cargo_doc/help/stdout.term.svg | 128 ++++++++ tests/testsuite/cargo_fetch/help/mod.rs | 4 +- tests/testsuite/cargo_fetch/help/stderr.log | 0 .../cargo_fetch/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_fetch/help/stdout.log | 22 -- .../cargo_fetch/help/stdout.term.svg | 66 ++++ tests/testsuite/cargo_fix/help/mod.rs | 4 +- tests/testsuite/cargo_fix/help/stderr.log | 0 .../testsuite/cargo_fix/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_fix/help/stdout.log | 60 ---- .../testsuite/cargo_fix/help/stdout.term.svg | 142 +++++++++ .../cargo_generate_lockfile/help/mod.rs | 4 +- .../cargo_generate_lockfile/help/stderr.log | 0 .../help/stderr.term.svg | 20 ++ .../cargo_generate_lockfile/help/stdout.log | 19 -- .../help/stdout.term.svg | 60 ++++ .../testsuite/cargo_git_checkout/help/mod.rs | 4 +- .../cargo_git_checkout/help/stderr.log | 0 .../cargo_git_checkout/help/stderr.term.svg | 20 ++ .../cargo_git_checkout/help/stdout.log | 1 - .../cargo_git_checkout/help/stdout.term.svg | 24 ++ tests/testsuite/cargo_help/help/mod.rs | 4 +- tests/testsuite/cargo_help/help/stderr.log | 0 .../testsuite/cargo_help/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_help/help/stdout.log | 19 -- .../testsuite/cargo_help/help/stdout.term.svg | 60 ++++ tests/testsuite/cargo_init/auto_git/mod.rs | 4 +- .../testsuite/cargo_init/auto_git/stderr.log | 2 - .../cargo_init/auto_git/stderr.term.svg | 29 ++ .../testsuite/cargo_init/auto_git/stdout.log | 0 .../cargo_init/auto_git/stdout.term.svg | 20 ++ .../bin_already_exists_explicit/mod.rs | 4 +- .../bin_already_exists_explicit/stderr.log | 2 - .../stderr.term.svg | 29 ++ .../bin_already_exists_explicit/stdout.log | 0 .../stdout.term.svg | 20 ++ .../bin_already_exists_explicit_nosrc/mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../bin_already_exists_implicit/mod.rs | 4 +- .../bin_already_exists_implicit/stderr.log | 2 - .../stderr.term.svg | 29 ++ .../bin_already_exists_implicit/stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../bin_already_exists_implicit_nosrc/mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_init/both_lib_and_bin/mod.rs | 4 +- .../cargo_init/both_lib_and_bin/stderr.log | 1 - .../both_lib_and_bin/stderr.term.svg | 26 ++ .../cargo_init/both_lib_and_bin/stdout.log | 0 .../both_lib_and_bin/stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../confused_by_multiple_lib_files/mod.rs | 4 +- .../confused_by_multiple_lib_files/stderr.log | 1 - .../stderr.term.svg | 26 ++ .../confused_by_multiple_lib_files/stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 3 - .../stderr.term.svg | 32 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 3 - .../stderr.term.svg | 32 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_init/explicit_bin_with_git/mod.rs | 4 +- .../explicit_bin_with_git/stderr.log | 2 - .../explicit_bin_with_git/stderr.term.svg | 29 ++ .../explicit_bin_with_git/stdout.log | 0 .../explicit_bin_with_git/stdout.term.svg | 20 ++ .../cargo_init/formats_source/mod.rs | 4 +- .../cargo_init/formats_source/stderr.log | 2 - .../cargo_init/formats_source/stderr.term.svg | 29 ++ .../cargo_init/formats_source/stdout.log | 0 .../cargo_init/formats_source/stdout.term.svg | 20 ++ .../cargo_init/fossil_autodetect/mod.rs | 4 +- .../cargo_init/fossil_autodetect/stderr.log | 2 - .../fossil_autodetect/stderr.term.svg | 29 ++ .../cargo_init/fossil_autodetect/stdout.log | 0 .../fossil_autodetect/stdout.term.svg | 20 ++ .../cargo_init/git_autodetect/mod.rs | 4 +- .../cargo_init/git_autodetect/stderr.log | 2 - .../cargo_init/git_autodetect/stderr.term.svg | 29 ++ .../cargo_init/git_autodetect/stdout.log | 0 .../cargo_init/git_autodetect/stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ tests/testsuite/cargo_init/help/mod.rs | 4 +- tests/testsuite/cargo_init/help/stderr.log | 0 .../testsuite/cargo_init/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_init/help/stdout.log | 30 -- .../testsuite/cargo_init/help/stdout.term.svg | 82 +++++ .../ignores_failure_to_format_source/mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_init/inferred_bin_with_git/mod.rs | 4 +- .../inferred_bin_with_git/stderr.log | 2 - .../inferred_bin_with_git/stderr.term.svg | 29 ++ .../inferred_bin_with_git/stdout.log | 0 .../inferred_bin_with_git/stdout.term.svg | 20 ++ .../cargo_init/inferred_lib_with_git/mod.rs | 4 +- .../inferred_lib_with_git/stderr.log | 2 - .../inferred_lib_with_git/stderr.term.svg | 29 ++ .../inferred_lib_with_git/stdout.log | 0 .../inferred_lib_with_git/stdout.term.svg | 20 ++ .../inherit_workspace_package_table/mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_init/invalid_dir_name/mod.rs | 4 +- .../cargo_init/invalid_dir_name/stderr.log | 9 - .../invalid_dir_name/stderr.term.svg | 43 +++ .../cargo_init/invalid_dir_name/stdout.log | 0 .../invalid_dir_name/stdout.term.svg | 20 ++ .../lib_already_exists_nosrc/mod.rs | 4 +- .../lib_already_exists_nosrc/stderr.log | 2 - .../lib_already_exists_nosrc/stderr.term.svg | 29 ++ .../lib_already_exists_nosrc/stdout.log | 0 .../lib_already_exists_nosrc/stdout.term.svg | 20 ++ .../cargo_init/lib_already_exists_src/mod.rs | 4 +- .../lib_already_exists_src/stderr.log | 2 - .../lib_already_exists_src/stderr.term.svg | 29 ++ .../lib_already_exists_src/stdout.log | 0 .../lib_already_exists_src/stdout.term.svg | 20 ++ .../cargo_init/mercurial_autodetect/mod.rs | 4 +- .../mercurial_autodetect/stderr.log | 2 - .../mercurial_autodetect/stderr.term.svg | 29 ++ .../mercurial_autodetect/stdout.log | 0 .../mercurial_autodetect/stdout.term.svg | 20 ++ .../multibin_project_name_clash/mod.rs | 4 +- .../multibin_project_name_clash/stderr.log | 4 - .../stderr.term.svg | 32 ++ .../multibin_project_name_clash/stdout.log | 0 .../stdout.term.svg | 20 ++ tests/testsuite/cargo_init/no_filename/mod.rs | 4 +- .../cargo_init/no_filename/stderr.log | 1 - .../cargo_init/no_filename/stderr.term.svg | 26 ++ .../cargo_init/no_filename/stdout.log | 0 .../cargo_init/no_filename/stdout.term.svg | 20 ++ .../cargo_init/path_contains_separator/mod.rs | 4 +- .../path_contains_separator/stderr.log | 4 - .../path_contains_separator/stderr.term.svg | 34 ++ .../path_contains_separator/stdout.log | 0 .../path_contains_separator/stdout.term.svg | 20 ++ .../cargo_init/pijul_autodetect/mod.rs | 4 +- .../cargo_init/pijul_autodetect/stderr.log | 2 - .../pijul_autodetect/stderr.term.svg | 29 ++ .../cargo_init/pijul_autodetect/stdout.log | 0 .../pijul_autodetect/stdout.term.svg | 20 ++ .../testsuite/cargo_init/reserved_name/mod.rs | 4 +- .../cargo_init/reserved_name/stderr.log | 9 - .../cargo_init/reserved_name/stderr.term.svg | 43 +++ .../cargo_init/reserved_name/stdout.log | 0 .../cargo_init/reserved_name/stdout.term.svg | 20 ++ tests/testsuite/cargo_init/simple_bin/mod.rs | 4 +- .../cargo_init/simple_bin/stderr.log | 2 - .../cargo_init/simple_bin/stderr.term.svg | 29 ++ .../cargo_init/simple_bin/stdout.log | 0 .../cargo_init/simple_bin/stdout.term.svg | 20 ++ tests/testsuite/cargo_init/simple_git/mod.rs | 4 +- .../cargo_init/simple_git/stderr.log | 2 - .../cargo_init/simple_git/stderr.term.svg | 29 ++ .../cargo_init/simple_git/stdout.log | 0 .../cargo_init/simple_git/stdout.term.svg | 20 ++ .../simple_git_ignore_exists/mod.rs | 4 +- .../simple_git_ignore_exists/stderr.log | 2 - .../simple_git_ignore_exists/stderr.term.svg | 29 ++ .../simple_git_ignore_exists/stdout.log | 0 .../simple_git_ignore_exists/stdout.term.svg | 20 ++ tests/testsuite/cargo_init/simple_hg/mod.rs | 4 +- .../testsuite/cargo_init/simple_hg/stderr.log | 2 - .../testsuite/cargo_init/simple_hg/stdout.log | 0 .../cargo_init/simple_hg_ignore_exists/mod.rs | 4 +- .../simple_hg_ignore_exists/stderr.log | 2 - .../simple_hg_ignore_exists/stderr.term.svg | 29 ++ .../simple_hg_ignore_exists/stdout.log | 0 .../simple_hg_ignore_exists/stdout.term.svg | 20 ++ tests/testsuite/cargo_init/simple_lib/mod.rs | 4 +- .../cargo_init/simple_lib/stderr.log | 2 - .../cargo_init/simple_lib/stderr.term.svg | 29 ++ .../cargo_init/simple_lib/stdout.log | 0 .../cargo_init/simple_lib/stdout.term.svg | 20 ++ .../testsuite/cargo_init/unknown_flags/mod.rs | 4 +- .../cargo_init/unknown_flags/stderr.log | 7 - .../cargo_init/unknown_flags/stderr.term.svg | 36 +++ .../cargo_init/unknown_flags/stdout.log | 0 .../cargo_init/unknown_flags/stdout.term.svg | 20 ++ .../testsuite/cargo_init/with_argument/mod.rs | 4 +- .../cargo_init/with_argument/stderr.log | 2 - .../cargo_init/with_argument/stderr.term.svg | 29 ++ .../cargo_init/with_argument/stdout.log | 0 .../cargo_init/with_argument/stdout.term.svg | 20 ++ .../cargo_init/workspace_add_member/mod.rs | 4 +- .../workspace_add_member/stderr.log | 3 - .../workspace_add_member/stderr.term.svg | 31 ++ .../workspace_add_member/stdout.log | 0 .../workspace_add_member/stdout.term.svg | 20 ++ tests/testsuite/cargo_install/help/mod.rs | 4 +- tests/testsuite/cargo_install/help/stderr.log | 0 .../cargo_install/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_install/help/stdout.log | 56 ---- .../cargo_install/help/stdout.term.svg | 134 ++++++++ .../cargo_locate_project/help/mod.rs | 4 +- .../cargo_locate_project/help/stderr.log | 0 .../cargo_locate_project/help/stderr.term.svg | 20 ++ .../cargo_locate_project/help/stdout.log | 22 -- .../cargo_locate_project/help/stdout.term.svg | 66 ++++ tests/testsuite/cargo_login/help/mod.rs | 4 +- tests/testsuite/cargo_login/help/stderr.log | 0 .../cargo_login/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_login/help/stdout.log | 23 -- .../cargo_login/help/stdout.term.svg | 68 ++++ tests/testsuite/cargo_logout/help/mod.rs | 4 +- tests/testsuite/cargo_logout/help/stderr.log | 0 .../cargo_logout/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_logout/help/stdout.log | 19 -- .../cargo_logout/help/stdout.term.svg | 60 ++++ tests/testsuite/cargo_metadata/help/mod.rs | 4 +- .../testsuite/cargo_metadata/help/stderr.log | 0 .../cargo_metadata/help/stderr.term.svg | 20 ++ .../testsuite/cargo_metadata/help/stdout.log | 30 -- .../cargo_metadata/help/stdout.term.svg | 82 +++++ .../add_members_to_non_workspace/mod.rs | 4 +- .../add_members_to_non_workspace/stderr.log | 3 - .../stderr.term.svg | 31 ++ .../add_members_to_non_workspace/stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 3 - .../stderr.term.svg | 31 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 3 - .../stderr.term.svg | 31 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 3 - .../stderr.term.svg | 31 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 3 - .../stderr.term.svg | 31 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 3 - .../stderr.term.svg | 31 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ tests/testsuite/cargo_new/empty_name/mod.rs | 4 +- .../testsuite/cargo_new/empty_name/stderr.log | 2 - .../cargo_new/empty_name/stderr.term.svg | 29 ++ .../testsuite/cargo_new/empty_name/stdout.log | 0 .../cargo_new/empty_name/stdout.term.svg | 20 ++ tests/testsuite/cargo_new/help/mod.rs | 4 +- tests/testsuite/cargo_new/help/stderr.log | 0 .../testsuite/cargo_new/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_new/help/stdout.log | 30 -- .../testsuite/cargo_new/help/stdout.term.svg | 82 +++++ .../cargo_new/inherit_workspace_lints/mod.rs | 4 +- .../inherit_workspace_lints/stderr.log | 2 - .../inherit_workspace_lints/stderr.term.svg | 29 ++ .../inherit_workspace_lints/stdout.log | 0 .../inherit_workspace_lints/stdout.term.svg | 20 ++ .../inherit_workspace_package_table/mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 29 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ tests/testsuite/cargo_owner/help/mod.rs | 4 +- tests/testsuite/cargo_owner/help/stderr.log | 0 .../cargo_owner/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_owner/help/stdout.log | 27 -- .../cargo_owner/help/stdout.term.svg | 76 +++++ tests/testsuite/cargo_package/help/mod.rs | 4 +- tests/testsuite/cargo_package/help/stderr.log | 0 .../cargo_package/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_package/help/stdout.log | 39 --- .../cargo_package/help/stdout.term.svg | 100 ++++++ tests/testsuite/cargo_pkgid/help/mod.rs | 4 +- tests/testsuite/cargo_pkgid/help/stderr.log | 0 .../cargo_pkgid/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_pkgid/help/stdout.log | 25 -- .../cargo_pkgid/help/stdout.term.svg | 72 +++++ tests/testsuite/cargo_publish/help/mod.rs | 4 +- tests/testsuite/cargo_publish/help/stderr.log | 0 .../cargo_publish/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_publish/help/stdout.log | 39 --- .../cargo_publish/help/stdout.term.svg | 100 ++++++ .../testsuite/cargo_read_manifest/help/mod.rs | 4 +- .../cargo_read_manifest/help/stderr.log | 0 .../cargo_read_manifest/help/stderr.term.svg | 20 ++ .../cargo_read_manifest/help/stdout.log | 19 -- .../cargo_read_manifest/help/stdout.term.svg | 60 ++++ .../cargo_remove/avoid_empty_tables/mod.rs | 4 +- .../avoid_empty_tables/stderr.log | 1 - .../avoid_empty_tables/stderr.term.svg | 26 ++ .../avoid_empty_tables/stdout.log | 0 .../avoid_empty_tables/stdout.term.svg | 20 ++ tests/testsuite/cargo_remove/build/mod.rs | 4 +- tests/testsuite/cargo_remove/build/stderr.log | 1 - .../cargo_remove/build/stderr.term.svg | 26 ++ tests/testsuite/cargo_remove/build/stdout.log | 0 .../cargo_remove/build/stdout.term.svg | 20 ++ tests/testsuite/cargo_remove/dev/mod.rs | 4 +- tests/testsuite/cargo_remove/dev/stderr.log | 1 - .../cargo_remove/dev/stderr.term.svg | 26 ++ tests/testsuite/cargo_remove/dev/stdout.log | 0 .../cargo_remove/dev/stdout.term.svg | 20 ++ tests/testsuite/cargo_remove/dry_run/mod.rs | 4 +- .../testsuite/cargo_remove/dry_run/stderr.log | 2 - .../cargo_remove/dry_run/stderr.term.svg | 29 ++ .../testsuite/cargo_remove/dry_run/stdout.log | 0 .../cargo_remove/dry_run/stdout.term.svg | 20 ++ .../cargo_remove/gc_keep_used_patch/mod.rs | 4 +- .../gc_keep_used_patch/stderr.log | 1 - .../gc_keep_used_patch/stderr.term.svg | 26 ++ .../gc_keep_used_patch/stdout.log | 0 .../gc_keep_used_patch/stdout.term.svg | 20 ++ tests/testsuite/cargo_remove/gc_patch/mod.rs | 4 +- .../cargo_remove/gc_patch/stderr.log | 1 - .../cargo_remove/gc_patch/stderr.term.svg | 26 ++ .../cargo_remove/gc_patch/stdout.log | 0 .../cargo_remove/gc_patch/stdout.term.svg | 20 ++ .../testsuite/cargo_remove/gc_profile/mod.rs | 4 +- .../cargo_remove/gc_profile/stderr.log | 1 - .../cargo_remove/gc_profile/stderr.term.svg | 26 ++ .../cargo_remove/gc_profile/stdout.log | 0 .../cargo_remove/gc_profile/stdout.term.svg | 20 ++ .../testsuite/cargo_remove/gc_replace/mod.rs | 4 +- .../cargo_remove/gc_replace/stderr.log | 1 - .../cargo_remove/gc_replace/stderr.term.svg | 26 ++ .../cargo_remove/gc_replace/stdout.log | 0 .../cargo_remove/gc_replace/stdout.term.svg | 20 ++ tests/testsuite/cargo_remove/help/mod.rs | 4 +- tests/testsuite/cargo_remove/help/stderr.log | 0 .../cargo_remove/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_remove/help/stdout.log | 31 -- .../cargo_remove/help/stdout.term.svg | 84 +++++ .../testsuite/cargo_remove/invalid_arg/mod.rs | 4 +- .../cargo_remove/invalid_arg/stderr.log | 7 - .../cargo_remove/invalid_arg/stderr.term.svg | 36 +++ .../cargo_remove/invalid_arg/stdout.log | 0 .../cargo_remove/invalid_arg/stdout.term.svg | 20 ++ .../testsuite/cargo_remove/invalid_dep/mod.rs | 4 +- .../cargo_remove/invalid_dep/stderr.log | 2 - .../cargo_remove/invalid_dep/stderr.term.svg | 29 ++ .../cargo_remove/invalid_dep/stdout.log | 0 .../cargo_remove/invalid_dep/stdout.term.svg | 20 ++ .../cargo_remove/invalid_package/mod.rs | 4 +- .../cargo_remove/invalid_package/stderr.log | 1 - .../invalid_package/stderr.term.svg | 26 ++ .../cargo_remove/invalid_package/stdout.log | 0 .../invalid_package/stdout.term.svg | 20 ++ .../invalid_package_multiple/mod.rs | 4 +- .../invalid_package_multiple/stderr.log | 2 - .../invalid_package_multiple/stderr.term.svg | 28 ++ .../invalid_package_multiple/stdout.log | 0 .../invalid_package_multiple/stdout.term.svg | 20 ++ .../cargo_remove/invalid_section/mod.rs | 4 +- .../cargo_remove/invalid_section/stderr.log | 2 - .../invalid_section/stderr.term.svg | 29 ++ .../cargo_remove/invalid_section/stdout.log | 0 .../invalid_section/stdout.term.svg | 20 ++ .../cargo_remove/invalid_section_dep/mod.rs | 4 +- .../invalid_section_dep/stderr.log | 2 - .../invalid_section_dep/stderr.term.svg | 29 ++ .../invalid_section_dep/stdout.log | 0 .../invalid_section_dep/stdout.term.svg | 20 ++ .../cargo_remove/invalid_target/mod.rs | 4 +- .../cargo_remove/invalid_target/stderr.log | 2 - .../invalid_target/stderr.term.svg | 29 ++ .../cargo_remove/invalid_target/stdout.log | 0 .../invalid_target/stdout.term.svg | 20 ++ .../cargo_remove/invalid_target_dep/mod.rs | 4 +- .../invalid_target_dep/stderr.log | 2 - .../invalid_target_dep/stderr.term.svg | 29 ++ .../invalid_target_dep/stdout.log | 0 .../invalid_target_dep/stdout.term.svg | 20 ++ .../cargo_remove/multiple_deps/mod.rs | 4 +- .../cargo_remove/multiple_deps/stderr.log | 2 - .../multiple_deps/stderr.term.svg | 28 ++ .../cargo_remove/multiple_deps/stdout.log | 0 .../multiple_deps/stdout.term.svg | 20 ++ .../cargo_remove/multiple_dev/mod.rs | 4 +- .../cargo_remove/multiple_dev/stderr.log | 2 - .../cargo_remove/multiple_dev/stderr.term.svg | 28 ++ .../cargo_remove/multiple_dev/stdout.log | 0 .../cargo_remove/multiple_dev/stdout.term.svg | 20 ++ tests/testsuite/cargo_remove/no_arg/mod.rs | 4 +- .../testsuite/cargo_remove/no_arg/stderr.log | 6 - .../cargo_remove/no_arg/stderr.term.svg | 34 ++ .../testsuite/cargo_remove/no_arg/stdout.log | 0 .../cargo_remove/no_arg/stdout.term.svg | 20 ++ tests/testsuite/cargo_remove/offline/mod.rs | 4 +- .../testsuite/cargo_remove/offline/stderr.log | 1 - .../cargo_remove/offline/stderr.term.svg | 26 ++ .../testsuite/cargo_remove/offline/stdout.log | 0 .../cargo_remove/offline/stdout.term.svg | 20 ++ .../cargo_remove/optional_dep_feature/mod.rs | 4 +- .../optional_dep_feature/stderr.log | 1 - .../optional_dep_feature/stderr.term.svg | 26 ++ .../optional_dep_feature/stdout.log | 0 .../optional_dep_feature/stdout.term.svg | 20 ++ .../optional_dep_feature_formatting/mod.rs | 4 +- .../stderr.log | 2 - .../stderr.term.svg | 28 ++ .../stdout.log | 0 .../stdout.term.svg | 20 ++ .../cargo_remove/optional_feature/mod.rs | 4 +- .../cargo_remove/optional_feature/stderr.log | 1 - .../optional_feature/stderr.term.svg | 26 ++ .../cargo_remove/optional_feature/stdout.log | 0 .../optional_feature/stdout.term.svg | 20 ++ tests/testsuite/cargo_remove/package/mod.rs | 4 +- .../testsuite/cargo_remove/package/stderr.log | 1 - .../cargo_remove/package/stderr.term.svg | 26 ++ .../testsuite/cargo_remove/package/stdout.log | 0 .../cargo_remove/package/stdout.term.svg | 20 ++ .../cargo_remove/remove_basic/mod.rs | 4 +- .../cargo_remove/remove_basic/stderr.log | 1 - .../cargo_remove/remove_basic/stderr.term.svg | 26 ++ .../cargo_remove/remove_basic/stdout.log | 0 .../cargo_remove/remove_basic/stdout.term.svg | 20 ++ .../cargo_remove/skip_gc_glob_profile/mod.rs | 4 +- .../skip_gc_glob_profile/stderr.log | 1 - .../skip_gc_glob_profile/stderr.term.svg | 26 ++ .../skip_gc_glob_profile/stdout.log | 0 .../skip_gc_glob_profile/stdout.term.svg | 20 ++ tests/testsuite/cargo_remove/target/mod.rs | 4 +- .../testsuite/cargo_remove/target/stderr.log | 1 - .../cargo_remove/target/stderr.term.svg | 26 ++ .../testsuite/cargo_remove/target/stdout.log | 0 .../cargo_remove/target/stdout.term.svg | 20 ++ .../cargo_remove/target_build/mod.rs | 4 +- .../cargo_remove/target_build/stderr.log | 1 - .../cargo_remove/target_build/stderr.term.svg | 26 ++ .../cargo_remove/target_build/stdout.log | 0 .../cargo_remove/target_build/stdout.term.svg | 20 ++ .../testsuite/cargo_remove/target_dev/mod.rs | 4 +- .../cargo_remove/target_dev/stderr.log | 1 - .../cargo_remove/target_dev/stderr.term.svg | 26 ++ .../cargo_remove/target_dev/stdout.log | 0 .../cargo_remove/target_dev/stdout.term.svg | 20 ++ .../cargo_remove/update_lock_file/mod.rs | 4 +- .../cargo_remove/update_lock_file/stderr.log | 1 - .../update_lock_file/stderr.term.svg | 26 ++ .../cargo_remove/update_lock_file/stdout.log | 0 .../update_lock_file/stdout.term.svg | 20 ++ tests/testsuite/cargo_remove/workspace/mod.rs | 4 +- .../cargo_remove/workspace/stderr.log | 1 - .../cargo_remove/workspace/stderr.term.svg | 26 ++ .../cargo_remove/workspace/stdout.log | 0 .../cargo_remove/workspace/stdout.term.svg | 20 ++ .../cargo_remove/workspace_non_virtual/mod.rs | 4 +- .../workspace_non_virtual/stderr.log | 1 - .../workspace_non_virtual/stderr.term.svg | 26 ++ .../workspace_non_virtual/stdout.log | 0 .../workspace_non_virtual/stdout.term.svg | 20 ++ .../cargo_remove/workspace_preserved/mod.rs | 4 +- .../workspace_preserved/stderr.log | 1 - .../workspace_preserved/stderr.term.svg | 26 ++ .../workspace_preserved/stdout.log | 0 .../workspace_preserved/stdout.term.svg | 20 ++ tests/testsuite/cargo_report/help/mod.rs | 4 +- tests/testsuite/cargo_report/help/stderr.log | 0 .../cargo_report/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_report/help/stdout.log | 21 -- .../cargo_report/help/stdout.term.svg | 64 ++++ tests/testsuite/cargo_run/help/mod.rs | 4 +- tests/testsuite/cargo_run/help/stderr.log | 0 .../testsuite/cargo_run/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_run/help/stdout.log | 47 --- .../testsuite/cargo_run/help/stdout.term.svg | 116 +++++++ tests/testsuite/cargo_rustc/help/mod.rs | 4 +- tests/testsuite/cargo_rustc/help/stderr.log | 0 .../cargo_rustc/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_rustc/help/stdout.log | 58 ---- .../cargo_rustc/help/stdout.term.svg | 138 +++++++++ tests/testsuite/cargo_rustdoc/help/mod.rs | 4 +- tests/testsuite/cargo_rustdoc/help/stderr.log | 0 .../cargo_rustdoc/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_rustdoc/help/stdout.log | 57 ---- .../cargo_rustdoc/help/stdout.term.svg | 136 ++++++++ tests/testsuite/cargo_search/help/mod.rs | 4 +- tests/testsuite/cargo_search/help/stderr.log | 0 .../cargo_search/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_search/help/stdout.log | 24 -- .../cargo_search/help/stdout.term.svg | 70 +++++ tests/testsuite/cargo_test/help/mod.rs | 4 +- tests/testsuite/cargo_test/help/stderr.log | 0 .../testsuite/cargo_test/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_test/help/stdout.log | 63 ---- .../testsuite/cargo_test/help/stdout.term.svg | 148 +++++++++ .../testsuite/cargo_test/no_keep_going/mod.rs | 4 +- .../cargo_test/no_keep_going/stderr.log | 7 - .../cargo_test/no_keep_going/stderr.term.svg | 36 +++ .../cargo_test/no_keep_going/stdout.log | 0 .../cargo_test/no_keep_going/stdout.term.svg | 20 ++ tests/testsuite/cargo_tree/help/mod.rs | 4 +- tests/testsuite/cargo_tree/help/stderr.log | 0 .../testsuite/cargo_tree/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_tree/help/stdout.log | 45 --- .../testsuite/cargo_tree/help/stdout.term.svg | 112 +++++++ tests/testsuite/cargo_uninstall/help/mod.rs | 4 +- .../testsuite/cargo_uninstall/help/stderr.log | 0 .../cargo_uninstall/help/stderr.term.svg | 20 ++ .../testsuite/cargo_uninstall/help/stdout.log | 28 -- .../cargo_uninstall/help/stdout.term.svg | 78 +++++ tests/testsuite/cargo_update/help/mod.rs | 4 +- tests/testsuite/cargo_update/help/stderr.log | 0 .../cargo_update/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_update/help/stdout.log | 26 -- .../cargo_update/help/stdout.term.svg | 74 +++++ .../cargo_update/toolchain_pkgname/mod.rs | 4 +- .../cargo_update/toolchain_pkgname/stderr.log | 2 - .../toolchain_pkgname/stderr.term.svg | 28 ++ .../cargo_update/toolchain_pkgname/stdout.log | 0 .../toolchain_pkgname/stdout.term.svg | 20 ++ tests/testsuite/cargo_vendor/help/mod.rs | 4 +- tests/testsuite/cargo_vendor/help/stderr.log | 0 .../cargo_vendor/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_vendor/help/stdout.log | 27 -- .../cargo_vendor/help/stdout.term.svg | 76 +++++ .../cargo_verify_project/help/mod.rs | 4 +- .../cargo_verify_project/help/stderr.log | 0 .../cargo_verify_project/help/stderr.term.svg | 20 ++ .../cargo_verify_project/help/stdout.log | 19 -- .../cargo_verify_project/help/stdout.term.svg | 60 ++++ tests/testsuite/cargo_version/help/mod.rs | 4 +- tests/testsuite/cargo_version/help/stderr.log | 0 .../cargo_version/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_version/help/stdout.log | 18 -- .../cargo_version/help/stdout.term.svg | 58 ++++ tests/testsuite/cargo_yank/help/mod.rs | 4 +- tests/testsuite/cargo_yank/help/stderr.log | 0 .../testsuite/cargo_yank/help/stderr.term.svg | 20 ++ tests/testsuite/cargo_yank/help/stdout.log | 26 -- .../testsuite/cargo_yank/help/stdout.term.svg | 74 +++++ 1306 files changed, 16306 insertions(+), 2682 deletions(-) delete mode 100644 tests/testsuite/cargo/help/stderr.log create mode 100644 tests/testsuite/cargo/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo/help/stdout.log create mode 100644 tests/testsuite/cargo/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo/z_help/stderr.log create mode 100644 tests/testsuite/cargo/z_help/stderr.term.svg delete mode 100644 tests/testsuite/cargo/z_help/stdout.log create mode 100644 tests/testsuite/cargo/z_help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/add_basic/stderr.log create mode 100644 tests/testsuite/cargo_add/add_basic/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/add_basic/stdout.log create mode 100644 tests/testsuite/cargo_add/add_basic/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/add_multiple/stderr.log create mode 100644 tests/testsuite/cargo_add/add_multiple/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/add_multiple/stdout.log create mode 100644 tests/testsuite/cargo_add/add_multiple/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/add_normalized_name_external/stderr.log create mode 100644 tests/testsuite/cargo_add/add_normalized_name_external/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/add_normalized_name_external/stdout.log create mode 100644 tests/testsuite/cargo_add/add_normalized_name_external/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/add_toolchain/stderr.log create mode 100644 tests/testsuite/cargo_add/add_toolchain/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/add_toolchain/stdout.log create mode 100644 tests/testsuite/cargo_add/add_toolchain/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/build/stderr.log create mode 100644 tests/testsuite/cargo_add/build/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/build/stdout.log create mode 100644 tests/testsuite/cargo_add/build/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/build_prefer_existing_version/stderr.log create mode 100644 tests/testsuite/cargo_add/build_prefer_existing_version/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/build_prefer_existing_version/stdout.log create mode 100644 tests/testsuite/cargo_add/build_prefer_existing_version/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/change_rename_target/stderr.log create mode 100644 tests/testsuite/cargo_add/change_rename_target/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/change_rename_target/stdout.log create mode 100644 tests/testsuite/cargo_add/change_rename_target/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/cyclic_features/stderr.log create mode 100644 tests/testsuite/cargo_add/cyclic_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/cyclic_features/stdout.log create mode 100644 tests/testsuite/cargo_add/cyclic_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/default_features/stderr.log create mode 100644 tests/testsuite/cargo_add/default_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/default_features/stdout.log create mode 100644 tests/testsuite/cargo_add/default_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/deprecated_default_features/stderr.log create mode 100644 tests/testsuite/cargo_add/deprecated_default_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/deprecated_default_features/stdout.log create mode 100644 tests/testsuite/cargo_add/deprecated_default_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/deprecated_section/stderr.log create mode 100644 tests/testsuite/cargo_add/deprecated_section/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/deprecated_section/stdout.log create mode 100644 tests/testsuite/cargo_add/deprecated_section/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit/stderr.log create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit/stdout.log create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_features/stderr.log create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_features/stdout.log create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.log create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_optional/stdout.log create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_optional/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.log create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_public/stdout.log create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_public/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/dev/stderr.log create mode 100644 tests/testsuite/cargo_add/dev/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/dev/stdout.log create mode 100644 tests/testsuite/cargo_add/dev/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/dev_build_conflict/stderr.log create mode 100644 tests/testsuite/cargo_add/dev_build_conflict/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/dev_build_conflict/stdout.log create mode 100644 tests/testsuite/cargo_add/dev_build_conflict/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.log create mode 100644 tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/dev_prefer_existing_version/stdout.log create mode 100644 tests/testsuite/cargo_add/dev_prefer_existing_version/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/dry_run/stderr.log create mode 100644 tests/testsuite/cargo_add/dry_run/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/dry_run/stdout.log create mode 100644 tests/testsuite/cargo_add/dry_run/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/empty_dep_name/stderr.log create mode 100644 tests/testsuite/cargo_add/empty_dep_name/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/empty_dep_name/stdout.log create mode 100644 tests/testsuite/cargo_add/empty_dep_name/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/empty_dep_table/stderr.log create mode 100644 tests/testsuite/cargo_add/empty_dep_table/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/empty_dep_table/stdout.log create mode 100644 tests/testsuite/cargo_add/empty_dep_table/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/features/stderr.log create mode 100644 tests/testsuite/cargo_add/features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/features/stdout.log create mode 100644 tests/testsuite/cargo_add/features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/features_activated_over_limit/stderr.log create mode 100644 tests/testsuite/cargo_add/features_activated_over_limit/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/features_activated_over_limit/stdout.log create mode 100644 tests/testsuite/cargo_add/features_activated_over_limit/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.log create mode 100644 tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/features_deactivated_over_limit/stdout.log create mode 100644 tests/testsuite/cargo_add/features_deactivated_over_limit/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/features_empty/stderr.log create mode 100644 tests/testsuite/cargo_add/features_empty/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/features_empty/stdout.log create mode 100644 tests/testsuite/cargo_add/features_empty/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/features_multiple_occurrences/stderr.log create mode 100644 tests/testsuite/cargo_add/features_multiple_occurrences/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/features_multiple_occurrences/stdout.log create mode 100644 tests/testsuite/cargo_add/features_multiple_occurrences/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/features_preserve/stderr.log create mode 100644 tests/testsuite/cargo_add/features_preserve/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/features_preserve/stdout.log create mode 100644 tests/testsuite/cargo_add/features_preserve/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/features_spaced_values/stderr.log create mode 100644 tests/testsuite/cargo_add/features_spaced_values/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/features_spaced_values/stdout.log create mode 100644 tests/testsuite/cargo_add/features_spaced_values/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/features_unknown/stderr.log create mode 100644 tests/testsuite/cargo_add/features_unknown/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/features_unknown/stdout.log create mode 100644 tests/testsuite/cargo_add/features_unknown/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/features_unknown_no_features/stderr.log create mode 100644 tests/testsuite/cargo_add/features_unknown_no_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/features_unknown_no_features/stdout.log create mode 100644 tests/testsuite/cargo_add/features_unknown_no_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/git/stderr.log create mode 100644 tests/testsuite/cargo_add/git/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/git/stdout.log create mode 100644 tests/testsuite/cargo_add/git/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/git_branch/stderr.log create mode 100644 tests/testsuite/cargo_add/git_branch/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/git_branch/stdout.log create mode 100644 tests/testsuite/cargo_add/git_branch/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/git_conflicts_namever/stderr.log create mode 100644 tests/testsuite/cargo_add/git_conflicts_namever/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/git_conflicts_namever/stdout.log create mode 100644 tests/testsuite/cargo_add/git_conflicts_namever/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/git_dev/stderr.log create mode 100644 tests/testsuite/cargo_add/git_dev/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/git_dev/stdout.log create mode 100644 tests/testsuite/cargo_add/git_dev/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/git_inferred_name/stderr.log create mode 100644 tests/testsuite/cargo_add/git_inferred_name/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/git_inferred_name/stdout.log create mode 100644 tests/testsuite/cargo_add/git_inferred_name/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.log create mode 100644 tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/git_inferred_name_multiple/stdout.log create mode 100644 tests/testsuite/cargo_add/git_inferred_name_multiple/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/git_multiple_names/stderr.log create mode 100644 tests/testsuite/cargo_add/git_multiple_names/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/git_multiple_names/stdout.log create mode 100644 tests/testsuite/cargo_add/git_multiple_names/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/git_multiple_packages_features/stderr.log create mode 100644 tests/testsuite/cargo_add/git_multiple_packages_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/git_multiple_packages_features/stdout.log create mode 100644 tests/testsuite/cargo_add/git_multiple_packages_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/git_normalized_name/stderr.log create mode 100644 tests/testsuite/cargo_add/git_normalized_name/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/git_normalized_name/stdout.log create mode 100644 tests/testsuite/cargo_add/git_normalized_name/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/git_registry/stderr.log create mode 100644 tests/testsuite/cargo_add/git_registry/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/git_registry/stdout.log create mode 100644 tests/testsuite/cargo_add/git_registry/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/git_rev/stderr.log create mode 100644 tests/testsuite/cargo_add/git_rev/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/git_rev/stdout.log create mode 100644 tests/testsuite/cargo_add/git_rev/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/git_tag/stderr.log create mode 100644 tests/testsuite/cargo_add/git_tag/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/git_tag/stdout.log create mode 100644 tests/testsuite/cargo_add/git_tag/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/help/stderr.log create mode 100644 tests/testsuite/cargo_add/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/help/stdout.log create mode 100644 tests/testsuite/cargo_add/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/infer_prerelease/stderr.log create mode 100644 tests/testsuite/cargo_add/infer_prerelease/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/infer_prerelease/stdout.log create mode 100644 tests/testsuite/cargo_add/infer_prerelease/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_arg/stderr.log create mode 100644 tests/testsuite/cargo_add/invalid_arg/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_arg/stdout.log create mode 100644 tests/testsuite/cargo_add/invalid_arg/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_git_name/stderr.log create mode 100644 tests/testsuite/cargo_add/invalid_git_name/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_git_name/stdout.log create mode 100644 tests/testsuite/cargo_add/invalid_git_name/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_key_inherit_dependency/stderr.log create mode 100644 tests/testsuite/cargo_add/invalid_key_inherit_dependency/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_key_inherit_dependency/stdout.log create mode 100644 tests/testsuite/cargo_add/invalid_key_inherit_dependency/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stderr.log create mode 100644 tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stdout.log create mode 100644 tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stderr.log create mode 100644 tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stdout.log create mode 100644 tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_manifest/stderr.log create mode 100644 tests/testsuite/cargo_add/invalid_manifest/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_manifest/stdout.log create mode 100644 tests/testsuite/cargo_add/invalid_manifest/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_name_external/stderr.log create mode 100644 tests/testsuite/cargo_add/invalid_name_external/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_name_external/stdout.log create mode 100644 tests/testsuite/cargo_add/invalid_name_external/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_path/stderr.log create mode 100644 tests/testsuite/cargo_add/invalid_path/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_path/stdout.log create mode 100644 tests/testsuite/cargo_add/invalid_path/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_path_name/stderr.log create mode 100644 tests/testsuite/cargo_add/invalid_path_name/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_path_name/stdout.log create mode 100644 tests/testsuite/cargo_add/invalid_path_name/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_path_self/stderr.log create mode 100644 tests/testsuite/cargo_add/invalid_path_self/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_path_self/stdout.log create mode 100644 tests/testsuite/cargo_add/invalid_path_self/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_target_empty/stderr.log create mode 100644 tests/testsuite/cargo_add/invalid_target_empty/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_target_empty/stdout.log create mode 100644 tests/testsuite/cargo_add/invalid_target_empty/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_vers/stderr.log create mode 100644 tests/testsuite/cargo_add/invalid_vers/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/invalid_vers/stdout.log create mode 100644 tests/testsuite/cargo_add/invalid_vers/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/list_features/stderr.log create mode 100644 tests/testsuite/cargo_add/list_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/list_features/stdout.log create mode 100644 tests/testsuite/cargo_add/list_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/list_features_path/stderr.log create mode 100644 tests/testsuite/cargo_add/list_features_path/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/list_features_path/stdout.log create mode 100644 tests/testsuite/cargo_add/list_features_path/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/list_features_path_no_default/stderr.log create mode 100644 tests/testsuite/cargo_add/list_features_path_no_default/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/list_features_path_no_default/stdout.log create mode 100644 tests/testsuite/cargo_add/list_features_path_no_default/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/locked_changed/stderr.log create mode 100644 tests/testsuite/cargo_add/locked_changed/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/locked_changed/stdout.log create mode 100644 tests/testsuite/cargo_add/locked_changed/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/locked_unchanged/stderr.log create mode 100644 tests/testsuite/cargo_add/locked_unchanged/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/locked_unchanged/stdout.log create mode 100644 tests/testsuite/cargo_add/locked_unchanged/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/lockfile_updated/stderr.log create mode 100644 tests/testsuite/cargo_add/lockfile_updated/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/lockfile_updated/stdout.log create mode 100644 tests/testsuite/cargo_add/lockfile_updated/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/manifest_path_package/stderr.log create mode 100644 tests/testsuite/cargo_add/manifest_path_package/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/manifest_path_package/stdout.log create mode 100644 tests/testsuite/cargo_add/manifest_path_package/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/merge_activated_features/stderr.log create mode 100644 tests/testsuite/cargo_add/merge_activated_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/merge_activated_features/stdout.log create mode 100644 tests/testsuite/cargo_add/merge_activated_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.log create mode 100644 tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/multiple_conflicts_with_features/stdout.log create mode 100644 tests/testsuite/cargo_add/multiple_conflicts_with_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/multiple_conflicts_with_rename/stderr.log create mode 100644 tests/testsuite/cargo_add/multiple_conflicts_with_rename/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/multiple_conflicts_with_rename/stdout.log create mode 100644 tests/testsuite/cargo_add/multiple_conflicts_with_rename/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/namever/stderr.log create mode 100644 tests/testsuite/cargo_add/namever/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/namever/stdout.log create mode 100644 tests/testsuite/cargo_add/namever/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/no_args/stderr.log create mode 100644 tests/testsuite/cargo_add/no_args/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/no_args/stdout.log create mode 100644 tests/testsuite/cargo_add/no_args/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/no_default_features/stderr.log create mode 100644 tests/testsuite/cargo_add/no_default_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/no_default_features/stdout.log create mode 100644 tests/testsuite/cargo_add/no_default_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/no_optional/stderr.log create mode 100644 tests/testsuite/cargo_add/no_optional/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/no_optional/stdout.log create mode 100644 tests/testsuite/cargo_add/no_optional/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/no_public/stderr.log create mode 100644 tests/testsuite/cargo_add/no_public/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/no_public/stdout.log create mode 100644 tests/testsuite/cargo_add/no_public/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/offline_empty_cache/stderr.log create mode 100644 tests/testsuite/cargo_add/offline_empty_cache/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/offline_empty_cache/stdout.log create mode 100644 tests/testsuite/cargo_add/offline_empty_cache/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/optional/stderr.log create mode 100644 tests/testsuite/cargo_add/optional/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/optional/stdout.log create mode 100644 tests/testsuite/cargo_add/optional/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_default_features/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_default_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_default_features/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_default_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_features/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_features/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_git_with_path/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_git_with_path/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_git_with_path/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_git_with_path/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_inherit_features_noop/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_inherit_features_noop/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_inherit_noop/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_inherit_noop/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_inline_features/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_inline_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_inline_features/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_inline_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_name_dev_noop/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_name_dev_noop/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_name_noop/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_name_noop/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_name_noop/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_name_noop/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_no_default_features/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_no_default_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_no_default_features/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_no_default_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_no_optional/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_no_optional/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_no_optional/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_no_optional/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_no_public/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_no_public/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_no_public/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_no_public/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_no_public_with_public/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_no_public_with_public/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_optional/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_optional/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_optional/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_optional/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_optional_with_optional/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_optional_with_optional/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_path_noop/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_path_noop/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_path_noop/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_path_noop/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_path_with_version/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_path_with_version/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_path_with_version/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_path_with_version/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_preserves_inline_table/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_preserves_inline_table/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_public/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_public/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_public/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_public/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_public_with_no_public/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_public_with_no_public/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_rename/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_rename/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_version_with_git/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_version_with_git/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_version_with_git/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_version_with_git/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_version_with_path/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_version_with_path/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_version_with_path/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_version_with_path/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_with_rename/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_with_rename/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_with_rename/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_with_rename/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_workspace_dep/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_workspace_dep/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_workspace_dep_features/stderr.log create mode 100644 tests/testsuite/cargo_add/overwrite_workspace_dep_features/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/overwrite_workspace_dep_features/stdout.log create mode 100644 tests/testsuite/cargo_add/overwrite_workspace_dep_features/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/path/stderr.log create mode 100644 tests/testsuite/cargo_add/path/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/path/stdout.log create mode 100644 tests/testsuite/cargo_add/path/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/path_dev/stderr.log create mode 100644 tests/testsuite/cargo_add/path_dev/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/path_dev/stdout.log create mode 100644 tests/testsuite/cargo_add/path_dev/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/path_inferred_name/stderr.log create mode 100644 tests/testsuite/cargo_add/path_inferred_name/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/path_inferred_name/stdout.log create mode 100644 tests/testsuite/cargo_add/path_inferred_name/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stderr.log create mode 100644 tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stdout.log create mode 100644 tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/path_normalized_name/stderr.log create mode 100644 tests/testsuite/cargo_add/path_normalized_name/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/path_normalized_name/stdout.log create mode 100644 tests/testsuite/cargo_add/path_normalized_name/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/preserve_dep_std_table/stderr.log create mode 100644 tests/testsuite/cargo_add/preserve_dep_std_table/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/preserve_dep_std_table/stdout.log create mode 100644 tests/testsuite/cargo_add/preserve_dep_std_table/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/preserve_features_table/stderr.log create mode 100644 tests/testsuite/cargo_add/preserve_features_table/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/preserve_features_table/stdout.log create mode 100644 tests/testsuite/cargo_add/preserve_features_table/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/preserve_sorted/stderr.log create mode 100644 tests/testsuite/cargo_add/preserve_sorted/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/preserve_sorted/stdout.log create mode 100644 tests/testsuite/cargo_add/preserve_sorted/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/preserve_unsorted/stderr.log create mode 100644 tests/testsuite/cargo_add/preserve_unsorted/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/preserve_unsorted/stdout.log create mode 100644 tests/testsuite/cargo_add/preserve_unsorted/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/public/stderr.log create mode 100644 tests/testsuite/cargo_add/public/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/public/stdout.log create mode 100644 tests/testsuite/cargo_add/public/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/quiet/stderr.log create mode 100644 tests/testsuite/cargo_add/quiet/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/quiet/stdout.log create mode 100644 tests/testsuite/cargo_add/quiet/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/registry/stderr.log create mode 100644 tests/testsuite/cargo_add/registry/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/registry/stdout.log create mode 100644 tests/testsuite/cargo_add/registry/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/rename/stderr.log create mode 100644 tests/testsuite/cargo_add/rename/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/rename/stdout.log create mode 100644 tests/testsuite/cargo_add/rename/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/require_weak/stderr.log create mode 100644 tests/testsuite/cargo_add/require_weak/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/require_weak/stdout.log create mode 100644 tests/testsuite/cargo_add/require_weak/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/rust_version_ignore/stderr.log create mode 100644 tests/testsuite/cargo_add/rust_version_ignore/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/rust_version_ignore/stdout.log create mode 100644 tests/testsuite/cargo_add/rust_version_ignore/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/rust_version_incompatible/stderr.log create mode 100644 tests/testsuite/cargo_add/rust_version_incompatible/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/rust_version_incompatible/stdout.log create mode 100644 tests/testsuite/cargo_add/rust_version_incompatible/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/rust_version_latest/stderr.log create mode 100644 tests/testsuite/cargo_add/rust_version_latest/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/rust_version_latest/stdout.log create mode 100644 tests/testsuite/cargo_add/rust_version_latest/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/rust_version_older/stderr.log create mode 100644 tests/testsuite/cargo_add/rust_version_older/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/rust_version_older/stdout.log create mode 100644 tests/testsuite/cargo_add/rust_version_older/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.log create mode 100644 tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/sorted_table_with_dotted_item/stdout.log create mode 100644 tests/testsuite/cargo_add/sorted_table_with_dotted_item/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/target/stderr.log create mode 100644 tests/testsuite/cargo_add/target/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/target/stdout.log create mode 100644 tests/testsuite/cargo_add/target/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/target_cfg/stderr.log create mode 100644 tests/testsuite/cargo_add/target_cfg/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/target_cfg/stdout.log create mode 100644 tests/testsuite/cargo_add/target_cfg/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/unknown_inherited_feature/stderr.log create mode 100644 tests/testsuite/cargo_add/unknown_inherited_feature/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/unknown_inherited_feature/stdout.log create mode 100644 tests/testsuite/cargo_add/unknown_inherited_feature/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/vers/stderr.log create mode 100644 tests/testsuite/cargo_add/vers/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/vers/stdout.log create mode 100644 tests/testsuite/cargo_add/vers/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/workspace_name/stderr.log create mode 100644 tests/testsuite/cargo_add/workspace_name/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/workspace_name/stdout.log create mode 100644 tests/testsuite/cargo_add/workspace_name/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/workspace_path/stderr.log create mode 100644 tests/testsuite/cargo_add/workspace_path/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/workspace_path/stdout.log create mode 100644 tests/testsuite/cargo_add/workspace_path/stdout.term.svg delete mode 100644 tests/testsuite/cargo_add/workspace_path_dev/stderr.log create mode 100644 tests/testsuite/cargo_add/workspace_path_dev/stderr.term.svg delete mode 100644 tests/testsuite/cargo_add/workspace_path_dev/stdout.log create mode 100644 tests/testsuite/cargo_add/workspace_path_dev/stdout.term.svg delete mode 100644 tests/testsuite/cargo_bench/help/stderr.log create mode 100644 tests/testsuite/cargo_bench/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_bench/help/stdout.log create mode 100644 tests/testsuite/cargo_bench/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_bench/no_keep_going/stderr.log create mode 100644 tests/testsuite/cargo_bench/no_keep_going/stderr.term.svg delete mode 100644 tests/testsuite/cargo_bench/no_keep_going/stdout.log create mode 100644 tests/testsuite/cargo_bench/no_keep_going/stdout.term.svg delete mode 100644 tests/testsuite/cargo_build/help/stderr.log create mode 100644 tests/testsuite/cargo_build/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_build/help/stdout.log create mode 100644 tests/testsuite/cargo_build/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_check/help/stderr.log create mode 100644 tests/testsuite/cargo_check/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_check/help/stdout.log create mode 100644 tests/testsuite/cargo_check/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_clean/help/stderr.log create mode 100644 tests/testsuite/cargo_clean/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_clean/help/stdout.log create mode 100644 tests/testsuite/cargo_clean/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_config/help/stderr.log create mode 100644 tests/testsuite/cargo_config/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_config/help/stdout.log create mode 100644 tests/testsuite/cargo_config/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_doc/help/stderr.log create mode 100644 tests/testsuite/cargo_doc/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_doc/help/stdout.log create mode 100644 tests/testsuite/cargo_doc/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_fetch/help/stderr.log create mode 100644 tests/testsuite/cargo_fetch/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_fetch/help/stdout.log create mode 100644 tests/testsuite/cargo_fetch/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_fix/help/stderr.log create mode 100644 tests/testsuite/cargo_fix/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_fix/help/stdout.log create mode 100644 tests/testsuite/cargo_fix/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_generate_lockfile/help/stderr.log create mode 100644 tests/testsuite/cargo_generate_lockfile/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_generate_lockfile/help/stdout.log create mode 100644 tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_git_checkout/help/stderr.log create mode 100644 tests/testsuite/cargo_git_checkout/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_git_checkout/help/stdout.log create mode 100644 tests/testsuite/cargo_git_checkout/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_help/help/stderr.log create mode 100644 tests/testsuite/cargo_help/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_help/help/stdout.log create mode 100644 tests/testsuite/cargo_help/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/auto_git/stderr.log create mode 100644 tests/testsuite/cargo_init/auto_git/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/auto_git/stdout.log create mode 100644 tests/testsuite/cargo_init/auto_git/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.log create mode 100644 tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_explicit/stdout.log create mode 100644 tests/testsuite/cargo_init/bin_already_exists_explicit/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.log create mode 100644 tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stdout.log create mode 100644 tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.log create mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit/stdout.log create mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.log create mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stdout.log create mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.log create mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stdout.log create mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.log create mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stdout.log create mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/both_lib_and_bin/stderr.log create mode 100644 tests/testsuite/cargo_init/both_lib_and_bin/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/both_lib_and_bin/stdout.log create mode 100644 tests/testsuite/cargo_init/both_lib_and_bin/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.log create mode 100644 tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stdout.log create mode 100644 tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.log create mode 100644 tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/confused_by_multiple_lib_files/stdout.log create mode 100644 tests/testsuite/cargo_init/confused_by_multiple_lib_files/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.log create mode 100644 tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stdout.log create mode 100644 tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.log create mode 100644 tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stdout.log create mode 100644 tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.log create mode 100644 tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stdout.log create mode 100644 tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/explicit_bin_with_git/stderr.log create mode 100644 tests/testsuite/cargo_init/explicit_bin_with_git/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/explicit_bin_with_git/stdout.log create mode 100644 tests/testsuite/cargo_init/explicit_bin_with_git/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/formats_source/stderr.log create mode 100644 tests/testsuite/cargo_init/formats_source/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/formats_source/stdout.log create mode 100644 tests/testsuite/cargo_init/formats_source/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/fossil_autodetect/stderr.log create mode 100644 tests/testsuite/cargo_init/fossil_autodetect/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/fossil_autodetect/stdout.log create mode 100644 tests/testsuite/cargo_init/fossil_autodetect/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/git_autodetect/stderr.log create mode 100644 tests/testsuite/cargo_init/git_autodetect/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/git_autodetect/stdout.log create mode 100644 tests/testsuite/cargo_init/git_autodetect/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.log create mode 100644 tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stdout.log create mode 100644 tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/help/stderr.log create mode 100644 tests/testsuite/cargo_init/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/help/stdout.log create mode 100644 tests/testsuite/cargo_init/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.log create mode 100644 tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/ignores_failure_to_format_source/stdout.log create mode 100644 tests/testsuite/cargo_init/ignores_failure_to_format_source/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/inferred_bin_with_git/stderr.log create mode 100644 tests/testsuite/cargo_init/inferred_bin_with_git/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/inferred_bin_with_git/stdout.log create mode 100644 tests/testsuite/cargo_init/inferred_bin_with_git/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/inferred_lib_with_git/stderr.log create mode 100644 tests/testsuite/cargo_init/inferred_lib_with_git/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/inferred_lib_with_git/stdout.log create mode 100644 tests/testsuite/cargo_init/inferred_lib_with_git/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.log create mode 100644 tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/inherit_workspace_package_table/stdout.log create mode 100644 tests/testsuite/cargo_init/inherit_workspace_package_table/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/invalid_dir_name/stderr.log create mode 100644 tests/testsuite/cargo_init/invalid_dir_name/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/invalid_dir_name/stdout.log create mode 100644 tests/testsuite/cargo_init/invalid_dir_name/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.log create mode 100644 tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/lib_already_exists_nosrc/stdout.log create mode 100644 tests/testsuite/cargo_init/lib_already_exists_nosrc/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/lib_already_exists_src/stderr.log create mode 100644 tests/testsuite/cargo_init/lib_already_exists_src/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/lib_already_exists_src/stdout.log create mode 100644 tests/testsuite/cargo_init/lib_already_exists_src/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/mercurial_autodetect/stderr.log create mode 100644 tests/testsuite/cargo_init/mercurial_autodetect/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/mercurial_autodetect/stdout.log create mode 100644 tests/testsuite/cargo_init/mercurial_autodetect/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/multibin_project_name_clash/stderr.log create mode 100644 tests/testsuite/cargo_init/multibin_project_name_clash/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/multibin_project_name_clash/stdout.log create mode 100644 tests/testsuite/cargo_init/multibin_project_name_clash/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/no_filename/stderr.log create mode 100644 tests/testsuite/cargo_init/no_filename/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/no_filename/stdout.log create mode 100644 tests/testsuite/cargo_init/no_filename/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/path_contains_separator/stderr.log create mode 100644 tests/testsuite/cargo_init/path_contains_separator/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/path_contains_separator/stdout.log create mode 100644 tests/testsuite/cargo_init/path_contains_separator/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/pijul_autodetect/stderr.log create mode 100644 tests/testsuite/cargo_init/pijul_autodetect/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/pijul_autodetect/stdout.log create mode 100644 tests/testsuite/cargo_init/pijul_autodetect/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/reserved_name/stderr.log create mode 100644 tests/testsuite/cargo_init/reserved_name/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/reserved_name/stdout.log create mode 100644 tests/testsuite/cargo_init/reserved_name/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/simple_bin/stderr.log create mode 100644 tests/testsuite/cargo_init/simple_bin/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/simple_bin/stdout.log create mode 100644 tests/testsuite/cargo_init/simple_bin/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/simple_git/stderr.log create mode 100644 tests/testsuite/cargo_init/simple_git/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/simple_git/stdout.log create mode 100644 tests/testsuite/cargo_init/simple_git/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.log create mode 100644 tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/simple_git_ignore_exists/stdout.log create mode 100644 tests/testsuite/cargo_init/simple_git_ignore_exists/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/simple_hg/stderr.log delete mode 100644 tests/testsuite/cargo_init/simple_hg/stdout.log delete mode 100644 tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.log create mode 100644 tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/simple_hg_ignore_exists/stdout.log create mode 100644 tests/testsuite/cargo_init/simple_hg_ignore_exists/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/simple_lib/stderr.log create mode 100644 tests/testsuite/cargo_init/simple_lib/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/simple_lib/stdout.log create mode 100644 tests/testsuite/cargo_init/simple_lib/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/unknown_flags/stderr.log create mode 100644 tests/testsuite/cargo_init/unknown_flags/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/unknown_flags/stdout.log create mode 100644 tests/testsuite/cargo_init/unknown_flags/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/with_argument/stderr.log create mode 100644 tests/testsuite/cargo_init/with_argument/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/with_argument/stdout.log create mode 100644 tests/testsuite/cargo_init/with_argument/stdout.term.svg delete mode 100644 tests/testsuite/cargo_init/workspace_add_member/stderr.log create mode 100644 tests/testsuite/cargo_init/workspace_add_member/stderr.term.svg delete mode 100644 tests/testsuite/cargo_init/workspace_add_member/stdout.log create mode 100644 tests/testsuite/cargo_init/workspace_add_member/stdout.term.svg delete mode 100644 tests/testsuite/cargo_install/help/stderr.log create mode 100644 tests/testsuite/cargo_install/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_install/help/stdout.log create mode 100644 tests/testsuite/cargo_install/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_locate_project/help/stderr.log create mode 100644 tests/testsuite/cargo_locate_project/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_locate_project/help/stdout.log create mode 100644 tests/testsuite/cargo_locate_project/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_login/help/stderr.log create mode 100644 tests/testsuite/cargo_login/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_login/help/stdout.log create mode 100644 tests/testsuite/cargo_login/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_logout/help/stderr.log create mode 100644 tests/testsuite/cargo_logout/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_logout/help/stdout.log create mode 100644 tests/testsuite/cargo_logout/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_metadata/help/stderr.log create mode 100644 tests/testsuite/cargo_metadata/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_metadata/help/stdout.log create mode 100644 tests/testsuite/cargo_metadata/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_non_workspace/stderr.log create mode 100644 tests/testsuite/cargo_new/add_members_to_non_workspace/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_non_workspace/stdout.log create mode 100644 tests/testsuite/cargo_new/add_members_to_non_workspace/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stderr.log create mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stdout.log create mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stderr.log create mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stdout.log create mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stderr.log create mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stdout.log create mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stderr.log create mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stdout.log create mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stderr.log create mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stdout.log create mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stderr.log create mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stdout.log create mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_without_members/stderr.log create mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_without_members/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_without_members/stdout.log create mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_without_members/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/empty_name/stderr.log create mode 100644 tests/testsuite/cargo_new/empty_name/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/empty_name/stdout.log create mode 100644 tests/testsuite/cargo_new/empty_name/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/help/stderr.log create mode 100644 tests/testsuite/cargo_new/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/help/stdout.log create mode 100644 tests/testsuite/cargo_new/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_lints/stderr.log create mode 100644 tests/testsuite/cargo_new/inherit_workspace_lints/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_lints/stdout.log create mode 100644 tests/testsuite/cargo_new/inherit_workspace_lints/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table/stderr.log create mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table/stdout.log create mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stderr.log create mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stdout.log create mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stderr.log create mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stdout.log create mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stderr.log create mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stdout.log create mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stdout.term.svg delete mode 100644 tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.log create mode 100644 tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.term.svg delete mode 100644 tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stdout.log create mode 100644 tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stdout.term.svg delete mode 100644 tests/testsuite/cargo_owner/help/stderr.log create mode 100644 tests/testsuite/cargo_owner/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_owner/help/stdout.log create mode 100644 tests/testsuite/cargo_owner/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_package/help/stderr.log create mode 100644 tests/testsuite/cargo_package/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_package/help/stdout.log create mode 100644 tests/testsuite/cargo_package/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_pkgid/help/stderr.log create mode 100644 tests/testsuite/cargo_pkgid/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_pkgid/help/stdout.log create mode 100644 tests/testsuite/cargo_pkgid/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_publish/help/stderr.log create mode 100644 tests/testsuite/cargo_publish/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_publish/help/stdout.log create mode 100644 tests/testsuite/cargo_publish/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_read_manifest/help/stderr.log create mode 100644 tests/testsuite/cargo_read_manifest/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_read_manifest/help/stdout.log create mode 100644 tests/testsuite/cargo_read_manifest/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/avoid_empty_tables/stderr.log create mode 100644 tests/testsuite/cargo_remove/avoid_empty_tables/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/avoid_empty_tables/stdout.log create mode 100644 tests/testsuite/cargo_remove/avoid_empty_tables/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/build/stderr.log create mode 100644 tests/testsuite/cargo_remove/build/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/build/stdout.log create mode 100644 tests/testsuite/cargo_remove/build/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/dev/stderr.log create mode 100644 tests/testsuite/cargo_remove/dev/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/dev/stdout.log create mode 100644 tests/testsuite/cargo_remove/dev/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/dry_run/stderr.log create mode 100644 tests/testsuite/cargo_remove/dry_run/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/dry_run/stdout.log create mode 100644 tests/testsuite/cargo_remove/dry_run/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/gc_keep_used_patch/stderr.log create mode 100644 tests/testsuite/cargo_remove/gc_keep_used_patch/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/gc_keep_used_patch/stdout.log create mode 100644 tests/testsuite/cargo_remove/gc_keep_used_patch/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/gc_patch/stderr.log create mode 100644 tests/testsuite/cargo_remove/gc_patch/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/gc_patch/stdout.log create mode 100644 tests/testsuite/cargo_remove/gc_patch/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/gc_profile/stderr.log create mode 100644 tests/testsuite/cargo_remove/gc_profile/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/gc_profile/stdout.log create mode 100644 tests/testsuite/cargo_remove/gc_profile/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/gc_replace/stderr.log create mode 100644 tests/testsuite/cargo_remove/gc_replace/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/gc_replace/stdout.log create mode 100644 tests/testsuite/cargo_remove/gc_replace/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/help/stderr.log create mode 100644 tests/testsuite/cargo_remove/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/help/stdout.log create mode 100644 tests/testsuite/cargo_remove/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_arg/stderr.log create mode 100644 tests/testsuite/cargo_remove/invalid_arg/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_arg/stdout.log create mode 100644 tests/testsuite/cargo_remove/invalid_arg/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_dep/stderr.log create mode 100644 tests/testsuite/cargo_remove/invalid_dep/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_dep/stdout.log create mode 100644 tests/testsuite/cargo_remove/invalid_dep/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_package/stderr.log create mode 100644 tests/testsuite/cargo_remove/invalid_package/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_package/stdout.log create mode 100644 tests/testsuite/cargo_remove/invalid_package/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_package_multiple/stderr.log create mode 100644 tests/testsuite/cargo_remove/invalid_package_multiple/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_package_multiple/stdout.log create mode 100644 tests/testsuite/cargo_remove/invalid_package_multiple/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_section/stderr.log create mode 100644 tests/testsuite/cargo_remove/invalid_section/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_section/stdout.log create mode 100644 tests/testsuite/cargo_remove/invalid_section/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_section_dep/stderr.log create mode 100644 tests/testsuite/cargo_remove/invalid_section_dep/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_section_dep/stdout.log create mode 100644 tests/testsuite/cargo_remove/invalid_section_dep/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_target/stderr.log create mode 100644 tests/testsuite/cargo_remove/invalid_target/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_target/stdout.log create mode 100644 tests/testsuite/cargo_remove/invalid_target/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_target_dep/stderr.log create mode 100644 tests/testsuite/cargo_remove/invalid_target_dep/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/invalid_target_dep/stdout.log create mode 100644 tests/testsuite/cargo_remove/invalid_target_dep/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/multiple_deps/stderr.log create mode 100644 tests/testsuite/cargo_remove/multiple_deps/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/multiple_deps/stdout.log create mode 100644 tests/testsuite/cargo_remove/multiple_deps/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/multiple_dev/stderr.log create mode 100644 tests/testsuite/cargo_remove/multiple_dev/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/multiple_dev/stdout.log create mode 100644 tests/testsuite/cargo_remove/multiple_dev/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/no_arg/stderr.log create mode 100644 tests/testsuite/cargo_remove/no_arg/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/no_arg/stdout.log create mode 100644 tests/testsuite/cargo_remove/no_arg/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/offline/stderr.log create mode 100644 tests/testsuite/cargo_remove/offline/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/offline/stdout.log create mode 100644 tests/testsuite/cargo_remove/offline/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/optional_dep_feature/stderr.log create mode 100644 tests/testsuite/cargo_remove/optional_dep_feature/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/optional_dep_feature/stdout.log create mode 100644 tests/testsuite/cargo_remove/optional_dep_feature/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/optional_dep_feature_formatting/stderr.log create mode 100644 tests/testsuite/cargo_remove/optional_dep_feature_formatting/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/optional_dep_feature_formatting/stdout.log create mode 100644 tests/testsuite/cargo_remove/optional_dep_feature_formatting/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/optional_feature/stderr.log create mode 100644 tests/testsuite/cargo_remove/optional_feature/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/optional_feature/stdout.log create mode 100644 tests/testsuite/cargo_remove/optional_feature/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/package/stderr.log create mode 100644 tests/testsuite/cargo_remove/package/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/package/stdout.log create mode 100644 tests/testsuite/cargo_remove/package/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/remove_basic/stderr.log create mode 100644 tests/testsuite/cargo_remove/remove_basic/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/remove_basic/stdout.log create mode 100644 tests/testsuite/cargo_remove/remove_basic/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/skip_gc_glob_profile/stderr.log create mode 100644 tests/testsuite/cargo_remove/skip_gc_glob_profile/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/skip_gc_glob_profile/stdout.log create mode 100644 tests/testsuite/cargo_remove/skip_gc_glob_profile/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/target/stderr.log create mode 100644 tests/testsuite/cargo_remove/target/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/target/stdout.log create mode 100644 tests/testsuite/cargo_remove/target/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/target_build/stderr.log create mode 100644 tests/testsuite/cargo_remove/target_build/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/target_build/stdout.log create mode 100644 tests/testsuite/cargo_remove/target_build/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/target_dev/stderr.log create mode 100644 tests/testsuite/cargo_remove/target_dev/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/target_dev/stdout.log create mode 100644 tests/testsuite/cargo_remove/target_dev/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/update_lock_file/stderr.log create mode 100644 tests/testsuite/cargo_remove/update_lock_file/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/update_lock_file/stdout.log create mode 100644 tests/testsuite/cargo_remove/update_lock_file/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/workspace/stderr.log create mode 100644 tests/testsuite/cargo_remove/workspace/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/workspace/stdout.log create mode 100644 tests/testsuite/cargo_remove/workspace/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/workspace_non_virtual/stderr.log create mode 100644 tests/testsuite/cargo_remove/workspace_non_virtual/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/workspace_non_virtual/stdout.log create mode 100644 tests/testsuite/cargo_remove/workspace_non_virtual/stdout.term.svg delete mode 100644 tests/testsuite/cargo_remove/workspace_preserved/stderr.log create mode 100644 tests/testsuite/cargo_remove/workspace_preserved/stderr.term.svg delete mode 100644 tests/testsuite/cargo_remove/workspace_preserved/stdout.log create mode 100644 tests/testsuite/cargo_remove/workspace_preserved/stdout.term.svg delete mode 100644 tests/testsuite/cargo_report/help/stderr.log create mode 100644 tests/testsuite/cargo_report/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_report/help/stdout.log create mode 100644 tests/testsuite/cargo_report/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_run/help/stderr.log create mode 100644 tests/testsuite/cargo_run/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_run/help/stdout.log create mode 100644 tests/testsuite/cargo_run/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_rustc/help/stderr.log create mode 100644 tests/testsuite/cargo_rustc/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_rustc/help/stdout.log create mode 100644 tests/testsuite/cargo_rustc/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_rustdoc/help/stderr.log create mode 100644 tests/testsuite/cargo_rustdoc/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_rustdoc/help/stdout.log create mode 100644 tests/testsuite/cargo_rustdoc/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_search/help/stderr.log create mode 100644 tests/testsuite/cargo_search/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_search/help/stdout.log create mode 100644 tests/testsuite/cargo_search/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_test/help/stderr.log create mode 100644 tests/testsuite/cargo_test/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_test/help/stdout.log create mode 100644 tests/testsuite/cargo_test/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_test/no_keep_going/stderr.log create mode 100644 tests/testsuite/cargo_test/no_keep_going/stderr.term.svg delete mode 100644 tests/testsuite/cargo_test/no_keep_going/stdout.log create mode 100644 tests/testsuite/cargo_test/no_keep_going/stdout.term.svg delete mode 100644 tests/testsuite/cargo_tree/help/stderr.log create mode 100644 tests/testsuite/cargo_tree/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_tree/help/stdout.log create mode 100644 tests/testsuite/cargo_tree/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_uninstall/help/stderr.log create mode 100644 tests/testsuite/cargo_uninstall/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_uninstall/help/stdout.log create mode 100644 tests/testsuite/cargo_uninstall/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_update/help/stderr.log create mode 100644 tests/testsuite/cargo_update/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_update/help/stdout.log create mode 100644 tests/testsuite/cargo_update/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_update/toolchain_pkgname/stderr.log create mode 100644 tests/testsuite/cargo_update/toolchain_pkgname/stderr.term.svg delete mode 100644 tests/testsuite/cargo_update/toolchain_pkgname/stdout.log create mode 100644 tests/testsuite/cargo_update/toolchain_pkgname/stdout.term.svg delete mode 100644 tests/testsuite/cargo_vendor/help/stderr.log create mode 100644 tests/testsuite/cargo_vendor/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_vendor/help/stdout.log create mode 100644 tests/testsuite/cargo_vendor/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_verify_project/help/stderr.log create mode 100644 tests/testsuite/cargo_verify_project/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_verify_project/help/stdout.log create mode 100644 tests/testsuite/cargo_verify_project/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_version/help/stderr.log create mode 100644 tests/testsuite/cargo_version/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_version/help/stdout.log create mode 100644 tests/testsuite/cargo_version/help/stdout.term.svg delete mode 100644 tests/testsuite/cargo_yank/help/stderr.log create mode 100644 tests/testsuite/cargo_yank/help/stderr.term.svg delete mode 100644 tests/testsuite/cargo_yank/help/stdout.log create mode 100644 tests/testsuite/cargo_yank/help/stdout.term.svg diff --git a/Cargo.lock b/Cargo.lock index 4bdf380562cd..b87d6526e0be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -71,6 +71,15 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +[[package]] +name = "anstyle-lossy" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9a0444767dbd4aea9355cb47a370eb184dbfe918875e127eff52cb9d1638181" +dependencies = [ + "anstyle", +] + [[package]] name = "anstyle-parse" version = "0.2.3" @@ -89,6 +98,19 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "anstyle-svg" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "260f87e06c0385c28fcc2ed67a734b45fffbc92104697b7e783233e7452cd471" +dependencies = [ + "anstream", + "anstyle", + "anstyle-lossy", + "html-escape", + "unicode-width", +] + [[package]] name = "anstyle-wincon" version = "3.0.2" @@ -1913,6 +1935,15 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "html-escape" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" +dependencies = [ + "utf8-width", +] + [[package]] name = "http-auth" version = "0.1.9" @@ -3132,17 +3163,19 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "snapbox" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8269b717f21b142c0377f1e617e80999e3ef6b1c010959b44fd93320722d2cba" +checksum = "01b39b2f26e1a77359a9beb06be7bf97bd6b8296e4f86b639e6acaa9149a89b6" dependencies = [ "anstream", "anstyle", + "anstyle-svg", "content_inspector", "dunce", "escargot", "filetime", "normalize-line-endings", + "serde_json", "similar", "snapbox-macros", "tempfile", @@ -3530,6 +3563,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf8-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + [[package]] name = "utf8parse" version = "0.2.1" diff --git a/Cargo.toml b/Cargo.toml index 2727786fb1fa..b7dfddcae2f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,7 +91,7 @@ sha1 = "0.10.6" sha2 = "0.10.8" shell-escape = "0.1.5" supports-hyperlinks = "2.1.0" -snapbox = { version = "0.5.0", features = ["diff", "path"] } +snapbox = { version = "0.5.2", features = ["diff", "path", "term-svg"] } tar = { version = "0.4.40", default-features = false } tempfile = "3.9.0" thiserror = "1.0.56" diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs index 184f79916a6d..1b7f68041f26 100644 --- a/crates/cargo-test-support/src/lib.rs +++ b/crates/cargo-test-support/src/lib.rs @@ -1320,6 +1320,7 @@ impl CargoCommand for snapbox::cmd::Command { fn cargo_ui() -> Self { Self::new(cargo_exe()) .with_assert(compare::assert_ui()) + .env("CARGO_TERM_COLOR", "always") .test_env() } } diff --git a/tests/testsuite/cargo/help/mod.rs b/tests/testsuite/cargo/help/mod.rs index fcf53c959754..f51a9a5b4eea 100644 --- a/tests/testsuite/cargo/help/mod.rs +++ b/tests/testsuite/cargo/help/mod.rs @@ -7,6 +7,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo/help/stderr.log b/tests/testsuite/cargo/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo/help/stderr.term.svg b/tests/testsuite/cargo/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo/help/stdout.log b/tests/testsuite/cargo/help/stdout.log deleted file mode 100644 index e4b28056401a..000000000000 --- a/tests/testsuite/cargo/help/stdout.log +++ /dev/null @@ -1,40 +0,0 @@ -Rust's package manager - -Usage: cargo [..][OPTIONS] [COMMAND] - cargo [..][OPTIONS] -Zscript [ARGS]... - -Options: - -V, --version Print version info and exit - --list List installed commands - --explain Provide a detailed explanation of a rustc error message - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - -C Change to DIRECTORY before doing anything (nightly-only) - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Commands: - build, b Compile the current package - check, c Analyze the current package and report errors, but don't build object files - clean Remove the target directory - doc, d Build this package's and its dependencies' documentation - new Create a new cargo package - init Create a new cargo package in an existing directory - add Add dependencies to a manifest file - remove Remove dependencies from a manifest file - run, r Run a binary or example of the local package - test, t Run the tests - bench Run the benchmarks - update Update dependencies listed in Cargo.lock - search Search registry for crates - publish Package and upload this package to the registry - install Install a Rust binary - uninstall Uninstall a Rust binary - ... See all commands with --list - -See 'cargo help ' for more information on a specific command. diff --git a/tests/testsuite/cargo/help/stdout.term.svg b/tests/testsuite/cargo/help/stdout.term.svg new file mode 100644 index 000000000000..5ebc0099c099 --- /dev/null +++ b/tests/testsuite/cargo/help/stdout.term.svg @@ -0,0 +1,102 @@ + + + + + + Rust's package manager + + + + Usage: cargo [+toolchain] [OPTIONS] [COMMAND] + + cargo [+toolchain] [OPTIONS] -Zscript <MANIFEST_RS> [ARGS]... + + + + Options: + + -V, --version Print version info and exit + + --list List installed commands + + --explain <CODE> Provide a detailed explanation of a rustc error message + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + -C <DIRECTORY> Change to DIRECTORY before doing anything (nightly-only) + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Commands: + + build, b Compile the current package + + check, c Analyze the current package and report errors, but don't build object files + + clean Remove the target directory + + doc, d Build this package's and its dependencies' documentation + + new Create a new cargo package + + init Create a new cargo package in an existing directory + + add Add dependencies to a manifest file + + remove Remove dependencies from a manifest file + + run, r Run a binary or example of the local package + + test, t Run the tests + + bench Run the benchmarks + + update Update dependencies listed in Cargo.lock + + search Search registry for crates + + publish Package and upload this package to the registry + + install Install a Rust binary + + uninstall Uninstall a Rust binary + + ... See all commands with --list + + + + See 'cargo help <command>' for more information on a specific command. + + + + + + diff --git a/tests/testsuite/cargo/z_help/mod.rs b/tests/testsuite/cargo/z_help/mod.rs index 43afd385368b..04e8737ae157 100644 --- a/tests/testsuite/cargo/z_help/mod.rs +++ b/tests/testsuite/cargo/z_help/mod.rs @@ -8,6 +8,6 @@ fn case() { .args(["-Z", "help"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo/z_help/stderr.log b/tests/testsuite/cargo/z_help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo/z_help/stderr.term.svg b/tests/testsuite/cargo/z_help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo/z_help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo/z_help/stdout.log b/tests/testsuite/cargo/z_help/stdout.log deleted file mode 100644 index 2a4703cc11f2..000000000000 --- a/tests/testsuite/cargo/z_help/stdout.log +++ /dev/null @@ -1,38 +0,0 @@ -Available unstable (nightly-only) flags: - - -Z allow-features Allow *only* the listed unstable features - -Z asymmetric-token Allows authenticating with asymmetric tokens - -Z avoid-dev-deps Avoid installing dev-dependencies if possible - -Z binary-dep-depinfo Track changes to dependency artifacts - -Z bindeps Allow Cargo packages to depend on bin, cdylib, and staticlib crates, and use the artifacts built by those crates - -Z build-std Enable Cargo to compile the standard library itself as part of a crate graph compilation - -Z build-std-features Configure features enabled for the standard library itself when building the standard library - -Z check-cfg Enable compile-time checking of `cfg` names/values/features - -Z codegen-backend Enable the `codegen-backend` option in profiles in .cargo/config.toml file - -Z config-include Enable the `include` key in config files - -Z direct-minimal-versions Resolve minimal dependency versions instead of maximum (direct dependencies only) - -Z doctest-xcompile Compile and run doctests for non-host target using runner config - -Z dual-proc-macros Build proc-macros for both the host and the target - -Z gc Track cache usage and "garbage collect" unused files - -Z git Enable support for shallow git fetch operations - -Z gitoxide Use gitoxide for the given git interactions, or all of them if no argument is given - -Z host-config Enable the `[host]` section in the .cargo/config.toml file - -Z lints Pass `[lints]` to the linting tools - -Z minimal-versions Resolve minimal dependency versions instead of maximum - -Z msrv-policy Enable rust-version aware policy within cargo - -Z mtime-on-use Configure Cargo to update the mtime of used files - -Z no-index-update Do not update the registry index even if the cache is outdated - -Z panic-abort-tests Enable support to run tests with -Cpanic=abort - -Z precise-pre-release Enable pre-release versions to be selected with `update --precise` - -Z profile-rustflags Enable the `rustflags` option in profiles in .cargo/config.toml file - -Z publish-timeout Enable the `publish.timeout` key in .cargo/config.toml file - -Z rustdoc-map Allow passing external documentation mappings to rustdoc - -Z rustdoc-scrape-examples Allows Rustdoc to scrape code examples from reverse-dependencies - -Z script Enable support for single-file, `.rs` packages - -Z target-applies-to-host Enable the `target-applies-to-host` key in the .cargo/config.toml file - -Z trim-paths Enable the `trim-paths` option in profiles - -Z unstable-options Allow the usage of unstable options - -Run with `cargo -Z [FLAG] [COMMAND]` - -See https://doc.rust-lang.org/nightly/cargo/reference/unstable.html for more information about these flags. diff --git a/tests/testsuite/cargo/z_help/stdout.term.svg b/tests/testsuite/cargo/z_help/stdout.term.svg new file mode 100644 index 000000000000..e6b331764636 --- /dev/null +++ b/tests/testsuite/cargo/z_help/stdout.term.svg @@ -0,0 +1,98 @@ + + + + + + Available unstable (nightly-only) flags: + + + + -Z allow-features Allow *only* the listed unstable features + + -Z asymmetric-token Allows authenticating with asymmetric tokens + + -Z avoid-dev-deps Avoid installing dev-dependencies if possible + + -Z binary-dep-depinfo Track changes to dependency artifacts + + -Z bindeps Allow Cargo packages to depend on bin, cdylib, and staticlib crates, and use the artifacts built by those crates + + -Z build-std Enable Cargo to compile the standard library itself as part of a crate graph compilation + + -Z build-std-features Configure features enabled for the standard library itself when building the standard library + + -Z check-cfg Enable compile-time checking of `cfg` names/values/features + + -Z codegen-backend Enable the `codegen-backend` option in profiles in .cargo/config.toml file + + -Z config-include Enable the `include` key in config files + + -Z direct-minimal-versions Resolve minimal dependency versions instead of maximum (direct dependencies only) + + -Z doctest-xcompile Compile and run doctests for non-host target using runner config + + -Z dual-proc-macros Build proc-macros for both the host and the target + + -Z gc Track cache usage and "garbage collect" unused files + + -Z git Enable support for shallow git fetch operations + + -Z gitoxide Use gitoxide for the given git interactions, or all of them if no argument is given + + -Z host-config Enable the `[host]` section in the .cargo/config.toml file + + -Z lints Pass `[lints]` to the linting tools + + -Z minimal-versions Resolve minimal dependency versions instead of maximum + + -Z msrv-policy Enable rust-version aware policy within cargo + + -Z mtime-on-use Configure Cargo to update the mtime of used files + + -Z no-index-update Do not update the registry index even if the cache is outdated + + -Z panic-abort-tests Enable support to run tests with -Cpanic=abort + + -Z precise-pre-release Enable pre-release versions to be selected with `update --precise` + + -Z profile-rustflags Enable the `rustflags` option in profiles in .cargo/config.toml file + + -Z publish-timeout Enable the `publish.timeout` key in .cargo/config.toml file + + -Z rustdoc-map Allow passing external documentation mappings to rustdoc + + -Z rustdoc-scrape-examples Allows Rustdoc to scrape code examples from reverse-dependencies + + -Z script Enable support for single-file, `.rs` packages + + -Z target-applies-to-host Enable the `target-applies-to-host` key in the .cargo/config.toml file + + -Z trim-paths Enable the `trim-paths` option in profiles + + -Z unstable-options Allow the usage of unstable options + + + + Run with `cargo -Z [FLAG] [COMMAND]` + + + + See https://doc.rust-lang.org/nightly/cargo/reference/unstable.html for more information about these flags. + + + + + + diff --git a/tests/testsuite/cargo_add/add_basic/mod.rs b/tests/testsuite/cargo_add/add_basic/mod.rs index e7bf45e86b5c..077c1c56f641 100644 --- a/tests/testsuite/cargo_add/add_basic/mod.rs +++ b/tests/testsuite/cargo_add/add_basic/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/add_basic/stderr.log b/tests/testsuite/cargo_add/add_basic/stderr.log deleted file mode 100644 index f8621cd26c20..000000000000 --- a/tests/testsuite/cargo_add/add_basic/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/add_basic/stderr.term.svg b/tests/testsuite/cargo_add/add_basic/stderr.term.svg new file mode 100644 index 000000000000..65eaf5e84b54 --- /dev/null +++ b/tests/testsuite/cargo_add/add_basic/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v99999.0.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/add_basic/stdout.term.svg b/tests/testsuite/cargo_add/add_basic/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/add_basic/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/add_multiple/mod.rs b/tests/testsuite/cargo_add/add_multiple/mod.rs index ffab903a6ce3..fd202f8bedc3 100644 --- a/tests/testsuite/cargo_add/add_multiple/mod.rs +++ b/tests/testsuite/cargo_add/add_multiple/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/add_multiple/stderr.log b/tests/testsuite/cargo_add/add_multiple/stderr.log deleted file mode 100644 index becee3f5584e..000000000000 --- a/tests/testsuite/cargo_add/add_multiple/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/add_multiple/stderr.term.svg b/tests/testsuite/cargo_add/add_multiple/stderr.term.svg new file mode 100644 index 000000000000..854df25ef45e --- /dev/null +++ b/tests/testsuite/cargo_add/add_multiple/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v99999.0.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/add_multiple/stdout.term.svg b/tests/testsuite/cargo_add/add_multiple/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/add_multiple/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 c455e9d88b89..7c8ee884beef 100644 --- a/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs +++ b/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs @@ -34,8 +34,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/add_normalized_name_external/stderr.log b/tests/testsuite/cargo_add/add_normalized_name_external/stderr.log deleted file mode 100644 index c233efa0ae4c..000000000000 --- a/tests/testsuite/cargo_add/add_normalized_name_external/stderr.log +++ /dev/null @@ -1,18 +0,0 @@ - Updating `dummy-registry` index -warning: translating `linked_hash_map` to `linked-hash-map` -warning: translating `Inflector` to `inflector` - Adding linked-hash-map v0.5.4 to dependencies - Features: - - clippy - - heapsize - - heapsize_impl - - nightly - - serde - - serde_impl - - serde_test - Adding inflector v0.11.4 to dependencies - Features: - + heavyweight - + lazy_static - + regex - - unstable diff --git a/tests/testsuite/cargo_add/add_normalized_name_external/stderr.term.svg b/tests/testsuite/cargo_add/add_normalized_name_external/stderr.term.svg new file mode 100644 index 000000000000..9ed213086abb --- /dev/null +++ b/tests/testsuite/cargo_add/add_normalized_name_external/stderr.term.svg @@ -0,0 +1,62 @@ + + + + + + Updating `dummy-registry` index + + warning: translating `linked_hash_map` to `linked-hash-map` + + warning: translating `Inflector` to `inflector` + + Adding linked-hash-map v0.5.4 to dependencies + + Features: + + - clippy + + - heapsize + + - heapsize_impl + + - nightly + + - serde + + - serde_impl + + - serde_test + + Adding inflector v0.11.4 to dependencies + + Features: + + + heavyweight + + + lazy_static + + + regex + + - unstable + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/add_normalized_name_external/stdout.term.svg b/tests/testsuite/cargo_add/add_normalized_name_external/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/add_normalized_name_external/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/add_toolchain/mod.rs b/tests/testsuite/cargo_add/add_toolchain/mod.rs index 3be555f37a41..1509465773d0 100644 --- a/tests/testsuite/cargo_add/add_toolchain/mod.rs +++ b/tests/testsuite/cargo_add/add_toolchain/mod.rs @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/add_toolchain/stderr.log b/tests/testsuite/cargo_add/add_toolchain/stderr.log deleted file mode 100644 index 0593685adaa6..000000000000 --- a/tests/testsuite/cargo_add/add_toolchain/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ -error: invalid character `+` in dependency name: `+nightly` - Use `cargo +nightly add` if you meant to use the `nightly` toolchain. diff --git a/tests/testsuite/cargo_add/add_toolchain/stderr.term.svg b/tests/testsuite/cargo_add/add_toolchain/stderr.term.svg new file mode 100644 index 000000000000..7f4ce46599b2 --- /dev/null +++ b/tests/testsuite/cargo_add/add_toolchain/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + error: invalid character `+` in dependency name: `+nightly` + + Use `cargo +nightly add` if you meant to use the `nightly` toolchain. + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/add_toolchain/stdout.term.svg b/tests/testsuite/cargo_add/add_toolchain/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/add_toolchain/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/build/mod.rs b/tests/testsuite/cargo_add/build/mod.rs index 35ffd5674ff5..04cbac1cc3cd 100644 --- a/tests/testsuite/cargo_add/build/mod.rs +++ b/tests/testsuite/cargo_add/build/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/build/stderr.log b/tests/testsuite/cargo_add/build/stderr.log deleted file mode 100644 index bbb11440249e..000000000000 --- a/tests/testsuite/cargo_add/build/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-build-package1 v99999.0.0 to build-dependencies - Adding my-build-package2 v99999.0.0 to build-dependencies diff --git a/tests/testsuite/cargo_add/build/stderr.term.svg b/tests/testsuite/cargo_add/build/stderr.term.svg new file mode 100644 index 000000000000..42ba8879fac9 --- /dev/null +++ b/tests/testsuite/cargo_add/build/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding my-build-package1 v99999.0.0 to build-dependencies + + Adding my-build-package2 v99999.0.0 to build-dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/build/stdout.log b/tests/testsuite/cargo_add/build/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/build/stdout.term.svg b/tests/testsuite/cargo_add/build/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/build/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 25462d5ec91a..1d7dfaeb2085 100644 --- a/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs +++ b/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.log b/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.log deleted file mode 100644 index b8c8c9e3f1b7..000000000000 --- a/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to build-dependencies - Features: - - one - - two diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.term.svg b/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.term.svg new file mode 100644 index 000000000000..ae98c6b9b977 --- /dev/null +++ b/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + Adding cargo-list-test-fixture-dependency (local) to build-dependencies + + Features: + + - one + + - two + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/stdout.term.svg b/tests/testsuite/cargo_add/build_prefer_existing_version/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/build_prefer_existing_version/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/change_rename_target/mod.rs b/tests/testsuite/cargo_add/change_rename_target/mod.rs index d6705379aff0..78f1f91f2991 100644 --- a/tests/testsuite/cargo_add/change_rename_target/mod.rs +++ b/tests/testsuite/cargo_add/change_rename_target/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/change_rename_target/stderr.log b/tests/testsuite/cargo_add/change_rename_target/stderr.log deleted file mode 100644 index b7d817604db6..000000000000 --- a/tests/testsuite/cargo_add/change_rename_target/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package2 v99999.0.0 to optional dependencies - Adding feature `some-package` diff --git a/tests/testsuite/cargo_add/change_rename_target/stderr.term.svg b/tests/testsuite/cargo_add/change_rename_target/stderr.term.svg new file mode 100644 index 000000000000..560b4e902641 --- /dev/null +++ b/tests/testsuite/cargo_add/change_rename_target/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package2 v99999.0.0 to optional dependencies + + Adding feature `some-package` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/change_rename_target/stdout.term.svg b/tests/testsuite/cargo_add/change_rename_target/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/change_rename_target/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/cyclic_features/mod.rs b/tests/testsuite/cargo_add/cyclic_features/mod.rs index eeac50de51ab..622a6b3ff9f6 100644 --- a/tests/testsuite/cargo_add/cyclic_features/mod.rs +++ b/tests/testsuite/cargo_add/cyclic_features/mod.rs @@ -23,8 +23,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/cyclic_features/stderr.log b/tests/testsuite/cargo_add/cyclic_features/stderr.log deleted file mode 100644 index 8e398bc2269c..000000000000 --- a/tests/testsuite/cargo_add/cyclic_features/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Updating `dummy-registry` index - Adding test_cyclic_features v0.1.1 to dependencies - Features: - + feature-one - + feature-two diff --git a/tests/testsuite/cargo_add/cyclic_features/stderr.term.svg b/tests/testsuite/cargo_add/cyclic_features/stderr.term.svg new file mode 100644 index 000000000000..9e29bc5e4555 --- /dev/null +++ b/tests/testsuite/cargo_add/cyclic_features/stderr.term.svg @@ -0,0 +1,34 @@ + + + + + + Updating `dummy-registry` index + + Adding test_cyclic_features v0.1.1 to dependencies + + Features: + + + feature-one + + + feature-two + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/cyclic_features/stdout.term.svg b/tests/testsuite/cargo_add/cyclic_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/cyclic_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/default_features/mod.rs b/tests/testsuite/cargo_add/default_features/mod.rs index 6994260abf6d..fa9214e8a795 100644 --- a/tests/testsuite/cargo_add/default_features/mod.rs +++ b/tests/testsuite/cargo_add/default_features/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/default_features/stderr.log b/tests/testsuite/cargo_add/default_features/stderr.log deleted file mode 100644 index 0fb065ebda14..000000000000 --- a/tests/testsuite/cargo_add/default_features/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v0.4.1 to dependencies diff --git a/tests/testsuite/cargo_add/default_features/stderr.term.svg b/tests/testsuite/cargo_add/default_features/stderr.term.svg new file mode 100644 index 000000000000..c0af7b70d919 --- /dev/null +++ b/tests/testsuite/cargo_add/default_features/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v0.4.1 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/default_features/stdout.term.svg b/tests/testsuite/cargo_add/default_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/default_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/deprecated_default_features/mod.rs b/tests/testsuite/cargo_add/deprecated_default_features/mod.rs index 6baa89265ef7..fa61f997ae1d 100644 --- a/tests/testsuite/cargo_add/deprecated_default_features/mod.rs +++ b/tests/testsuite/cargo_add/deprecated_default_features/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(&cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/deprecated_default_features/stderr.log b/tests/testsuite/cargo_add/deprecated_default_features/stderr.log deleted file mode 100644 index 46d99d15def2..000000000000 --- a/tests/testsuite/cargo_add/deprecated_default_features/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: Use of `default_features` in `my-package` is unsupported, please switch to `default-features` diff --git a/tests/testsuite/cargo_add/deprecated_default_features/stderr.term.svg b/tests/testsuite/cargo_add/deprecated_default_features/stderr.term.svg new file mode 100644 index 000000000000..ffdae9a9a616 --- /dev/null +++ b/tests/testsuite/cargo_add/deprecated_default_features/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: Use of `default_features` in `my-package` is unsupported, please switch to `default-features` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/deprecated_default_features/stdout.term.svg b/tests/testsuite/cargo_add/deprecated_default_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/deprecated_default_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/deprecated_section/mod.rs b/tests/testsuite/cargo_add/deprecated_section/mod.rs index 6baa89265ef7..fa61f997ae1d 100644 --- a/tests/testsuite/cargo_add/deprecated_section/mod.rs +++ b/tests/testsuite/cargo_add/deprecated_section/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(&cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/deprecated_section/stderr.log b/tests/testsuite/cargo_add/deprecated_section/stderr.log deleted file mode 100644 index b3b9c10f9b93..000000000000 --- a/tests/testsuite/cargo_add/deprecated_section/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: Deprecated dependency sections are unsupported: dev_dependencies, build_dependencies diff --git a/tests/testsuite/cargo_add/deprecated_section/stderr.term.svg b/tests/testsuite/cargo_add/deprecated_section/stderr.term.svg new file mode 100644 index 000000000000..d1e13fd3e2b4 --- /dev/null +++ b/tests/testsuite/cargo_add/deprecated_section/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: Deprecated dependency sections are unsupported: dev_dependencies, build_dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/deprecated_section/stdout.term.svg b/tests/testsuite/cargo_add/deprecated_section/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/deprecated_section/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs index 60b454d32558..8de95d3a4321 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs +++ b/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs @@ -18,8 +18,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.log b/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.log deleted file mode 100644 index d8922c24dcd6..000000000000 --- a/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding foo (workspace) to dependencies diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.term.svg new file mode 100644 index 000000000000..e7ad7dda7056 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Adding foo (workspace) to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/stdout.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 9cf13026cc5e..5cd9428fd993 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs @@ -18,8 +18,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/stderr.log b/tests/testsuite/cargo_add/detect_workspace_inherit_features/stderr.log deleted file mode 100644 index 6c3a6ed1da38..000000000000 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_features/stderr.log +++ /dev/null @@ -1,10 +0,0 @@ - Adding foo (workspace) to dependencies - Features as of v0.0.0: - + default-base - + default-merge-base - + default-test-base - + merge - + merge-base - + test - + test-base - - unrelated diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/stderr.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit_features/stderr.term.svg new file mode 100644 index 000000000000..d34a82a846da --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_features/stderr.term.svg @@ -0,0 +1,45 @@ + + + + + + Adding foo (workspace) to dependencies + + Features as of v0.0.0: + + + default-base + + + default-merge-base + + + default-test-base + + + merge + + + merge-base + + + test + + + test-base + + - unrelated + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/stdout.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 faac9b7facde..3a0e050b1ef4 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs @@ -18,8 +18,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.log b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.log deleted file mode 100644 index ac16f38d5c80..000000000000 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Adding foo (workspace) to optional dependencies - Adding feature `foo` diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.term.svg new file mode 100644 index 000000000000..597ebaf18161 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Adding foo (workspace) to optional dependencies + + Adding feature `foo` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stdout.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 d920ddada1ed..87bfc68c2b92 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs @@ -19,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.log b/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.log deleted file mode 100644 index a3ec5a046d0a..000000000000 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding foo (workspace) to public dependencies diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.term.svg new file mode 100644 index 000000000000..437f5bd30d62 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Adding foo (workspace) to public dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/stdout.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit_public/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_public/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/dev/mod.rs b/tests/testsuite/cargo_add/dev/mod.rs index 7e1532a9b6e3..5b4211d576eb 100644 --- a/tests/testsuite/cargo_add/dev/mod.rs +++ b/tests/testsuite/cargo_add/dev/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/dev/stderr.log b/tests/testsuite/cargo_add/dev/stderr.log deleted file mode 100644 index d75e23a7fbeb..000000000000 --- a/tests/testsuite/cargo_add/dev/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-dev-package1 v99999.0.0 to dev-dependencies - Adding my-dev-package2 v99999.0.0 to dev-dependencies diff --git a/tests/testsuite/cargo_add/dev/stderr.term.svg b/tests/testsuite/cargo_add/dev/stderr.term.svg new file mode 100644 index 000000000000..d2604f4b0d61 --- /dev/null +++ b/tests/testsuite/cargo_add/dev/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding my-dev-package1 v99999.0.0 to dev-dependencies + + Adding my-dev-package2 v99999.0.0 to dev-dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/dev/stdout.log b/tests/testsuite/cargo_add/dev/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/dev/stdout.term.svg b/tests/testsuite/cargo_add/dev/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/dev/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/dev_build_conflict/mod.rs b/tests/testsuite/cargo_add/dev_build_conflict/mod.rs index f836e3015697..de996c079ed9 100644 --- a/tests/testsuite/cargo_add/dev_build_conflict/mod.rs +++ b/tests/testsuite/cargo_add/dev_build_conflict/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/dev_build_conflict/stderr.log b/tests/testsuite/cargo_add/dev_build_conflict/stderr.log deleted file mode 100644 index 69c52091292f..000000000000 --- a/tests/testsuite/cargo_add/dev_build_conflict/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ -error: the argument '--dev' cannot be used with '--build' - -Usage: cargo add [OPTIONS] [@] ... - cargo add [OPTIONS] --path ... - cargo add [OPTIONS] --git ... - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_add/dev_build_conflict/stderr.term.svg b/tests/testsuite/cargo_add/dev_build_conflict/stderr.term.svg new file mode 100644 index 000000000000..3982054ece8b --- /dev/null +++ b/tests/testsuite/cargo_add/dev_build_conflict/stderr.term.svg @@ -0,0 +1,36 @@ + + + + + + error: the argument '--dev' cannot be used with '--build' + + + + Usage: cargo add [OPTIONS] <DEP>[@<VERSION>] ... + + cargo add [OPTIONS] --path <PATH> ... + + cargo add [OPTIONS] --git <URL> ... + + + + For more information, try '--help'. + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/dev_build_conflict/stdout.term.svg b/tests/testsuite/cargo_add/dev_build_conflict/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/dev_build_conflict/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 e7a09805dfa7..e620fb0dc8a5 100644 --- a/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs +++ b/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.log b/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.log deleted file mode 100644 index 6de56a0c8e08..000000000000 --- a/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dev-dependencies - Features as of v0.0.0: - - one - - two diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.term.svg b/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.term.svg new file mode 100644 index 000000000000..c802de65ee7f --- /dev/null +++ b/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + Adding cargo-list-test-fixture-dependency (local) to dev-dependencies + + Features as of v0.0.0: + + - one + + - two + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/stdout.term.svg b/tests/testsuite/cargo_add/dev_prefer_existing_version/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/dev_prefer_existing_version/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/dry_run/mod.rs b/tests/testsuite/cargo_add/dry_run/mod.rs index 8afffdc2acdd..3117445a1783 100644 --- a/tests/testsuite/cargo_add/dry_run/mod.rs +++ b/tests/testsuite/cargo_add/dry_run/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/dry_run/stderr.log b/tests/testsuite/cargo_add/dry_run/stderr.log deleted file mode 100644 index d662386c0ca1..000000000000 --- a/tests/testsuite/cargo_add/dry_run/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v99999.0.0 to dependencies -warning: aborting add due to dry run diff --git a/tests/testsuite/cargo_add/dry_run/stderr.term.svg b/tests/testsuite/cargo_add/dry_run/stderr.term.svg new file mode 100644 index 000000000000..db507baf9032 --- /dev/null +++ b/tests/testsuite/cargo_add/dry_run/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v99999.0.0 to dependencies + + warning: aborting add due to dry run + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/dry_run/stdout.term.svg b/tests/testsuite/cargo_add/dry_run/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/dry_run/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/empty_dep_name/mod.rs b/tests/testsuite/cargo_add/empty_dep_name/mod.rs index 0c7dd0daa39f..5f2ab228fb18 100644 --- a/tests/testsuite/cargo_add/empty_dep_name/mod.rs +++ b/tests/testsuite/cargo_add/empty_dep_name/mod.rs @@ -17,8 +17,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/empty_dep_name/stderr.log b/tests/testsuite/cargo_add/empty_dep_name/stderr.log deleted file mode 100644 index d9547a42acfc..000000000000 --- a/tests/testsuite/cargo_add/empty_dep_name/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: package name cannot be empty diff --git a/tests/testsuite/cargo_add/empty_dep_name/stderr.term.svg b/tests/testsuite/cargo_add/empty_dep_name/stderr.term.svg new file mode 100644 index 000000000000..3a114dae20e8 --- /dev/null +++ b/tests/testsuite/cargo_add/empty_dep_name/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: package name cannot be empty + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/empty_dep_name/stdout.term.svg b/tests/testsuite/cargo_add/empty_dep_name/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/empty_dep_name/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/empty_dep_table/mod.rs b/tests/testsuite/cargo_add/empty_dep_table/mod.rs index f06d47cfb28d..3244e9436cc0 100644 --- a/tests/testsuite/cargo_add/empty_dep_table/mod.rs +++ b/tests/testsuite/cargo_add/empty_dep_table/mod.rs @@ -24,8 +24,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/empty_dep_table/stderr.log b/tests/testsuite/cargo_add/empty_dep_table/stderr.log deleted file mode 100644 index 3acd7b944ec1..000000000000 --- a/tests/testsuite/cargo_add/empty_dep_table/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: unrecognized dependency source for `your-face`, expected a local path, Git repository, version, or workspace dependency to be specified diff --git a/tests/testsuite/cargo_add/empty_dep_table/stderr.term.svg b/tests/testsuite/cargo_add/empty_dep_table/stderr.term.svg new file mode 100644 index 000000000000..f8d9cec8ee5f --- /dev/null +++ b/tests/testsuite/cargo_add/empty_dep_table/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: unrecognized dependency source for `your-face`, expected a local path, Git repository, version, or workspace dependency to be specified + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/empty_dep_table/stdout.term.svg b/tests/testsuite/cargo_add/empty_dep_table/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/empty_dep_table/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/features/mod.rs b/tests/testsuite/cargo_add/features/mod.rs index d3e485a561fa..b2888500961f 100644 --- a/tests/testsuite/cargo_add/features/mod.rs +++ b/tests/testsuite/cargo_add/features/mod.rs @@ -24,8 +24,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features/stderr.log b/tests/testsuite/cargo_add/features/stderr.log deleted file mode 100644 index 6fa70b32747f..000000000000 --- a/tests/testsuite/cargo_add/features/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - + eyes - - ears - - mouth - - nose diff --git a/tests/testsuite/cargo_add/features/stderr.term.svg b/tests/testsuite/cargo_add/features/stderr.term.svg new file mode 100644 index 000000000000..c128f2bd1fb7 --- /dev/null +++ b/tests/testsuite/cargo_add/features/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + + eyes + + - ears + + - mouth + + - nose + + + + + + diff --git a/tests/testsuite/cargo_add/features/stdout.log b/tests/testsuite/cargo_add/features/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/features/stdout.term.svg b/tests/testsuite/cargo_add/features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 689245de3ba2..c6abf16ad3c4 100644 --- a/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs +++ b/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/stderr.log b/tests/testsuite/cargo_add/features_activated_over_limit/stderr.log deleted file mode 100644 index 460d5f9fa0d0..000000000000 --- a/tests/testsuite/cargo_add/features_activated_over_limit/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - 100 activated features - 100 deactivated features diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/stderr.term.svg b/tests/testsuite/cargo_add/features_activated_over_limit/stderr.term.svg new file mode 100644 index 000000000000..b8e1b71c50f6 --- /dev/null +++ b/tests/testsuite/cargo_add/features_activated_over_limit/stderr.term.svg @@ -0,0 +1,34 @@ + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + 100 activated features + + 100 deactivated features + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/stdout.term.svg b/tests/testsuite/cargo_add/features_activated_over_limit/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/features_activated_over_limit/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 287dce6674ec..7ffaad7fc188 100644 --- a/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs +++ b/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.log b/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.log deleted file mode 100644 index 8a8914106a36..000000000000 --- a/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.log +++ /dev/null @@ -1,34 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - + eyes000 - + eyes001 - + eyes002 - + eyes003 - + eyes004 - + eyes005 - + eyes006 - + eyes007 - + eyes008 - + eyes009 - + eyes010 - + eyes011 - + eyes012 - + eyes013 - + eyes014 - + eyes015 - + eyes016 - + eyes017 - + eyes018 - + eyes019 - + eyes020 - + eyes021 - + eyes022 - + eyes023 - + eyes024 - + eyes025 - + eyes026 - + eyes027 - + eyes028 - + eyes029 - 170 deactivated features diff --git a/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.term.svg b/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.term.svg new file mode 100644 index 000000000000..0c185836a462 --- /dev/null +++ b/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.term.svg @@ -0,0 +1,92 @@ + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + + eyes000 + + + eyes001 + + + eyes002 + + + eyes003 + + + eyes004 + + + eyes005 + + + eyes006 + + + eyes007 + + + eyes008 + + + eyes009 + + + eyes010 + + + eyes011 + + + eyes012 + + + eyes013 + + + eyes014 + + + eyes015 + + + eyes016 + + + eyes017 + + + eyes018 + + + eyes019 + + + eyes020 + + + eyes021 + + + eyes022 + + + eyes023 + + + eyes024 + + + eyes025 + + + eyes026 + + + eyes027 + + + eyes028 + + + eyes029 + + 170 deactivated features + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/features_deactivated_over_limit/stdout.term.svg b/tests/testsuite/cargo_add/features_deactivated_over_limit/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/features_deactivated_over_limit/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/features_empty/mod.rs b/tests/testsuite/cargo_add/features_empty/mod.rs index a18e1062bcdd..10ad93e88a3d 100644 --- a/tests/testsuite/cargo_add/features_empty/mod.rs +++ b/tests/testsuite/cargo_add/features_empty/mod.rs @@ -24,8 +24,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_empty/stderr.log b/tests/testsuite/cargo_add/features_empty/stderr.log deleted file mode 100644 index 025651f187eb..000000000000 --- a/tests/testsuite/cargo_add/features_empty/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - - ears - - eyes - - mouth - - nose diff --git a/tests/testsuite/cargo_add/features_empty/stderr.term.svg b/tests/testsuite/cargo_add/features_empty/stderr.term.svg new file mode 100644 index 000000000000..25edb5a41b92 --- /dev/null +++ b/tests/testsuite/cargo_add/features_empty/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + - ears + + - eyes + + - mouth + + - nose + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/features_empty/stdout.term.svg b/tests/testsuite/cargo_add/features_empty/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/features_empty/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs b/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs index 535944f2c7c9..b5d6a78815ff 100644 --- a/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs +++ b/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs @@ -24,8 +24,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.log b/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.log deleted file mode 100644 index 01cd92297500..000000000000 --- a/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - + eyes - + nose - - ears - - mouth diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.term.svg b/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.term.svg new file mode 100644 index 000000000000..a42290820c57 --- /dev/null +++ b/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + + eyes + + + nose + + - ears + + - mouth + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/stdout.term.svg b/tests/testsuite/cargo_add/features_multiple_occurrences/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/features_multiple_occurrences/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/features_preserve/mod.rs b/tests/testsuite/cargo_add/features_preserve/mod.rs index d06571d37d22..f8c16cfad6b7 100644 --- a/tests/testsuite/cargo_add/features_preserve/mod.rs +++ b/tests/testsuite/cargo_add/features_preserve/mod.rs @@ -24,8 +24,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_preserve/stderr.log b/tests/testsuite/cargo_add/features_preserve/stderr.log deleted file mode 100644 index 6fa70b32747f..000000000000 --- a/tests/testsuite/cargo_add/features_preserve/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - + eyes - - ears - - mouth - - nose diff --git a/tests/testsuite/cargo_add/features_preserve/stderr.term.svg b/tests/testsuite/cargo_add/features_preserve/stderr.term.svg new file mode 100644 index 000000000000..c128f2bd1fb7 --- /dev/null +++ b/tests/testsuite/cargo_add/features_preserve/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + + eyes + + - ears + + - mouth + + - nose + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/features_preserve/stdout.term.svg b/tests/testsuite/cargo_add/features_preserve/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/features_preserve/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/features_spaced_values/mod.rs b/tests/testsuite/cargo_add/features_spaced_values/mod.rs index 7b31b535d510..a8b3aabe7682 100644 --- a/tests/testsuite/cargo_add/features_spaced_values/mod.rs +++ b/tests/testsuite/cargo_add/features_spaced_values/mod.rs @@ -24,8 +24,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_spaced_values/stderr.log b/tests/testsuite/cargo_add/features_spaced_values/stderr.log deleted file mode 100644 index 01cd92297500..000000000000 --- a/tests/testsuite/cargo_add/features_spaced_values/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - + eyes - + nose - - ears - - mouth diff --git a/tests/testsuite/cargo_add/features_spaced_values/stderr.term.svg b/tests/testsuite/cargo_add/features_spaced_values/stderr.term.svg new file mode 100644 index 000000000000..a42290820c57 --- /dev/null +++ b/tests/testsuite/cargo_add/features_spaced_values/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + + eyes + + + nose + + - ears + + - mouth + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/features_spaced_values/stdout.term.svg b/tests/testsuite/cargo_add/features_spaced_values/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/features_spaced_values/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/features_unknown/mod.rs b/tests/testsuite/cargo_add/features_unknown/mod.rs index 4f4dbc85a989..bf0c5fa4dcfa 100644 --- a/tests/testsuite/cargo_add/features_unknown/mod.rs +++ b/tests/testsuite/cargo_add/features_unknown/mod.rs @@ -24,8 +24,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_unknown/stderr.log b/tests/testsuite/cargo_add/features_unknown/stderr.log deleted file mode 100644 index 9715153280e4..000000000000 --- a/tests/testsuite/cargo_add/features_unknown/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies -error: unrecognized feature for crate your-face: noze -disabled features: - ears, eyes, mouth, nose diff --git a/tests/testsuite/cargo_add/features_unknown/stderr.term.svg b/tests/testsuite/cargo_add/features_unknown/stderr.term.svg new file mode 100644 index 000000000000..7251bba072f2 --- /dev/null +++ b/tests/testsuite/cargo_add/features_unknown/stderr.term.svg @@ -0,0 +1,35 @@ + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + error: unrecognized feature for crate your-face: noze + + disabled features: + + ears, eyes, mouth, nose + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/features_unknown/stdout.term.svg b/tests/testsuite/cargo_add/features_unknown/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/features_unknown/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 25a62208e960..902ec04c9835 100644 --- a/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs +++ b/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/features_unknown_no_features/stderr.log b/tests/testsuite/cargo_add/features_unknown_no_features/stderr.log deleted file mode 100644 index 7564fec98228..000000000000 --- a/tests/testsuite/cargo_add/features_unknown_no_features/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v99999.0.0 to dependencies -error: unrecognized feature for crate my-package: noze -no features available for crate my-package diff --git a/tests/testsuite/cargo_add/features_unknown_no_features/stderr.term.svg b/tests/testsuite/cargo_add/features_unknown_no_features/stderr.term.svg new file mode 100644 index 000000000000..b4eb1a0ca0fb --- /dev/null +++ b/tests/testsuite/cargo_add/features_unknown_no_features/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v99999.0.0 to dependencies + + error: unrecognized feature for crate my-package: noze + + no features available for crate my-package + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/features_unknown_no_features/stdout.term.svg b/tests/testsuite/cargo_add/features_unknown_no_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/features_unknown_no_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/git/mod.rs b/tests/testsuite/cargo_add/git/mod.rs index 8a4a6deebb35..66a1c24d8cd1 100644 --- a/tests/testsuite/cargo_add/git/mod.rs +++ b/tests/testsuite/cargo_add/git/mod.rs @@ -27,8 +27,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git/stderr.log b/tests/testsuite/cargo_add/git/stderr.log deleted file mode 100644 index 386ccb01bf93..000000000000 --- a/tests/testsuite/cargo_add/git/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Adding git-package (git) to dependencies - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git/stderr.term.svg b/tests/testsuite/cargo_add/git/stderr.term.svg new file mode 100644 index 000000000000..78fff44ef26d --- /dev/null +++ b/tests/testsuite/cargo_add/git/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating git repository `[ROOTURL]/git-package` + + Adding git-package (git) to dependencies + + Updating git repository `[ROOTURL]/git-package` + + + + + + diff --git a/tests/testsuite/cargo_add/git/stdout.log b/tests/testsuite/cargo_add/git/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/git/stdout.term.svg b/tests/testsuite/cargo_add/git/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/git/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/git_branch/mod.rs b/tests/testsuite/cargo_add/git_branch/mod.rs index 7eb022468121..f9bf69c3ed1b 100644 --- a/tests/testsuite/cargo_add/git_branch/mod.rs +++ b/tests/testsuite/cargo_add/git_branch/mod.rs @@ -30,8 +30,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_branch/stderr.log b/tests/testsuite/cargo_add/git_branch/stderr.log deleted file mode 100644 index 386ccb01bf93..000000000000 --- a/tests/testsuite/cargo_add/git_branch/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Adding git-package (git) to dependencies - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_branch/stderr.term.svg b/tests/testsuite/cargo_add/git_branch/stderr.term.svg new file mode 100644 index 000000000000..78fff44ef26d --- /dev/null +++ b/tests/testsuite/cargo_add/git_branch/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating git repository `[ROOTURL]/git-package` + + Adding git-package (git) to dependencies + + Updating git repository `[ROOTURL]/git-package` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/git_branch/stdout.term.svg b/tests/testsuite/cargo_add/git_branch/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/git_branch/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs b/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs index fc71c56a6d4b..d1a91cc01506 100644 --- a/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs +++ b/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs @@ -33,8 +33,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_conflicts_namever/stderr.log b/tests/testsuite/cargo_add/git_conflicts_namever/stderr.log deleted file mode 100644 index 207e0ded3a73..000000000000 --- a/tests/testsuite/cargo_add/git_conflicts_namever/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: cannot specify a git URL (`https://github.com/dcjanus/invalid`) with a version (`0.4.3`). diff --git a/tests/testsuite/cargo_add/git_conflicts_namever/stderr.term.svg b/tests/testsuite/cargo_add/git_conflicts_namever/stderr.term.svg new file mode 100644 index 000000000000..a273e77c0b73 --- /dev/null +++ b/tests/testsuite/cargo_add/git_conflicts_namever/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: cannot specify a git URL (`https://github.com/dcjanus/invalid`) with a version (`0.4.3`). + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/git_conflicts_namever/stdout.term.svg b/tests/testsuite/cargo_add/git_conflicts_namever/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/git_conflicts_namever/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/git_dev/mod.rs b/tests/testsuite/cargo_add/git_dev/mod.rs index 767101c4743d..21fc105c3944 100644 --- a/tests/testsuite/cargo_add/git_dev/mod.rs +++ b/tests/testsuite/cargo_add/git_dev/mod.rs @@ -27,8 +27,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_dev/stderr.log b/tests/testsuite/cargo_add/git_dev/stderr.log deleted file mode 100644 index 11912112b023..000000000000 --- a/tests/testsuite/cargo_add/git_dev/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Adding git-package (git) to dev-dependencies - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_dev/stderr.term.svg b/tests/testsuite/cargo_add/git_dev/stderr.term.svg new file mode 100644 index 000000000000..1ed561fb25da --- /dev/null +++ b/tests/testsuite/cargo_add/git_dev/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating git repository `[ROOTURL]/git-package` + + Adding git-package (git) to dev-dependencies + + Updating git repository `[ROOTURL]/git-package` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/git_dev/stdout.term.svg b/tests/testsuite/cargo_add/git_dev/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/git_dev/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/git_inferred_name/mod.rs b/tests/testsuite/cargo_add/git_inferred_name/mod.rs index 43069653765a..4159c7526ac3 100644 --- a/tests/testsuite/cargo_add/git_inferred_name/mod.rs +++ b/tests/testsuite/cargo_add/git_inferred_name/mod.rs @@ -27,8 +27,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_inferred_name/stderr.log b/tests/testsuite/cargo_add/git_inferred_name/stderr.log deleted file mode 100644 index a11362926802..000000000000 --- a/tests/testsuite/cargo_add/git_inferred_name/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Updating git repository `[ROOTURL]/git-package` - Adding git-package (git) to dependencies - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_inferred_name/stderr.term.svg b/tests/testsuite/cargo_add/git_inferred_name/stderr.term.svg new file mode 100644 index 000000000000..cf85c607abaf --- /dev/null +++ b/tests/testsuite/cargo_add/git_inferred_name/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + Updating git repository `[ROOTURL]/git-package` + + Updating git repository `[ROOTURL]/git-package` + + Adding git-package (git) to dependencies + + Updating git repository `[ROOTURL]/git-package` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/git_inferred_name/stdout.term.svg b/tests/testsuite/cargo_add/git_inferred_name/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/git_inferred_name/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 30254de726c8..fa0c5653b8e2 100644 --- a/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs +++ b/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs @@ -67,8 +67,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.log b/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.log deleted file mode 100644 index 2e045db6f2c1..000000000000 --- a/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` -error: multiple packages found at `[ROOTURL]/git-package`: - my-package1, my-package2, my-package3, my-package4, my-package5, my-package6 - my-package7, my-package8, my-package9 -To disambiguate, run `cargo add --git [ROOTURL]/git-package ` diff --git a/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.term.svg b/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.term.svg new file mode 100644 index 000000000000..55407db82498 --- /dev/null +++ b/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.term.svg @@ -0,0 +1,35 @@ + + + + + + Updating git repository `[ROOTURL]/git-package` + + error: multiple packages found at `[ROOTURL]/git-package`: + + my-package1, my-package2, my-package3, my-package4, my-package5, my-package6 + + my-package7, my-package8, my-package9 + + To disambiguate, run `cargo add --git [ROOTURL]/git-package <package>` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/git_inferred_name_multiple/stdout.term.svg b/tests/testsuite/cargo_add/git_inferred_name_multiple/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/git_inferred_name_multiple/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/git_multiple_names/mod.rs b/tests/testsuite/cargo_add/git_multiple_names/mod.rs index 61f8cc987b87..6388a0ee5a3c 100644 --- a/tests/testsuite/cargo_add/git_multiple_names/mod.rs +++ b/tests/testsuite/cargo_add/git_multiple_names/mod.rs @@ -45,8 +45,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_multiple_names/stderr.log b/tests/testsuite/cargo_add/git_multiple_names/stderr.log deleted file mode 100644 index fb6982698c79..000000000000 --- a/tests/testsuite/cargo_add/git_multiple_names/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Adding my-package1 (git) to dependencies - Adding my-package2 (git) to dependencies - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_multiple_names/stderr.term.svg b/tests/testsuite/cargo_add/git_multiple_names/stderr.term.svg new file mode 100644 index 000000000000..05e70786515f --- /dev/null +++ b/tests/testsuite/cargo_add/git_multiple_names/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + Updating git repository `[ROOTURL]/git-package` + + Adding my-package1 (git) to dependencies + + Adding my-package2 (git) to dependencies + + Updating git repository `[ROOTURL]/git-package` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/git_multiple_names/stdout.term.svg b/tests/testsuite/cargo_add/git_multiple_names/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/git_multiple_names/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 fe14f67b56c0..ecd8db230b17 100644 --- a/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs +++ b/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs @@ -56,8 +56,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.log b/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.log deleted file mode 100644 index 1004dd77da3d..000000000000 --- a/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Adding package-with-feature (git) to dependencies - Features: - + target_feature - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.term.svg b/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.term.svg new file mode 100644 index 000000000000..8e6661d8b2da --- /dev/null +++ b/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.term.svg @@ -0,0 +1,34 @@ + + + + + + Updating git repository `[ROOTURL]/git-package` + + Adding package-with-feature (git) to dependencies + + Features: + + + target_feature + + Updating git repository `[ROOTURL]/git-package` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/stdout.term.svg b/tests/testsuite/cargo_add/git_multiple_packages_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/git_multiple_packages_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/git_normalized_name/mod.rs b/tests/testsuite/cargo_add/git_normalized_name/mod.rs index f539f79866fe..f8aa5aac3f29 100644 --- a/tests/testsuite/cargo_add/git_normalized_name/mod.rs +++ b/tests/testsuite/cargo_add/git_normalized_name/mod.rs @@ -27,8 +27,8 @@ fn case() { .current_dir(cwd) .assert() .failure() // Fuzzy searching for paths isn't supported at this time - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_normalized_name/stderr.log b/tests/testsuite/cargo_add/git_normalized_name/stderr.log deleted file mode 100644 index fedf82861c2c..000000000000 --- a/tests/testsuite/cargo_add/git_normalized_name/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` -error: the crate `git_package@[ROOTURL]/git-package` could not be found at `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_normalized_name/stderr.term.svg b/tests/testsuite/cargo_add/git_normalized_name/stderr.term.svg new file mode 100644 index 000000000000..7535c3c308b5 --- /dev/null +++ b/tests/testsuite/cargo_add/git_normalized_name/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Updating git repository `[ROOTURL]/git-package` + + error: the crate `git_package@[ROOTURL]/git-package` could not be found at `[ROOTURL]/git-package` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/git_normalized_name/stdout.term.svg b/tests/testsuite/cargo_add/git_normalized_name/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/git_normalized_name/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/git_registry/mod.rs b/tests/testsuite/cargo_add/git_registry/mod.rs index 35c0d7b06b81..e98627eb6c34 100644 --- a/tests/testsuite/cargo_add/git_registry/mod.rs +++ b/tests/testsuite/cargo_add/git_registry/mod.rs @@ -46,8 +46,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_registry/stderr.log b/tests/testsuite/cargo_add/git_registry/stderr.log deleted file mode 100644 index b9291d08185c..000000000000 --- a/tests/testsuite/cargo_add/git_registry/stderr.log +++ /dev/null @@ -1,6 +0,0 @@ - Updating git repository `[ROOTURL]/versioned-package` - Adding versioned-package (git) to dependencies -error: failed to parse manifest at `[ROOT]/case/Cargo.toml` - -Caused by: - dependency (versioned-package) specification is ambiguous. Only one of `git` or `registry` is allowed. diff --git a/tests/testsuite/cargo_add/git_registry/stderr.term.svg b/tests/testsuite/cargo_add/git_registry/stderr.term.svg new file mode 100644 index 000000000000..214ca4e478e6 --- /dev/null +++ b/tests/testsuite/cargo_add/git_registry/stderr.term.svg @@ -0,0 +1,37 @@ + + + + + + Updating git repository `[ROOTURL]/versioned-package` + + Adding versioned-package (git) to dependencies + + error: failed to parse manifest at `[ROOT]/case/Cargo.toml` + + + + Caused by: + + dependency (versioned-package) specification is ambiguous. Only one of `git` or `registry` is allowed. + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/git_registry/stdout.term.svg b/tests/testsuite/cargo_add/git_registry/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/git_registry/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/git_rev/mod.rs b/tests/testsuite/cargo_add/git_rev/mod.rs index ee3800239494..7460c3692506 100644 --- a/tests/testsuite/cargo_add/git_rev/mod.rs +++ b/tests/testsuite/cargo_add/git_rev/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_rev/stderr.log b/tests/testsuite/cargo_add/git_rev/stderr.log deleted file mode 100644 index 386ccb01bf93..000000000000 --- a/tests/testsuite/cargo_add/git_rev/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Adding git-package (git) to dependencies - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_rev/stderr.term.svg b/tests/testsuite/cargo_add/git_rev/stderr.term.svg new file mode 100644 index 000000000000..78fff44ef26d --- /dev/null +++ b/tests/testsuite/cargo_add/git_rev/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating git repository `[ROOTURL]/git-package` + + Adding git-package (git) to dependencies + + Updating git repository `[ROOTURL]/git-package` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/git_rev/stdout.term.svg b/tests/testsuite/cargo_add/git_rev/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/git_rev/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/git_tag/mod.rs b/tests/testsuite/cargo_add/git_tag/mod.rs index c3f504675022..ae42be93a0a4 100644 --- a/tests/testsuite/cargo_add/git_tag/mod.rs +++ b/tests/testsuite/cargo_add/git_tag/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/git_tag/stderr.log b/tests/testsuite/cargo_add/git_tag/stderr.log deleted file mode 100644 index 386ccb01bf93..000000000000 --- a/tests/testsuite/cargo_add/git_tag/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` - Adding git-package (git) to dependencies - Updating git repository `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/git_tag/stderr.term.svg b/tests/testsuite/cargo_add/git_tag/stderr.term.svg new file mode 100644 index 000000000000..78fff44ef26d --- /dev/null +++ b/tests/testsuite/cargo_add/git_tag/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating git repository `[ROOTURL]/git-package` + + Adding git-package (git) to dependencies + + Updating git repository `[ROOTURL]/git-package` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/git_tag/stdout.term.svg b/tests/testsuite/cargo_add/git_tag/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/git_tag/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/help/mod.rs b/tests/testsuite/cargo_add/help/mod.rs index 15f9a6a04585..6e6bb53a45f1 100644 --- a/tests/testsuite/cargo_add/help/mod.rs +++ b/tests/testsuite/cargo_add/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_add/help/stderr.log b/tests/testsuite/cargo_add/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/help/stderr.term.svg b/tests/testsuite/cargo_add/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/help/stdout.log b/tests/testsuite/cargo_add/help/stdout.log deleted file mode 100644 index ee738a3e59cf..000000000000 --- a/tests/testsuite/cargo_add/help/stdout.log +++ /dev/null @@ -1,135 +0,0 @@ -Add dependencies to a Cargo.toml manifest file - -Usage: cargo add [OPTIONS] [@] ... - cargo add [OPTIONS] --path ... - cargo add [OPTIONS] --git ... - -Arguments: - [DEP_ID]... - Reference to a package to add as a dependency - - You can reference a package by: - - ``, like `cargo add serde` (latest version will be used) - - `@`, like `cargo add serde@1` or `cargo add serde@=1.0.38` - -Options: - --no-default-features - Disable the default features - - --default-features - Re-enable the default features - - -F, --features - Space or comma separated list of features to activate - - --optional - Mark the dependency as optional - - The package name will be exposed as feature of your crate. - - --no-optional - Mark the dependency as required - - The package will be removed from your features. - - --public - Mark the dependency as public (unstable) - - The dependency can be referenced in your library's public API. - - --no-public - Mark the dependency as private (unstable) - - While you can use the crate in your implementation, it cannot be referenced in your public - API. - - --rename - Rename the dependency - - Example uses: - - Depending on multiple versions of a crate - - Depend on crates with the same name from different registries - - --ignore-rust-version - Ignore `rust-version` specification in packages (unstable) - - -n, --dry-run - Don't actually write the manifest - - -v, --verbose... - Use verbose output (-vv very verbose/build.rs output) - - -q, --quiet - Do not print cargo log messages - - --color - Coloring: auto, always, never - - --config - Override a configuration value - - -Z - Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - - -h, --help - Print help (see a summary with '-h') - -Manifest Options: - --manifest-path - Path to Cargo.toml - - --frozen - Require Cargo.lock and cache are up to date - - --locked - Require Cargo.lock is up to date - - --offline - Run without accessing the network - -Package Selection: - -p, --package [] - Package to modify - -Source: - --path - Filesystem path to local crate to add - - --git - Git repository location - - Without any other information, cargo will use latest commit on the main branch. - - --branch - Git branch to download the crate from - - --tag - Git tag to download the crate from - - --rev - Git reference to download the crate from - - This is the catch all, handling hashes to named references in remote repositories. - - --registry - Package registry for this dependency - -Section: - --dev - Add as development dependency - - Dev-dependencies are not used when compiling a package for building, but are used for - compiling tests, examples, and benchmarks. - - These dependencies are not propagated to other packages which depend on this package. - - --build - Add as build dependency - - Build-dependencies are the only dependencies available for use by build scripts - (`build.rs` files). - - --target - Add as dependency to the given target platform - -Run `cargo help add` for more detailed information. diff --git a/tests/testsuite/cargo_add/help/stdout.term.svg b/tests/testsuite/cargo_add/help/stdout.term.svg new file mode 100644 index 000000000000..226be544ff6b --- /dev/null +++ b/tests/testsuite/cargo_add/help/stdout.term.svg @@ -0,0 +1,292 @@ + + + + + + Add dependencies to a Cargo.toml manifest file + + + + Usage: cargo add [OPTIONS] <DEP>[@<VERSION>] ... + + cargo add [OPTIONS] --path <PATH> ... + + cargo add [OPTIONS] --git <URL> ... + + + + Arguments: + + [DEP_ID]... + + Reference to a package to add as a dependency + + + + You can reference a package by: + + - `<name>`, like `cargo add serde` (latest version will be used) + + - `<name>@<version-req>`, like `cargo add serde@1` or `cargo add serde@=1.0.38` + + + + Options: + + --no-default-features + + Disable the default features + + + + --default-features + + Re-enable the default features + + + + -F, --features <FEATURES> + + Space or comma separated list of features to activate + + + + --optional + + Mark the dependency as optional + + + + The package name will be exposed as feature of your crate. + + + + --no-optional + + Mark the dependency as required + + + + The package will be removed from your features. + + + + --public + + Mark the dependency as public (unstable) + + + + The dependency can be referenced in your library's public API. + + + + --no-public + + Mark the dependency as private (unstable) + + + + While you can use the crate in your implementation, it cannot be referenced in your public + + API. + + + + --rename <NAME> + + Rename the dependency + + + + Example uses: + + - Depending on multiple versions of a crate + + - Depend on crates with the same name from different registries + + + + --ignore-rust-version + + Ignore `rust-version` specification in packages (unstable) + + + + -n, --dry-run + + Don't actually write the manifest + + + + -v, --verbose... + + Use verbose output (-vv very verbose/build.rs output) + + + + -q, --quiet + + Do not print cargo log messages + + + + --color <WHEN> + + Coloring: auto, always, never + + + + --config <KEY=VALUE> + + Override a configuration value + + + + -Z <FLAG> + + Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + + + -h, --help + + Print help (see a summary with '-h') + + + + Manifest Options: + + --manifest-path <PATH> + + Path to Cargo.toml + + + + --frozen + + Require Cargo.lock and cache are up to date + + + + --locked + + Require Cargo.lock is up to date + + + + --offline + + Run without accessing the network + + + + Package Selection: + + -p, --package [<SPEC>] + + Package to modify + + + + Source: + + --path <PATH> + + Filesystem path to local crate to add + + + + --git <URI> + + Git repository location + + + + Without any other information, cargo will use latest commit on the main branch. + + + + --branch <BRANCH> + + Git branch to download the crate from + + + + --tag <TAG> + + Git tag to download the crate from + + + + --rev <REV> + + Git reference to download the crate from + + + + This is the catch all, handling hashes to named references in remote repositories. + + + + --registry <NAME> + + Package registry for this dependency + + + + Section: + + --dev + + Add as development dependency + + + + Dev-dependencies are not used when compiling a package for building, but are used for + + compiling tests, examples, and benchmarks. + + + + These dependencies are not propagated to other packages which depend on this package. + + + + --build + + Add as build dependency + + + + Build-dependencies are the only dependencies available for use by build scripts + + (`build.rs` files). + + + + --target <TARGET> + + Add as dependency to the given target platform + + + + Run `cargo help add` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_add/infer_prerelease/mod.rs b/tests/testsuite/cargo_add/infer_prerelease/mod.rs index e36b8dd0b801..5cb6dd6cea57 100644 --- a/tests/testsuite/cargo_add/infer_prerelease/mod.rs +++ b/tests/testsuite/cargo_add/infer_prerelease/mod.rs @@ -19,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/infer_prerelease/stderr.log b/tests/testsuite/cargo_add/infer_prerelease/stderr.log deleted file mode 100644 index cf7ff16e6ca9..000000000000 --- a/tests/testsuite/cargo_add/infer_prerelease/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding prerelease_only v0.2.0-alpha.1 to dependencies diff --git a/tests/testsuite/cargo_add/infer_prerelease/stderr.term.svg b/tests/testsuite/cargo_add/infer_prerelease/stderr.term.svg new file mode 100644 index 000000000000..f386862508ea --- /dev/null +++ b/tests/testsuite/cargo_add/infer_prerelease/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding prerelease_only v0.2.0-alpha.1 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/infer_prerelease/stdout.term.svg b/tests/testsuite/cargo_add/infer_prerelease/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/infer_prerelease/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_arg/mod.rs b/tests/testsuite/cargo_add/invalid_arg/mod.rs index 45627df2184c..a8d3c384c412 100644 --- a/tests/testsuite/cargo_add/invalid_arg/mod.rs +++ b/tests/testsuite/cargo_add/invalid_arg/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_arg/stderr.log b/tests/testsuite/cargo_add/invalid_arg/stderr.log deleted file mode 100644 index 96d067ed1fdc..000000000000 --- a/tests/testsuite/cargo_add/invalid_arg/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ -error: unexpected argument '--flag' found - - tip: a similar argument exists: '--tag' - -Usage: cargo add [OPTIONS] [@] ... - cargo add [OPTIONS] --path ... - cargo add [OPTIONS] --git ... - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_add/invalid_arg/stderr.term.svg b/tests/testsuite/cargo_add/invalid_arg/stderr.term.svg new file mode 100644 index 000000000000..3d6cb2041783 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_arg/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + error: unexpected argument '--flag' found + + + + tip: a similar argument exists: '--tag' + + + + Usage: cargo add [OPTIONS] <DEP>[@<VERSION>] ... + + cargo add [OPTIONS] --path <PATH> ... + + cargo add [OPTIONS] --git <URL> ... + + + + For more information, try '--help'. + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/invalid_arg/stdout.term.svg b/tests/testsuite/cargo_add/invalid_arg/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_arg/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_git_name/mod.rs b/tests/testsuite/cargo_add/invalid_git_name/mod.rs index e9b888d3586d..f4d248c00981 100644 --- a/tests/testsuite/cargo_add/invalid_git_name/mod.rs +++ b/tests/testsuite/cargo_add/invalid_git_name/mod.rs @@ -27,8 +27,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_git_name/stderr.log b/tests/testsuite/cargo_add/invalid_git_name/stderr.log deleted file mode 100644 index 68fc4e49d77e..000000000000 --- a/tests/testsuite/cargo_add/invalid_git_name/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating git repository `[ROOTURL]/git-package` -error: the crate `not-in-git@[ROOTURL]/git-package` could not be found at `[ROOTURL]/git-package` diff --git a/tests/testsuite/cargo_add/invalid_git_name/stderr.term.svg b/tests/testsuite/cargo_add/invalid_git_name/stderr.term.svg new file mode 100644 index 000000000000..5457304a0dd8 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_git_name/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Updating git repository `[ROOTURL]/git-package` + + error: the crate `not-in-git@[ROOTURL]/git-package` could not be found at `[ROOTURL]/git-package` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/invalid_git_name/stdout.term.svg b/tests/testsuite/cargo_add/invalid_git_name/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_git_name/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 50acea2a6558..9df8eb828d7d 100644 --- a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs +++ b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stderr.log b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stderr.log deleted file mode 100644 index 85bd8da0a82c..000000000000 --- a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: cannot override workspace dependency with `--default-features`, either change `workspace.dependencies.foo.default-features` or define the dependency exclusively in the package's manifest diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stderr.term.svg b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stderr.term.svg new file mode 100644 index 000000000000..58080613287e --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: cannot override workspace dependency with `--default-features`, either change `workspace.dependencies.foo.default-features` or define the dependency exclusively in the package's manifest + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stdout.term.svg b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 50acea2a6558..9df8eb828d7d 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 @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stderr.log b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stderr.log deleted file mode 100644 index 85bd8da0a82c..000000000000 --- a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: cannot override workspace dependency with `--default-features`, either change `workspace.dependencies.foo.default-features` or define the dependency exclusively in the package's manifest diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stderr.term.svg b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stderr.term.svg new file mode 100644 index 000000000000..58080613287e --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: cannot override workspace dependency with `--default-features`, either change `workspace.dependencies.foo.default-features` or define the dependency exclusively in the package's manifest + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stdout.term.svg b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 a56d7b5fce13..7fb77c12b16f 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 @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stderr.log b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stderr.log deleted file mode 100644 index 35bcdb6946bf..000000000000 --- a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: cannot override workspace dependency with `--rename`, either change `workspace.dependencies.foo.package` or define the dependency exclusively in the package's manifest diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stderr.term.svg b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stderr.term.svg new file mode 100644 index 000000000000..d2c849296a2a --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: cannot override workspace dependency with `--rename`, either change `workspace.dependencies.foo.package` or define the dependency exclusively in the package's manifest + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stdout.term.svg b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_manifest/mod.rs b/tests/testsuite/cargo_add/invalid_manifest/mod.rs index 488f543d468d..07ba05c2f814 100644 --- a/tests/testsuite/cargo_add/invalid_manifest/mod.rs +++ b/tests/testsuite/cargo_add/invalid_manifest/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_manifest/stderr.log b/tests/testsuite/cargo_add/invalid_manifest/stderr.log deleted file mode 100644 index 47684f599f09..000000000000 --- a/tests/testsuite/cargo_add/invalid_manifest/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ -error: invalid string -expected `"`, `'` - --> Cargo.toml:8:7 - | -8 | key = invalid-value - | ^ - | diff --git a/tests/testsuite/cargo_add/invalid_manifest/stderr.term.svg b/tests/testsuite/cargo_add/invalid_manifest/stderr.term.svg new file mode 100644 index 000000000000..b3b92f944511 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_manifest/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + error: invalid string + + expected `"`, `'` + + --> Cargo.toml:8:7 + + | + + 8 | key = invalid-value + + | ^ + + | + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/invalid_manifest/stdout.term.svg b/tests/testsuite/cargo_add/invalid_manifest/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_manifest/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_name_external/mod.rs b/tests/testsuite/cargo_add/invalid_name_external/mod.rs index 7fc0868f4c39..e2c06dfd9676 100644 --- a/tests/testsuite/cargo_add/invalid_name_external/mod.rs +++ b/tests/testsuite/cargo_add/invalid_name_external/mod.rs @@ -18,8 +18,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_name_external/stderr.log b/tests/testsuite/cargo_add/invalid_name_external/stderr.log deleted file mode 100644 index 5e574cedad0b..000000000000 --- a/tests/testsuite/cargo_add/invalid_name_external/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index -error: the crate `lets_hope_nobody_ever_publishes_this_crate` could not be found in registry index. diff --git a/tests/testsuite/cargo_add/invalid_name_external/stderr.term.svg b/tests/testsuite/cargo_add/invalid_name_external/stderr.term.svg new file mode 100644 index 000000000000..41911c68f6ce --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_name_external/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Updating `dummy-registry` index + + error: the crate `lets_hope_nobody_ever_publishes_this_crate` could not be found in registry index. + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/invalid_name_external/stdout.term.svg b/tests/testsuite/cargo_add/invalid_name_external/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_name_external/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_path/mod.rs b/tests/testsuite/cargo_add/invalid_path/mod.rs index 0b3a5ec8d639..2fb213c40a73 100644 --- a/tests/testsuite/cargo_add/invalid_path/mod.rs +++ b/tests/testsuite/cargo_add/invalid_path/mod.rs @@ -18,8 +18,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_path/stderr.log b/tests/testsuite/cargo_add/invalid_path/stderr.log deleted file mode 100644 index f6c40433062e..000000000000 --- a/tests/testsuite/cargo_add/invalid_path/stderr.log +++ /dev/null @@ -1,10 +0,0 @@ -error: failed to load source for dependency `cargo-list-test-fixture` - -Caused by: - Unable to update [ROOT]/case/tests/fixtures/local - -Caused by: - failed to read `[ROOT]/case/tests/fixtures/local/Cargo.toml` - -Caused by: - [..] diff --git a/tests/testsuite/cargo_add/invalid_path/stderr.term.svg b/tests/testsuite/cargo_add/invalid_path/stderr.term.svg new file mode 100644 index 000000000000..10ec7472ec67 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_path/stderr.term.svg @@ -0,0 +1,44 @@ + + + + + + error: failed to load source for dependency `cargo-list-test-fixture` + + + + Caused by: + + Unable to update [ROOT]/case/tests/fixtures/local + + + + Caused by: + + failed to read `[ROOT]/case/tests/fixtures/local/Cargo.toml` + + + + Caused by: + + No such file or directory (os error 2) + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/invalid_path/stdout.term.svg b/tests/testsuite/cargo_add/invalid_path/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_path/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_path_name/mod.rs b/tests/testsuite/cargo_add/invalid_path_name/mod.rs index 264a3f1ee97c..1f0ccb8bff41 100644 --- a/tests/testsuite/cargo_add/invalid_path_name/mod.rs +++ b/tests/testsuite/cargo_add/invalid_path_name/mod.rs @@ -30,8 +30,8 @@ fn case() { .current_dir(&cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_path_name/stderr.log b/tests/testsuite/cargo_add/invalid_path_name/stderr.log deleted file mode 100644 index b35ea8233777..000000000000 --- a/tests/testsuite/cargo_add/invalid_path_name/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: the crate `not-at-path@[ROOT]/case/dependency` could not be found at `[ROOT]/case/dependency` diff --git a/tests/testsuite/cargo_add/invalid_path_name/stderr.term.svg b/tests/testsuite/cargo_add/invalid_path_name/stderr.term.svg new file mode 100644 index 000000000000..740bc88b8881 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_path_name/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: the crate `not-at-path@[ROOT]/case/dependency` could not be found at `[ROOT]/case/dependency` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/invalid_path_name/stdout.term.svg b/tests/testsuite/cargo_add/invalid_path_name/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_path_name/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_path_self/mod.rs b/tests/testsuite/cargo_add/invalid_path_self/mod.rs index 627d46a6b55c..a8e8bfbcbff3 100644 --- a/tests/testsuite/cargo_add/invalid_path_self/mod.rs +++ b/tests/testsuite/cargo_add/invalid_path_self/mod.rs @@ -18,8 +18,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_path_self/stderr.log b/tests/testsuite/cargo_add/invalid_path_self/stderr.log deleted file mode 100644 index ba22c5e15860..000000000000 --- a/tests/testsuite/cargo_add/invalid_path_self/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Adding cargo-list-test-fixture (local) to dependencies -error: cannot add `cargo-list-test-fixture` as a dependency to itself diff --git a/tests/testsuite/cargo_add/invalid_path_self/stderr.term.svg b/tests/testsuite/cargo_add/invalid_path_self/stderr.term.svg new file mode 100644 index 000000000000..86a86f6abc08 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_path_self/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Adding cargo-list-test-fixture (local) to dependencies + + error: cannot add `cargo-list-test-fixture` as a dependency to itself + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/invalid_path_self/stdout.term.svg b/tests/testsuite/cargo_add/invalid_path_self/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_path_self/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_target_empty/mod.rs b/tests/testsuite/cargo_add/invalid_target_empty/mod.rs index 93448e86592c..f2a696d4832f 100644 --- a/tests/testsuite/cargo_add/invalid_target_empty/mod.rs +++ b/tests/testsuite/cargo_add/invalid_target_empty/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_target_empty/stderr.log b/tests/testsuite/cargo_add/invalid_target_empty/stderr.log deleted file mode 100644 index 4b1a2c3154b3..000000000000 --- a/tests/testsuite/cargo_add/invalid_target_empty/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ -error: a value is required for '--target ' but none was supplied - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_add/invalid_target_empty/stderr.term.svg b/tests/testsuite/cargo_add/invalid_target_empty/stderr.term.svg new file mode 100644 index 000000000000..e2c9686b35e2 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_target_empty/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + error: a value is required for '--target <TARGET>' but none was supplied + + + + For more information, try '--help'. + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/invalid_target_empty/stdout.term.svg b/tests/testsuite/cargo_add/invalid_target_empty/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_target_empty/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/invalid_vers/mod.rs b/tests/testsuite/cargo_add/invalid_vers/mod.rs index abaa1b29aaac..e5ae8a40f73f 100644 --- a/tests/testsuite/cargo_add/invalid_vers/mod.rs +++ b/tests/testsuite/cargo_add/invalid_vers/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/invalid_vers/stderr.log b/tests/testsuite/cargo_add/invalid_vers/stderr.log deleted file mode 100644 index 64f908eac668..000000000000 --- a/tests/testsuite/cargo_add/invalid_vers/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ -error: invalid version requirement `invalid-version-string` - -Caused by: - unexpected character 'i' while parsing major version number diff --git a/tests/testsuite/cargo_add/invalid_vers/stderr.term.svg b/tests/testsuite/cargo_add/invalid_vers/stderr.term.svg new file mode 100644 index 000000000000..ebcafd8072e1 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_vers/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + error: invalid version requirement `invalid-version-string` + + + + Caused by: + + unexpected character 'i' while parsing major version number + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/invalid_vers/stdout.term.svg b/tests/testsuite/cargo_add/invalid_vers/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/invalid_vers/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/list_features/mod.rs b/tests/testsuite/cargo_add/list_features/mod.rs index be5d0a05f0ea..724cb63d8395 100644 --- a/tests/testsuite/cargo_add/list_features/mod.rs +++ b/tests/testsuite/cargo_add/list_features/mod.rs @@ -24,8 +24,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/list_features/stderr.log b/tests/testsuite/cargo_add/list_features/stderr.log deleted file mode 100644 index 025651f187eb..000000000000 --- a/tests/testsuite/cargo_add/list_features/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - - ears - - eyes - - mouth - - nose diff --git a/tests/testsuite/cargo_add/list_features/stderr.term.svg b/tests/testsuite/cargo_add/list_features/stderr.term.svg new file mode 100644 index 000000000000..25edb5a41b92 --- /dev/null +++ b/tests/testsuite/cargo_add/list_features/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + - ears + + - eyes + + - mouth + + - nose + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/list_features/stdout.term.svg b/tests/testsuite/cargo_add/list_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/list_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/list_features_path/mod.rs b/tests/testsuite/cargo_add/list_features_path/mod.rs index 780c8485b58e..f37ce91d1ff6 100644 --- a/tests/testsuite/cargo_add/list_features_path/mod.rs +++ b/tests/testsuite/cargo_add/list_features_path/mod.rs @@ -35,8 +35,8 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/list_features_path/stderr.log b/tests/testsuite/cargo_add/list_features_path/stderr.log deleted file mode 100644 index 7b32a9df6e7a..000000000000 --- a/tests/testsuite/cargo_add/list_features_path/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Adding your-face (local) to dependencies - Features: - + mouth - + nose - - eyes - - optional-dependency - Updating `dummy-registry` index diff --git a/tests/testsuite/cargo_add/list_features_path/stderr.term.svg b/tests/testsuite/cargo_add/list_features_path/stderr.term.svg new file mode 100644 index 000000000000..ed36f5b1f62a --- /dev/null +++ b/tests/testsuite/cargo_add/list_features_path/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + Adding your-face (local) to dependencies + + Features: + + + mouth + + + nose + + - eyes + + - optional-dependency + + Updating `dummy-registry` index + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/list_features_path/stdout.term.svg b/tests/testsuite/cargo_add/list_features_path/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/list_features_path/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 2e179e5ad8ff..8ca2024b8fcb 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 @@ -40,8 +40,8 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/list_features_path_no_default/stderr.log b/tests/testsuite/cargo_add/list_features_path_no_default/stderr.log deleted file mode 100644 index 483ca153cd21..000000000000 --- a/tests/testsuite/cargo_add/list_features_path_no_default/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Adding your-face (local) to dependencies - Features: - - eyes - - mouth - - nose - - optional-dependency - Updating `dummy-registry` index diff --git a/tests/testsuite/cargo_add/list_features_path_no_default/stderr.term.svg b/tests/testsuite/cargo_add/list_features_path_no_default/stderr.term.svg new file mode 100644 index 000000000000..882a2ac787b1 --- /dev/null +++ b/tests/testsuite/cargo_add/list_features_path_no_default/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + Adding your-face (local) to dependencies + + Features: + + - eyes + + - mouth + + - nose + + - optional-dependency + + Updating `dummy-registry` index + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/list_features_path_no_default/stdout.term.svg b/tests/testsuite/cargo_add/list_features_path_no_default/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/list_features_path_no_default/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/locked_changed/mod.rs b/tests/testsuite/cargo_add/locked_changed/mod.rs index 7111027a4772..26936c3e52ee 100644 --- a/tests/testsuite/cargo_add/locked_changed/mod.rs +++ b/tests/testsuite/cargo_add/locked_changed/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/locked_changed/stderr.log b/tests/testsuite/cargo_add/locked_changed/stderr.log deleted file mode 100644 index ca42c0419bf7..000000000000 --- a/tests/testsuite/cargo_add/locked_changed/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v99999.0.0 to dependencies -error: the manifest file [ROOT]/case/Cargo.toml needs to be updated but --locked was passed to prevent this diff --git a/tests/testsuite/cargo_add/locked_changed/stderr.term.svg b/tests/testsuite/cargo_add/locked_changed/stderr.term.svg new file mode 100644 index 000000000000..d877064ab327 --- /dev/null +++ b/tests/testsuite/cargo_add/locked_changed/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v99999.0.0 to dependencies + + error: the manifest file [ROOT]/case/Cargo.toml needs to be updated but --locked was passed to prevent this + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/locked_changed/stdout.term.svg b/tests/testsuite/cargo_add/locked_changed/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/locked_changed/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/locked_unchanged/mod.rs b/tests/testsuite/cargo_add/locked_unchanged/mod.rs index dd76826583ab..6c94f29123f2 100644 --- a/tests/testsuite/cargo_add/locked_unchanged/mod.rs +++ b/tests/testsuite/cargo_add/locked_unchanged/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/locked_unchanged/stderr.log b/tests/testsuite/cargo_add/locked_unchanged/stderr.log deleted file mode 100644 index f8621cd26c20..000000000000 --- a/tests/testsuite/cargo_add/locked_unchanged/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/locked_unchanged/stderr.term.svg b/tests/testsuite/cargo_add/locked_unchanged/stderr.term.svg new file mode 100644 index 000000000000..65eaf5e84b54 --- /dev/null +++ b/tests/testsuite/cargo_add/locked_unchanged/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v99999.0.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/locked_unchanged/stdout.term.svg b/tests/testsuite/cargo_add/locked_unchanged/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/locked_unchanged/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/lockfile_updated/mod.rs b/tests/testsuite/cargo_add/lockfile_updated/mod.rs index b911d451cac2..f70191c1be4e 100644 --- a/tests/testsuite/cargo_add/lockfile_updated/mod.rs +++ b/tests/testsuite/cargo_add/lockfile_updated/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/lockfile_updated/stderr.log b/tests/testsuite/cargo_add/lockfile_updated/stderr.log deleted file mode 100644 index f8621cd26c20..000000000000 --- a/tests/testsuite/cargo_add/lockfile_updated/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/lockfile_updated/stderr.term.svg b/tests/testsuite/cargo_add/lockfile_updated/stderr.term.svg new file mode 100644 index 000000000000..65eaf5e84b54 --- /dev/null +++ b/tests/testsuite/cargo_add/lockfile_updated/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v99999.0.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/lockfile_updated/stdout.term.svg b/tests/testsuite/cargo_add/lockfile_updated/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/lockfile_updated/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/manifest_path_package/mod.rs b/tests/testsuite/cargo_add/manifest_path_package/mod.rs index ae015d49aa53..b8f88cb574b3 100644 --- a/tests/testsuite/cargo_add/manifest_path_package/mod.rs +++ b/tests/testsuite/cargo_add/manifest_path_package/mod.rs @@ -36,8 +36,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/manifest_path_package/stderr.log b/tests/testsuite/cargo_add/manifest_path_package/stderr.log deleted file mode 100644 index c98958c63df1..000000000000 --- a/tests/testsuite/cargo_add/manifest_path_package/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dependencies diff --git a/tests/testsuite/cargo_add/manifest_path_package/stderr.term.svg b/tests/testsuite/cargo_add/manifest_path_package/stderr.term.svg new file mode 100644 index 000000000000..29afd4237cbc --- /dev/null +++ b/tests/testsuite/cargo_add/manifest_path_package/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Adding cargo-list-test-fixture-dependency (local) to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/manifest_path_package/stdout.term.svg b/tests/testsuite/cargo_add/manifest_path_package/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/manifest_path_package/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/merge_activated_features/mod.rs b/tests/testsuite/cargo_add/merge_activated_features/mod.rs index 45b6b359dcd2..28924fe5691f 100644 --- a/tests/testsuite/cargo_add/merge_activated_features/mod.rs +++ b/tests/testsuite/cargo_add/merge_activated_features/mod.rs @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/merge_activated_features/stderr.log b/tests/testsuite/cargo_add/merge_activated_features/stderr.log deleted file mode 100644 index 6c3a6ed1da38..000000000000 --- a/tests/testsuite/cargo_add/merge_activated_features/stderr.log +++ /dev/null @@ -1,10 +0,0 @@ - Adding foo (workspace) to dependencies - Features as of v0.0.0: - + default-base - + default-merge-base - + default-test-base - + merge - + merge-base - + test - + test-base - - unrelated diff --git a/tests/testsuite/cargo_add/merge_activated_features/stderr.term.svg b/tests/testsuite/cargo_add/merge_activated_features/stderr.term.svg new file mode 100644 index 000000000000..d34a82a846da --- /dev/null +++ b/tests/testsuite/cargo_add/merge_activated_features/stderr.term.svg @@ -0,0 +1,45 @@ + + + + + + Adding foo (workspace) to dependencies + + Features as of v0.0.0: + + + default-base + + + default-merge-base + + + default-test-base + + + merge + + + merge-base + + + test + + + test-base + + - unrelated + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/merge_activated_features/stdout.term.svg b/tests/testsuite/cargo_add/merge_activated_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/merge_activated_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 f818b1c68d08..ae4a2f2df617 100644 --- a/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs +++ b/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs @@ -35,8 +35,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.log b/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.log deleted file mode 100644 index 72fd9fc9d4a2..000000000000 --- a/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: feature `nose` must be qualified by the dependency it's being activated for, like `my-package1/nose`, `your-face/nose` diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.term.svg b/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.term.svg new file mode 100644 index 000000000000..d87fe5836e18 --- /dev/null +++ b/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: feature `nose` must be qualified by the dependency it's being activated for, like `my-package1/nose`, `your-face/nose` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_features/stdout.term.svg b/tests/testsuite/cargo_add/multiple_conflicts_with_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/multiple_conflicts_with_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 ad68456df1e0..68c4dececaab 100644 --- a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs +++ b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stderr.log b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stderr.log deleted file mode 100644 index e83250e73899..000000000000 --- a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: cannot specify multiple crates with `--rename` diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stderr.term.svg b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stderr.term.svg new file mode 100644 index 000000000000..3f74a9d1270d --- /dev/null +++ b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: cannot specify multiple crates with `--rename` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stdout.term.svg b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/namever/mod.rs b/tests/testsuite/cargo_add/namever/mod.rs index 03c9ab4cc570..03cdc24c4db9 100644 --- a/tests/testsuite/cargo_add/namever/mod.rs +++ b/tests/testsuite/cargo_add/namever/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/namever/stderr.log b/tests/testsuite/cargo_add/namever/stderr.log deleted file mode 100644 index 1aea8e1f7737..000000000000 --- a/tests/testsuite/cargo_add/namever/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 >=0.1.1 to dependencies - Adding my-package2 v0.2.3 to dependencies - Adding my-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/namever/stderr.term.svg b/tests/testsuite/cargo_add/namever/stderr.term.svg new file mode 100644 index 000000000000..1b189d29961b --- /dev/null +++ b/tests/testsuite/cargo_add/namever/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package1 >=0.1.1 to dependencies + + Adding my-package2 v0.2.3 to dependencies + + Adding my-package v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/namever/stdout.log b/tests/testsuite/cargo_add/namever/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/namever/stdout.term.svg b/tests/testsuite/cargo_add/namever/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/namever/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/no_args/mod.rs b/tests/testsuite/cargo_add/no_args/mod.rs index 9a57b3c87d86..0acb2d02231f 100644 --- a/tests/testsuite/cargo_add/no_args/mod.rs +++ b/tests/testsuite/cargo_add/no_args/mod.rs @@ -17,8 +17,8 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/no_args/stderr.log b/tests/testsuite/cargo_add/no_args/stderr.log deleted file mode 100644 index 0274950a5f86..000000000000 --- a/tests/testsuite/cargo_add/no_args/stderr.log +++ /dev/null @@ -1,8 +0,0 @@ -error: the following required arguments were not provided: - |--git > - -Usage: cargo add [OPTIONS] [@] ... - cargo add [OPTIONS] --path ... - cargo add [OPTIONS] --git ... - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_add/no_args/stderr.term.svg b/tests/testsuite/cargo_add/no_args/stderr.term.svg new file mode 100644 index 000000000000..e158187cab16 --- /dev/null +++ b/tests/testsuite/cargo_add/no_args/stderr.term.svg @@ -0,0 +1,38 @@ + + + + + + error: the following required arguments were not provided: + + <DEP_ID|--path <PATH>|--git <URI>> + + + + Usage: cargo add [OPTIONS] <DEP>[@<VERSION>] ... + + cargo add [OPTIONS] --path <PATH> ... + + cargo add [OPTIONS] --git <URL> ... + + + + For more information, try '--help'. + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/no_args/stdout.term.svg b/tests/testsuite/cargo_add/no_args/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/no_args/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/no_default_features/mod.rs b/tests/testsuite/cargo_add/no_default_features/mod.rs index 6824244e6413..847fa27d074f 100644 --- a/tests/testsuite/cargo_add/no_default_features/mod.rs +++ b/tests/testsuite/cargo_add/no_default_features/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/no_default_features/stderr.log b/tests/testsuite/cargo_add/no_default_features/stderr.log deleted file mode 100644 index 0fb065ebda14..000000000000 --- a/tests/testsuite/cargo_add/no_default_features/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v0.4.1 to dependencies diff --git a/tests/testsuite/cargo_add/no_default_features/stderr.term.svg b/tests/testsuite/cargo_add/no_default_features/stderr.term.svg new file mode 100644 index 000000000000..c0af7b70d919 --- /dev/null +++ b/tests/testsuite/cargo_add/no_default_features/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v0.4.1 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/no_default_features/stdout.term.svg b/tests/testsuite/cargo_add/no_default_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/no_default_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/no_optional/mod.rs b/tests/testsuite/cargo_add/no_optional/mod.rs index 042f1de9faac..8c85fb5c06da 100644 --- a/tests/testsuite/cargo_add/no_optional/mod.rs +++ b/tests/testsuite/cargo_add/no_optional/mod.rs @@ -19,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/no_optional/stderr.log b/tests/testsuite/cargo_add/no_optional/stderr.log deleted file mode 100644 index c6dee405bb44..000000000000 --- a/tests/testsuite/cargo_add/no_optional/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to dependencies diff --git a/tests/testsuite/cargo_add/no_optional/stderr.term.svg b/tests/testsuite/cargo_add/no_optional/stderr.term.svg new file mode 100644 index 000000000000..bf9ecff0488c --- /dev/null +++ b/tests/testsuite/cargo_add/no_optional/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/no_optional/stdout.term.svg b/tests/testsuite/cargo_add/no_optional/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/no_optional/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/no_public/mod.rs b/tests/testsuite/cargo_add/no_public/mod.rs index b435df9deab6..e3cb20ba462d 100644 --- a/tests/testsuite/cargo_add/no_public/mod.rs +++ b/tests/testsuite/cargo_add/no_public/mod.rs @@ -19,8 +19,8 @@ fn case() { .masquerade_as_nightly_cargo(&["public-dependency"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/no_public/stderr.log b/tests/testsuite/cargo_add/no_public/stderr.log deleted file mode 100644 index c6dee405bb44..000000000000 --- a/tests/testsuite/cargo_add/no_public/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to dependencies diff --git a/tests/testsuite/cargo_add/no_public/stderr.term.svg b/tests/testsuite/cargo_add/no_public/stderr.term.svg new file mode 100644 index 000000000000..bf9ecff0488c --- /dev/null +++ b/tests/testsuite/cargo_add/no_public/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/no_public/stdout.term.svg b/tests/testsuite/cargo_add/no_public/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/no_public/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/offline_empty_cache/mod.rs b/tests/testsuite/cargo_add/offline_empty_cache/mod.rs index 5fd1e56971fa..3e9e5c766716 100644 --- a/tests/testsuite/cargo_add/offline_empty_cache/mod.rs +++ b/tests/testsuite/cargo_add/offline_empty_cache/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/offline_empty_cache/stderr.log b/tests/testsuite/cargo_add/offline_empty_cache/stderr.log deleted file mode 100644 index e0260b795159..000000000000 --- a/tests/testsuite/cargo_add/offline_empty_cache/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: the crate `my-package` could not be found in registry index. diff --git a/tests/testsuite/cargo_add/offline_empty_cache/stderr.term.svg b/tests/testsuite/cargo_add/offline_empty_cache/stderr.term.svg new file mode 100644 index 000000000000..7d327e948ae7 --- /dev/null +++ b/tests/testsuite/cargo_add/offline_empty_cache/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: the crate `my-package` could not be found in registry index. + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/offline_empty_cache/stdout.term.svg b/tests/testsuite/cargo_add/offline_empty_cache/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/offline_empty_cache/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/optional/mod.rs b/tests/testsuite/cargo_add/optional/mod.rs index 4a9ede95cd84..68efa0d6f3a8 100644 --- a/tests/testsuite/cargo_add/optional/mod.rs +++ b/tests/testsuite/cargo_add/optional/mod.rs @@ -19,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/optional/stderr.log b/tests/testsuite/cargo_add/optional/stderr.log deleted file mode 100644 index baa1ab663a09..000000000000 --- a/tests/testsuite/cargo_add/optional/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to optional dependencies - Adding feature `my-package` diff --git a/tests/testsuite/cargo_add/optional/stderr.term.svg b/tests/testsuite/cargo_add/optional/stderr.term.svg new file mode 100644 index 000000000000..9530e3efaddc --- /dev/null +++ b/tests/testsuite/cargo_add/optional/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to optional dependencies + + Adding feature `my-package` + + + + + + diff --git a/tests/testsuite/cargo_add/optional/stdout.log b/tests/testsuite/cargo_add/optional/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/optional/stdout.term.svg b/tests/testsuite/cargo_add/optional/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/optional/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_default_features/mod.rs index 6994260abf6d..fa9214e8a795 100644 --- a/tests/testsuite/cargo_add/overwrite_default_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_default_features/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_default_features/stderr.log b/tests/testsuite/cargo_add/overwrite_default_features/stderr.log deleted file mode 100644 index 0fb065ebda14..000000000000 --- a/tests/testsuite/cargo_add/overwrite_default_features/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v0.4.1 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_default_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_default_features/stderr.term.svg new file mode 100644 index 000000000000..c0af7b70d919 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_default_features/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v0.4.1 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_default_features/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_default_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_default_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 6824244e6413..847fa27d074f 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 @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.log b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.log deleted file mode 100644 index 0fb065ebda14..000000000000 --- a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v0.4.1 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.term.svg new file mode 100644 index 000000000000..c0af7b70d919 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v0.4.1 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_features/mod.rs b/tests/testsuite/cargo_add/overwrite_features/mod.rs index 6e6a258dee32..014510877034 100644 --- a/tests/testsuite/cargo_add/overwrite_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_features/mod.rs @@ -24,8 +24,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_features/stderr.log b/tests/testsuite/cargo_add/overwrite_features/stderr.log deleted file mode 100644 index 01cd92297500..000000000000 --- a/tests/testsuite/cargo_add/overwrite_features/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - + eyes - + nose - - ears - - mouth diff --git a/tests/testsuite/cargo_add/overwrite_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_features/stderr.term.svg new file mode 100644 index 000000000000..a42290820c57 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_features/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + + eyes + + + nose + + - ears + + - mouth + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_features/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 16999968639b..fd376306bb2b 100644 --- a/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs @@ -30,8 +30,8 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.log b/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.log deleted file mode 100644 index 0ddf581407f4..000000000000 --- a/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to optional dependencies - Adding feature `cargo-list-test-fixture-dependency` diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.term.svg new file mode 100644 index 000000000000..cf1ff0cdc1e1 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Adding cargo-list-test-fixture-dependency (local) to optional dependencies + + Adding feature `cargo-list-test-fixture-dependency` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_git_with_path/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_git_with_path/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 60b454d32558..8de95d3a4321 100644 --- a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs @@ -18,8 +18,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.log deleted file mode 100644 index f8e632151947..000000000000 --- a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Adding foo (workspace) to dependencies - Features as of v0.0.0: - + test diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.term.svg new file mode 100644 index 000000000000..50678b9cc126 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Adding foo (workspace) to dependencies + + Features as of v0.0.0: + + + test + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs index 60b454d32558..8de95d3a4321 100644 --- a/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs @@ -18,8 +18,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.log deleted file mode 100644 index d8922c24dcd6..000000000000 --- a/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding foo (workspace) to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.term.svg new file mode 100644 index 000000000000..e7ad7dda7056 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Adding foo (workspace) to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_inherit_noop/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_inherit_noop/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 60b454d32558..8de95d3a4321 100644 --- a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs @@ -18,8 +18,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.log deleted file mode 100644 index ac16f38d5c80..000000000000 --- a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Adding foo (workspace) to optional dependencies - Adding feature `foo` diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.term.svg new file mode 100644 index 000000000000..597ebaf18161 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Adding foo (workspace) to optional dependencies + + Adding feature `foo` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs b/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs index 6ee3a244ab14..732a94539fe7 100644 --- a/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs @@ -37,8 +37,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_inline_features/stderr.log b/tests/testsuite/cargo_add/overwrite_inline_features/stderr.log deleted file mode 100644 index 3d129b4be64f..000000000000 --- a/tests/testsuite/cargo_add/overwrite_inline_features/stderr.log +++ /dev/null @@ -1,8 +0,0 @@ - Updating `dummy-registry` index - Adding unrelateed-crate v99999.0.0 to dependencies - Adding your-face v99999.0.0 to dependencies - Features: - + ears - + eyes - + mouth - + nose diff --git a/tests/testsuite/cargo_add/overwrite_inline_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_inline_features/stderr.term.svg new file mode 100644 index 000000000000..75c350581051 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_inline_features/stderr.term.svg @@ -0,0 +1,40 @@ + + + + + + Updating `dummy-registry` index + + Adding unrelateed-crate v99999.0.0 to dependencies + + Adding your-face v99999.0.0 to dependencies + + Features: + + + ears + + + eyes + + + mouth + + + nose + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_inline_features/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_inline_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_inline_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 934b249e8361..6fe63da38637 100644 --- a/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs @@ -25,8 +25,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.log deleted file mode 100644 index ef93a48849fa..000000000000 --- a/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Adding your-face (local) to dev-dependencies - Features: - + mouth - + nose diff --git a/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.term.svg new file mode 100644 index 000000000000..f817b943d906 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + Adding your-face (local) to dev-dependencies + + Features: + + + mouth + + + nose + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_name_dev_noop/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_name_dev_noop/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_name_dev_noop/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs index 0de6b7d2f815..0ef828a8d108 100644 --- a/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs @@ -25,8 +25,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_name_noop/stderr.log deleted file mode 100644 index 3630edc3e5e4..000000000000 --- a/tests/testsuite/cargo_add/overwrite_name_noop/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Adding your-face (local) to optional dependencies - Features: - + mouth - + nose - Adding feature `your-face` diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_name_noop/stderr.term.svg new file mode 100644 index 000000000000..bccf8cd631d9 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_name_noop/stderr.term.svg @@ -0,0 +1,34 @@ + + + + + + Adding your-face (local) to optional dependencies + + Features: + + + mouth + + + nose + + Adding feature `your-face` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_name_noop/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_name_noop/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 6824244e6413..847fa27d074f 100644 --- a/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.log b/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.log deleted file mode 100644 index 0fb065ebda14..000000000000 --- a/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v0.4.1 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.term.svg new file mode 100644 index 000000000000..c0af7b70d919 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v0.4.1 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_no_default_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_default_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 6994260abf6d..fa9214e8a795 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 @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.log b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.log deleted file mode 100644 index 0fb065ebda14..000000000000 --- a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v0.4.1 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.term.svg new file mode 100644 index 000000000000..c0af7b70d919 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v0.4.1 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs index 042f1de9faac..8c85fb5c06da 100644 --- a/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs @@ -19,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_optional/stderr.log b/tests/testsuite/cargo_add/overwrite_no_optional/stderr.log deleted file mode 100644 index c6dee405bb44..000000000000 --- a/tests/testsuite/cargo_add/overwrite_no_optional/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_no_optional/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_optional/stderr.term.svg new file mode 100644 index 000000000000..bf9ecff0488c --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_optional/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_no_optional/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_no_optional/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_optional/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 4a9ede95cd84..68efa0d6f3a8 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 @@ -19,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.log b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.log deleted file mode 100644 index baa1ab663a09..000000000000 --- a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to optional dependencies - Adding feature `my-package` diff --git a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.term.svg new file mode 100644 index 000000000000..9530e3efaddc --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to optional dependencies + + Adding feature `my-package` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_no_public/mod.rs b/tests/testsuite/cargo_add/overwrite_no_public/mod.rs index b435df9deab6..e3cb20ba462d 100644 --- a/tests/testsuite/cargo_add/overwrite_no_public/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_no_public/mod.rs @@ -19,8 +19,8 @@ fn case() { .masquerade_as_nightly_cargo(&["public-dependency"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_public/stderr.log b/tests/testsuite/cargo_add/overwrite_no_public/stderr.log deleted file mode 100644 index c6dee405bb44..000000000000 --- a/tests/testsuite/cargo_add/overwrite_no_public/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_no_public/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_public/stderr.term.svg new file mode 100644 index 000000000000..bf9ecff0488c --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_public/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_no_public/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_no_public/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_public/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 e95fceeeb63c..6b0f1a5e1554 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 @@ -19,8 +19,8 @@ fn case() { .masquerade_as_nightly_cargo(&["public-dependency"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.log b/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.log deleted file mode 100644 index 92d46fb09725..000000000000 --- a/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to public dependencies diff --git a/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.term.svg new file mode 100644 index 000000000000..e9d71aad9862 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to public dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_no_public_with_public/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_no_public_with_public/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_no_public_with_public/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional/mod.rs index 4a9ede95cd84..68efa0d6f3a8 100644 --- a/tests/testsuite/cargo_add/overwrite_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_optional/mod.rs @@ -19,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_optional/stderr.log b/tests/testsuite/cargo_add/overwrite_optional/stderr.log deleted file mode 100644 index baa1ab663a09..000000000000 --- a/tests/testsuite/cargo_add/overwrite_optional/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to optional dependencies - Adding feature `my-package` diff --git a/tests/testsuite/cargo_add/overwrite_optional/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_optional/stderr.term.svg new file mode 100644 index 000000000000..9530e3efaddc --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_optional/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to optional dependencies + + Adding feature `my-package` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_optional/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_optional/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_optional/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 820613c18f7c..1ddc0046daf3 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 @@ -25,8 +25,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.log b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.log deleted file mode 100644 index 025651f187eb..000000000000 --- a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - - ears - - eyes - - mouth - - nose diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.term.svg new file mode 100644 index 000000000000..25edb5a41b92 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + - ears + + - eyes + + - mouth + + - nose + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 4f39b5613bf0..dabbd06084ab 100644 --- a/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs @@ -19,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.log b/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.log deleted file mode 100644 index 3ab51fa9fa26..000000000000 --- a/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to optional dependencies diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.term.svg new file mode 100644 index 000000000000..3b4ce1664040 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to optional dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_optional/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_optional_with_optional/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_optional_with_optional/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs index 147fb02c6b06..d1a6a902272f 100644 --- a/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs @@ -25,8 +25,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_path_noop/stderr.log deleted file mode 100644 index 3630edc3e5e4..000000000000 --- a/tests/testsuite/cargo_add/overwrite_path_noop/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Adding your-face (local) to optional dependencies - Features: - + mouth - + nose - Adding feature `your-face` diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_path_noop/stderr.term.svg new file mode 100644 index 000000000000..bccf8cd631d9 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_path_noop/stderr.term.svg @@ -0,0 +1,34 @@ + + + + + + Adding your-face (local) to optional dependencies + + Features: + + + mouth + + + nose + + Adding feature `your-face` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_path_noop/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_path_noop/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 769d5977423a..e54295bd9f06 100644 --- a/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs @@ -30,8 +30,8 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.log b/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.log deleted file mode 100644 index 257ed4887149..000000000000 --- a/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding cargo-list-test-fixture-dependency v20.0 to optional dependencies - Adding feature `cargo-list-test-fixture-dependency` diff --git a/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.term.svg new file mode 100644 index 000000000000..4e78e0e4fc0f --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding cargo-list-test-fixture-dependency v20.0 to optional dependencies + + Adding feature `cargo-list-test-fixture-dependency` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_path_with_version/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_path_with_version/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_path_with_version/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 6e6a258dee32..014510877034 100644 --- a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs @@ -24,8 +24,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.log b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.log deleted file mode 100644 index 01cd92297500..000000000000 --- a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - + eyes - + nose - - ears - - mouth diff --git a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.term.svg new file mode 100644 index 000000000000..a42290820c57 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + + eyes + + + nose + + - ears + + - mouth + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_public/mod.rs b/tests/testsuite/cargo_add/overwrite_public/mod.rs index e95fceeeb63c..6b0f1a5e1554 100644 --- a/tests/testsuite/cargo_add/overwrite_public/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_public/mod.rs @@ -19,8 +19,8 @@ fn case() { .masquerade_as_nightly_cargo(&["public-dependency"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_public/stderr.log b/tests/testsuite/cargo_add/overwrite_public/stderr.log deleted file mode 100644 index 92d46fb09725..000000000000 --- a/tests/testsuite/cargo_add/overwrite_public/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to public dependencies diff --git a/tests/testsuite/cargo_add/overwrite_public/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_public/stderr.term.svg new file mode 100644 index 000000000000..e9d71aad9862 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_public/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to public dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_public/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_public/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_public/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 b435df9deab6..e3cb20ba462d 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 @@ -19,8 +19,8 @@ fn case() { .masquerade_as_nightly_cargo(&["public-dependency"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.log b/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.log deleted file mode 100644 index c6dee405bb44..000000000000 --- a/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.term.svg new file mode 100644 index 000000000000..bf9ecff0488c --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_public_with_no_public/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_public_with_no_public/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_public_with_no_public/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 e643e817ac7c..0743da7adc4a 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 @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.log b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.log deleted file mode 100644 index 86806f8b7249..000000000000 --- a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding versioned-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.term.svg new file mode 100644 index 000000000000..91df0712d181 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding versioned-package v99999.0.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 09edae3aa13c..3141e0407c6c 100644 --- a/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.log b/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.log deleted file mode 100644 index 86806f8b7249..000000000000 --- a/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding versioned-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.term.svg new file mode 100644 index 000000000000..91df0712d181 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding versioned-package v99999.0.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_rename_with_rename/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 35f27d38dca0..0501a8aace77 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 @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.log b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.log deleted file mode 100644 index ca365a511263..000000000000 --- a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding versioned-package v0.1.1 to optional dependencies - Adding feature `a1` diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.term.svg new file mode 100644 index 000000000000..ff1ba750c7be --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding versioned-package v0.1.1 to optional dependencies + + Adding feature `a1` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 91a4d3917ddf..2c88e7ca5b4f 100644 --- a/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs @@ -38,8 +38,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.log b/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.log deleted file mode 100644 index 4b02f58ae9e8..000000000000 --- a/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Updating git repository `[ROOTURL]/versioned-package` - Adding versioned-package (git) to optional dependencies - Adding feature `versioned-package` - Updating git repository `[ROOTURL]/versioned-package` diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.term.svg new file mode 100644 index 000000000000..b5f6e347fca1 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + Updating git repository `[ROOTURL]/versioned-package` + + Adding versioned-package (git) to optional dependencies + + Adding feature `versioned-package` + + Updating git repository `[ROOTURL]/versioned-package` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_version_with_git/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_version_with_git/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 16999968639b..fd376306bb2b 100644 --- a/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs @@ -30,8 +30,8 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.log b/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.log deleted file mode 100644 index 0ddf581407f4..000000000000 --- a/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to optional dependencies - Adding feature `cargo-list-test-fixture-dependency` diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.term.svg new file mode 100644 index 000000000000..cf1ff0cdc1e1 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Adding cargo-list-test-fixture-dependency (local) to optional dependencies + + Adding feature `cargo-list-test-fixture-dependency` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_version_with_path/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_version_with_path/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs index 0c00a2d2b1cc..872b5846ba43 100644 --- a/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_with_rename/stderr.log b/tests/testsuite/cargo_add/overwrite_with_rename/stderr.log deleted file mode 100644 index 86806f8b7249..000000000000 --- a/tests/testsuite/cargo_add/overwrite_with_rename/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding versioned-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_with_rename/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_with_rename/stderr.term.svg new file mode 100644 index 000000000000..91df0712d181 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_with_rename/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding versioned-package v99999.0.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_with_rename/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_with_rename/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_with_rename/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs b/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs index 9be71d5ea672..660563fe78d0 100644 --- a/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs @@ -18,8 +18,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.log b/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.log deleted file mode 100644 index fc8b7bd1b45c..000000000000 --- a/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding foo (local) to dependencies diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.term.svg new file mode 100644 index 000000000000..c5c9d97ef243 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Adding foo (local) to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_workspace_dep/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_workspace_dep/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 9be71d5ea672..660563fe78d0 100644 --- a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs @@ -18,8 +18,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stderr.log b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stderr.log deleted file mode 100644 index 7db502318147..000000000000 --- a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stderr.log +++ /dev/null @@ -1,10 +0,0 @@ - Adding foo (local) to dependencies - Features: - + default-base - + default-merge-base - + default-test-base - + test - + test-base - - merge - - merge-base - - unrelated diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stderr.term.svg new file mode 100644 index 000000000000..2fcd493afdfa --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stderr.term.svg @@ -0,0 +1,45 @@ + + + + + + Adding foo (local) to dependencies + + Features: + + + default-base + + + default-merge-base + + + default-test-base + + + test + + + test-base + + - merge + + - merge-base + + - unrelated + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stdout.term.svg b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/path/mod.rs b/tests/testsuite/cargo_add/path/mod.rs index 16999968639b..fd376306bb2b 100644 --- a/tests/testsuite/cargo_add/path/mod.rs +++ b/tests/testsuite/cargo_add/path/mod.rs @@ -30,8 +30,8 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/path/stderr.log b/tests/testsuite/cargo_add/path/stderr.log deleted file mode 100644 index c98958c63df1..000000000000 --- a/tests/testsuite/cargo_add/path/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dependencies diff --git a/tests/testsuite/cargo_add/path/stderr.term.svg b/tests/testsuite/cargo_add/path/stderr.term.svg new file mode 100644 index 000000000000..29afd4237cbc --- /dev/null +++ b/tests/testsuite/cargo_add/path/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Adding cargo-list-test-fixture-dependency (local) to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/path/stdout.log b/tests/testsuite/cargo_add/path/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/path/stdout.term.svg b/tests/testsuite/cargo_add/path/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/path/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/path_dev/mod.rs b/tests/testsuite/cargo_add/path_dev/mod.rs index 29c71d0fdddc..373b84c8c2f7 100644 --- a/tests/testsuite/cargo_add/path_dev/mod.rs +++ b/tests/testsuite/cargo_add/path_dev/mod.rs @@ -30,8 +30,8 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/path_dev/stderr.log b/tests/testsuite/cargo_add/path_dev/stderr.log deleted file mode 100644 index a6ffd22940cf..000000000000 --- a/tests/testsuite/cargo_add/path_dev/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dev-dependencies diff --git a/tests/testsuite/cargo_add/path_dev/stderr.term.svg b/tests/testsuite/cargo_add/path_dev/stderr.term.svg new file mode 100644 index 000000000000..e25717d7a3d0 --- /dev/null +++ b/tests/testsuite/cargo_add/path_dev/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Adding cargo-list-test-fixture-dependency (local) to dev-dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/path_dev/stdout.term.svg b/tests/testsuite/cargo_add/path_dev/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/path_dev/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/path_inferred_name/mod.rs b/tests/testsuite/cargo_add/path_inferred_name/mod.rs index 16999968639b..fd376306bb2b 100644 --- a/tests/testsuite/cargo_add/path_inferred_name/mod.rs +++ b/tests/testsuite/cargo_add/path_inferred_name/mod.rs @@ -30,8 +30,8 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/path_inferred_name/stderr.log b/tests/testsuite/cargo_add/path_inferred_name/stderr.log deleted file mode 100644 index c98958c63df1..000000000000 --- a/tests/testsuite/cargo_add/path_inferred_name/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dependencies diff --git a/tests/testsuite/cargo_add/path_inferred_name/stderr.term.svg b/tests/testsuite/cargo_add/path_inferred_name/stderr.term.svg new file mode 100644 index 000000000000..29afd4237cbc --- /dev/null +++ b/tests/testsuite/cargo_add/path_inferred_name/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Adding cargo-list-test-fixture-dependency (local) to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/path_inferred_name/stdout.term.svg b/tests/testsuite/cargo_add/path_inferred_name/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/path_inferred_name/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 1313677a3481..3dd158e3f4a2 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 @@ -18,8 +18,8 @@ fn case() { .current_dir(&cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stderr.log b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stderr.log deleted file mode 100644 index 791ca6008e16..000000000000 --- a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: `your-face/nose` is unsupported when inferring the crate name, use `nose` diff --git a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stderr.term.svg b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stderr.term.svg new file mode 100644 index 000000000000..48c9ae87ddd2 --- /dev/null +++ b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: `your-face/nose` is unsupported when inferring the crate name, use `nose` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stdout.term.svg b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/path_normalized_name/mod.rs b/tests/testsuite/cargo_add/path_normalized_name/mod.rs index 22273d0fdee8..9d1063d98386 100644 --- a/tests/testsuite/cargo_add/path_normalized_name/mod.rs +++ b/tests/testsuite/cargo_add/path_normalized_name/mod.rs @@ -30,8 +30,8 @@ fn case() { .current_dir(&cwd) .assert() .failure() // Fuzzy searching for paths isn't supported at this time - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/path_normalized_name/stderr.log b/tests/testsuite/cargo_add/path_normalized_name/stderr.log deleted file mode 100644 index 59b35e3c4b16..000000000000 --- a/tests/testsuite/cargo_add/path_normalized_name/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: the crate `cargo_list_test_fixture_dependency@[ROOT]/case/dependency` could not be found at `[ROOT]/case/dependency` diff --git a/tests/testsuite/cargo_add/path_normalized_name/stderr.term.svg b/tests/testsuite/cargo_add/path_normalized_name/stderr.term.svg new file mode 100644 index 000000000000..f5248c043dd0 --- /dev/null +++ b/tests/testsuite/cargo_add/path_normalized_name/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: the crate `cargo_list_test_fixture_dependency@[ROOT]/case/dependency` could not be found at `[ROOT]/case/dependency` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/path_normalized_name/stdout.term.svg b/tests/testsuite/cargo_add/path_normalized_name/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/path_normalized_name/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 d71529685e82..c0519ef7df34 100644 --- a/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs +++ b/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs @@ -24,8 +24,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.log b/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.log deleted file mode 100644 index 025651f187eb..000000000000 --- a/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - - ears - - eyes - - mouth - - nose diff --git a/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.term.svg b/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.term.svg new file mode 100644 index 000000000000..25edb5a41b92 --- /dev/null +++ b/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + - ears + + - eyes + + - mouth + + - nose + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/preserve_dep_std_table/stdout.term.svg b/tests/testsuite/cargo_add/preserve_dep_std_table/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/preserve_dep_std_table/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/preserve_features_table/mod.rs b/tests/testsuite/cargo_add/preserve_features_table/mod.rs index d71529685e82..c0519ef7df34 100644 --- a/tests/testsuite/cargo_add/preserve_features_table/mod.rs +++ b/tests/testsuite/cargo_add/preserve_features_table/mod.rs @@ -24,8 +24,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/preserve_features_table/stderr.log b/tests/testsuite/cargo_add/preserve_features_table/stderr.log deleted file mode 100644 index 025651f187eb..000000000000 --- a/tests/testsuite/cargo_add/preserve_features_table/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - - ears - - eyes - - mouth - - nose diff --git a/tests/testsuite/cargo_add/preserve_features_table/stderr.term.svg b/tests/testsuite/cargo_add/preserve_features_table/stderr.term.svg new file mode 100644 index 000000000000..25edb5a41b92 --- /dev/null +++ b/tests/testsuite/cargo_add/preserve_features_table/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + - ears + + - eyes + + - mouth + + - nose + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/preserve_features_table/stdout.term.svg b/tests/testsuite/cargo_add/preserve_features_table/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/preserve_features_table/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/preserve_sorted/mod.rs b/tests/testsuite/cargo_add/preserve_sorted/mod.rs index 57cd63a329f8..0569a97bd946 100644 --- a/tests/testsuite/cargo_add/preserve_sorted/mod.rs +++ b/tests/testsuite/cargo_add/preserve_sorted/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/preserve_sorted/stderr.log b/tests/testsuite/cargo_add/preserve_sorted/stderr.log deleted file mode 100644 index a097e209c172..000000000000 --- a/tests/testsuite/cargo_add/preserve_sorted/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding toml v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/preserve_sorted/stderr.term.svg b/tests/testsuite/cargo_add/preserve_sorted/stderr.term.svg new file mode 100644 index 000000000000..3d2df00d4d6a --- /dev/null +++ b/tests/testsuite/cargo_add/preserve_sorted/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding toml v99999.0.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/preserve_sorted/stdout.term.svg b/tests/testsuite/cargo_add/preserve_sorted/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/preserve_sorted/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/preserve_unsorted/mod.rs b/tests/testsuite/cargo_add/preserve_unsorted/mod.rs index 57cd63a329f8..0569a97bd946 100644 --- a/tests/testsuite/cargo_add/preserve_unsorted/mod.rs +++ b/tests/testsuite/cargo_add/preserve_unsorted/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/preserve_unsorted/stderr.log b/tests/testsuite/cargo_add/preserve_unsorted/stderr.log deleted file mode 100644 index a097e209c172..000000000000 --- a/tests/testsuite/cargo_add/preserve_unsorted/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding toml v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/preserve_unsorted/stderr.term.svg b/tests/testsuite/cargo_add/preserve_unsorted/stderr.term.svg new file mode 100644 index 000000000000..3d2df00d4d6a --- /dev/null +++ b/tests/testsuite/cargo_add/preserve_unsorted/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding toml v99999.0.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/preserve_unsorted/stdout.term.svg b/tests/testsuite/cargo_add/preserve_unsorted/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/preserve_unsorted/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/public/mod.rs b/tests/testsuite/cargo_add/public/mod.rs index e95fceeeb63c..6b0f1a5e1554 100644 --- a/tests/testsuite/cargo_add/public/mod.rs +++ b/tests/testsuite/cargo_add/public/mod.rs @@ -19,8 +19,8 @@ fn case() { .masquerade_as_nightly_cargo(&["public-dependency"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/public/stderr.log b/tests/testsuite/cargo_add/public/stderr.log deleted file mode 100644 index 92d46fb09725..000000000000 --- a/tests/testsuite/cargo_add/public/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v0.1.0 to public dependencies diff --git a/tests/testsuite/cargo_add/public/stderr.term.svg b/tests/testsuite/cargo_add/public/stderr.term.svg new file mode 100644 index 000000000000..e9d71aad9862 --- /dev/null +++ b/tests/testsuite/cargo_add/public/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v0.1.0 to public dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/public/stdout.log b/tests/testsuite/cargo_add/public/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/public/stdout.term.svg b/tests/testsuite/cargo_add/public/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/public/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/quiet/mod.rs b/tests/testsuite/cargo_add/quiet/mod.rs index c570aabd8f72..934e7e4e3a01 100644 --- a/tests/testsuite/cargo_add/quiet/mod.rs +++ b/tests/testsuite/cargo_add/quiet/mod.rs @@ -24,8 +24,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/quiet/stderr.log b/tests/testsuite/cargo_add/quiet/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/quiet/stderr.term.svg b/tests/testsuite/cargo_add/quiet/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/quiet/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/quiet/stdout.log b/tests/testsuite/cargo_add/quiet/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/quiet/stdout.term.svg b/tests/testsuite/cargo_add/quiet/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/quiet/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/registry/mod.rs b/tests/testsuite/cargo_add/registry/mod.rs index c7693f13efa0..12d56cc3418f 100644 --- a/tests/testsuite/cargo_add/registry/mod.rs +++ b/tests/testsuite/cargo_add/registry/mod.rs @@ -33,8 +33,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/registry/stderr.log b/tests/testsuite/cargo_add/registry/stderr.log deleted file mode 100644 index 881c1f130d1a..000000000000 --- a/tests/testsuite/cargo_add/registry/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `alternative` index - Adding my-package1 v99999.0.0 to dependencies - Adding my-package2 v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/registry/stderr.term.svg b/tests/testsuite/cargo_add/registry/stderr.term.svg new file mode 100644 index 000000000000..b08bc8f257d5 --- /dev/null +++ b/tests/testsuite/cargo_add/registry/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `alternative` index + + Adding my-package1 v99999.0.0 to dependencies + + Adding my-package2 v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/registry/stdout.log b/tests/testsuite/cargo_add/registry/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/registry/stdout.term.svg b/tests/testsuite/cargo_add/registry/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/registry/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/rename/mod.rs b/tests/testsuite/cargo_add/rename/mod.rs index 754c078d0362..636ccf5302bb 100644 --- a/tests/testsuite/cargo_add/rename/mod.rs +++ b/tests/testsuite/cargo_add/rename/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rename/stderr.log b/tests/testsuite/cargo_add/rename/stderr.log deleted file mode 100644 index f8621cd26c20..000000000000 --- a/tests/testsuite/cargo_add/rename/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/rename/stderr.term.svg b/tests/testsuite/cargo_add/rename/stderr.term.svg new file mode 100644 index 000000000000..65eaf5e84b54 --- /dev/null +++ b/tests/testsuite/cargo_add/rename/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package v99999.0.0 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/rename/stdout.log b/tests/testsuite/cargo_add/rename/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/rename/stdout.term.svg b/tests/testsuite/cargo_add/rename/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/rename/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/require_weak/mod.rs b/tests/testsuite/cargo_add/require_weak/mod.rs index d71529685e82..c0519ef7df34 100644 --- a/tests/testsuite/cargo_add/require_weak/mod.rs +++ b/tests/testsuite/cargo_add/require_weak/mod.rs @@ -24,8 +24,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/require_weak/stderr.log b/tests/testsuite/cargo_add/require_weak/stderr.log deleted file mode 100644 index 025651f187eb..000000000000 --- a/tests/testsuite/cargo_add/require_weak/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Updating `dummy-registry` index - Adding your-face v99999.0.0 to dependencies - Features: - - ears - - eyes - - mouth - - nose diff --git a/tests/testsuite/cargo_add/require_weak/stderr.term.svg b/tests/testsuite/cargo_add/require_weak/stderr.term.svg new file mode 100644 index 000000000000..25edb5a41b92 --- /dev/null +++ b/tests/testsuite/cargo_add/require_weak/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + Updating `dummy-registry` index + + Adding your-face v99999.0.0 to dependencies + + Features: + + - ears + + - eyes + + - mouth + + - nose + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/require_weak/stdout.term.svg b/tests/testsuite/cargo_add/require_weak/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/require_weak/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/rust_version_ignore/mod.rs b/tests/testsuite/cargo_add/rust_version_ignore/mod.rs index 198aecb76831..05c3ea8f9bc0 100644 --- a/tests/testsuite/cargo_add/rust_version_ignore/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_ignore/mod.rs @@ -27,8 +27,8 @@ fn case() { .masquerade_as_nightly_cargo(&["msrv-policy"]) .assert() .code(0) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rust_version_ignore/stderr.log b/tests/testsuite/cargo_add/rust_version_ignore/stderr.log deleted file mode 100644 index d86b1f37d2e2..000000000000 --- a/tests/testsuite/cargo_add/rust_version_ignore/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding rust-version-user v0.2.1 to dependencies diff --git a/tests/testsuite/cargo_add/rust_version_ignore/stderr.term.svg b/tests/testsuite/cargo_add/rust_version_ignore/stderr.term.svg new file mode 100644 index 000000000000..d42cf7013740 --- /dev/null +++ b/tests/testsuite/cargo_add/rust_version_ignore/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding rust-version-user v0.2.1 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/rust_version_ignore/stdout.term.svg b/tests/testsuite/cargo_add/rust_version_ignore/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/rust_version_ignore/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs b/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs index 5aa25e36d1fa..56e74b91996f 100644 --- a/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs @@ -29,8 +29,8 @@ fn case() { .masquerade_as_nightly_cargo(&["msrv-policy"]) .assert() .failure() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rust_version_incompatible/stderr.log b/tests/testsuite/cargo_add/rust_version_incompatible/stderr.log deleted file mode 100644 index babed5b23ca6..000000000000 --- a/tests/testsuite/cargo_add/rust_version_incompatible/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Updating `dummy-registry` index -error: could not find version of crate `rust-version-user` that satisfies this package's rust-version of 1.56 -help: use `--ignore-rust-version` to override this behavior -note: the lowest rust-version available for `rust-version-user` is 1.66, used in version 0.1.1 diff --git a/tests/testsuite/cargo_add/rust_version_incompatible/stderr.term.svg b/tests/testsuite/cargo_add/rust_version_incompatible/stderr.term.svg new file mode 100644 index 000000000000..0cbb61a4eeaf --- /dev/null +++ b/tests/testsuite/cargo_add/rust_version_incompatible/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + Updating `dummy-registry` index + + error: could not find version of crate `rust-version-user` that satisfies this package's rust-version of 1.56 + + help: use `--ignore-rust-version` to override this behavior + + note: the lowest rust-version available for `rust-version-user` is 1.66, used in version 0.1.1 + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/rust_version_incompatible/stdout.term.svg b/tests/testsuite/cargo_add/rust_version_incompatible/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/rust_version_incompatible/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/rust_version_latest/mod.rs b/tests/testsuite/cargo_add/rust_version_latest/mod.rs index 35247741c26c..0001e72be5bd 100644 --- a/tests/testsuite/cargo_add/rust_version_latest/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_latest/mod.rs @@ -26,8 +26,8 @@ fn case() { .masquerade_as_nightly_cargo(&["msrv-policy"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rust_version_latest/stderr.log b/tests/testsuite/cargo_add/rust_version_latest/stderr.log deleted file mode 100644 index d86b1f37d2e2..000000000000 --- a/tests/testsuite/cargo_add/rust_version_latest/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding rust-version-user v0.2.1 to dependencies diff --git a/tests/testsuite/cargo_add/rust_version_latest/stderr.term.svg b/tests/testsuite/cargo_add/rust_version_latest/stderr.term.svg new file mode 100644 index 000000000000..d42cf7013740 --- /dev/null +++ b/tests/testsuite/cargo_add/rust_version_latest/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding rust-version-user v0.2.1 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/rust_version_latest/stdout.term.svg b/tests/testsuite/cargo_add/rust_version_latest/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/rust_version_latest/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/rust_version_older/mod.rs b/tests/testsuite/cargo_add/rust_version_older/mod.rs index 35247741c26c..0001e72be5bd 100644 --- a/tests/testsuite/cargo_add/rust_version_older/mod.rs +++ b/tests/testsuite/cargo_add/rust_version_older/mod.rs @@ -26,8 +26,8 @@ fn case() { .masquerade_as_nightly_cargo(&["msrv-policy"]) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/rust_version_older/stderr.log b/tests/testsuite/cargo_add/rust_version_older/stderr.log deleted file mode 100644 index 98f8b722bc6f..000000000000 --- a/tests/testsuite/cargo_add/rust_version_older/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index -warning: ignoring `rust-version-user@0.2.1` (which has a rust-version of 1.72) to satisfy this package's rust-version of 1.70 (use `--ignore-rust-version` to override) - Adding rust-version-user v0.1.0 to dependencies diff --git a/tests/testsuite/cargo_add/rust_version_older/stderr.term.svg b/tests/testsuite/cargo_add/rust_version_older/stderr.term.svg new file mode 100644 index 000000000000..3163362eef8f --- /dev/null +++ b/tests/testsuite/cargo_add/rust_version_older/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + Updating `dummy-registry` index + + warning: ignoring `rust-version-user@0.2.1` (which has a rust-version of 1.72) to satisfy this package's rust-version of 1.70 (use `--ignore-rust-version` to override) + + Adding rust-version-user v0.1.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/rust_version_older/stdout.term.svg b/tests/testsuite/cargo_add/rust_version_older/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/rust_version_older/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 efa82f81e398..eceb1b6eb5a3 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 @@ -36,8 +36,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.log b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.log deleted file mode 100644 index 3540f9236cf5..000000000000 --- a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding unrelateed-crate v99999.0.0 to dependencies diff --git a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.term.svg b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.term.svg new file mode 100644 index 000000000000..369c4df74439 --- /dev/null +++ b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding unrelateed-crate v99999.0.0 to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stdout.term.svg b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/target/mod.rs b/tests/testsuite/cargo_add/target/mod.rs index 23f0edfdc5a2..4add96498200 100644 --- a/tests/testsuite/cargo_add/target/mod.rs +++ b/tests/testsuite/cargo_add/target/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/target/stderr.log b/tests/testsuite/cargo_add/target/stderr.log deleted file mode 100644 index 10fbe5775525..000000000000 --- a/tests/testsuite/cargo_add/target/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies for target `i686-unknown-linux-gnu` - Adding my-package2 v99999.0.0 to dependencies for target `i686-unknown-linux-gnu` diff --git a/tests/testsuite/cargo_add/target/stderr.term.svg b/tests/testsuite/cargo_add/target/stderr.term.svg new file mode 100644 index 000000000000..e0d17efb5e8a --- /dev/null +++ b/tests/testsuite/cargo_add/target/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies for target `i686-unknown-linux-gnu` + + Adding my-package2 v99999.0.0 to dependencies for target `i686-unknown-linux-gnu` + + + + + + diff --git a/tests/testsuite/cargo_add/target/stdout.log b/tests/testsuite/cargo_add/target/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/target/stdout.term.svg b/tests/testsuite/cargo_add/target/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/target/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/target_cfg/mod.rs b/tests/testsuite/cargo_add/target_cfg/mod.rs index 9846f58379b8..aca670ca5632 100644 --- a/tests/testsuite/cargo_add/target_cfg/mod.rs +++ b/tests/testsuite/cargo_add/target_cfg/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/target_cfg/stderr.log b/tests/testsuite/cargo_add/target_cfg/stderr.log deleted file mode 100644 index a94b4ba0da4f..000000000000 --- a/tests/testsuite/cargo_add/target_cfg/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Updating `dummy-registry` index - Adding my-package1 v99999.0.0 to dependencies for target `cfg(unix)` - Adding my-package2 v99999.0.0 to dependencies for target `cfg(unix)` diff --git a/tests/testsuite/cargo_add/target_cfg/stderr.term.svg b/tests/testsuite/cargo_add/target_cfg/stderr.term.svg new file mode 100644 index 000000000000..dff95641c2f8 --- /dev/null +++ b/tests/testsuite/cargo_add/target_cfg/stderr.term.svg @@ -0,0 +1,30 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package1 v99999.0.0 to dependencies for target `cfg(unix)` + + Adding my-package2 v99999.0.0 to dependencies for target `cfg(unix)` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/target_cfg/stdout.term.svg b/tests/testsuite/cargo_add/target_cfg/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/target_cfg/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs b/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs index d0d2213ea030..e791fb61b7cd 100644 --- a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs +++ b/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/stderr.log b/tests/testsuite/cargo_add/unknown_inherited_feature/stderr.log deleted file mode 100644 index e66b29e581eb..000000000000 --- a/tests/testsuite/cargo_add/unknown_inherited_feature/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Adding foo (workspace) to dependencies -error: unrecognized feature for crate foo: not_recognized -disabled features: - merge, merge-base, unrelated -enabled features: - default-base, default-merge-base, default-test-base - long-feature-name-because-of-formatting-reasons, test, test-base diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/stderr.term.svg b/tests/testsuite/cargo_add/unknown_inherited_feature/stderr.term.svg new file mode 100644 index 000000000000..73bdc541aabb --- /dev/null +++ b/tests/testsuite/cargo_add/unknown_inherited_feature/stderr.term.svg @@ -0,0 +1,39 @@ + + + + + + Adding foo (workspace) to dependencies + + error: unrecognized feature for crate foo: not_recognized + + disabled features: + + merge, merge-base, unrelated + + enabled features: + + default-base, default-merge-base, default-test-base + + long-feature-name-because-of-formatting-reasons, test, test-base + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/stdout.term.svg b/tests/testsuite/cargo_add/unknown_inherited_feature/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/unknown_inherited_feature/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/vers/mod.rs b/tests/testsuite/cargo_add/vers/mod.rs index 1f097d1b5452..b2f1deddeb12 100644 --- a/tests/testsuite/cargo_add/vers/mod.rs +++ b/tests/testsuite/cargo_add/vers/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/vers/stderr.log b/tests/testsuite/cargo_add/vers/stderr.log deleted file mode 100644 index 910ec255e830..000000000000 --- a/tests/testsuite/cargo_add/vers/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Updating `dummy-registry` index - Adding my-package >=0.1.1 to dependencies diff --git a/tests/testsuite/cargo_add/vers/stderr.term.svg b/tests/testsuite/cargo_add/vers/stderr.term.svg new file mode 100644 index 000000000000..803d72995e76 --- /dev/null +++ b/tests/testsuite/cargo_add/vers/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Updating `dummy-registry` index + + Adding my-package >=0.1.1 to dependencies + + + + + + diff --git a/tests/testsuite/cargo_add/vers/stdout.log b/tests/testsuite/cargo_add/vers/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/vers/stdout.term.svg b/tests/testsuite/cargo_add/vers/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/vers/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/workspace_name/mod.rs b/tests/testsuite/cargo_add/workspace_name/mod.rs index 1e49edb57a49..58eee79daf83 100644 --- a/tests/testsuite/cargo_add/workspace_name/mod.rs +++ b/tests/testsuite/cargo_add/workspace_name/mod.rs @@ -30,8 +30,8 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/workspace_name/stderr.log b/tests/testsuite/cargo_add/workspace_name/stderr.log deleted file mode 100644 index c98958c63df1..000000000000 --- a/tests/testsuite/cargo_add/workspace_name/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dependencies diff --git a/tests/testsuite/cargo_add/workspace_name/stderr.term.svg b/tests/testsuite/cargo_add/workspace_name/stderr.term.svg new file mode 100644 index 000000000000..29afd4237cbc --- /dev/null +++ b/tests/testsuite/cargo_add/workspace_name/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Adding cargo-list-test-fixture-dependency (local) to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/workspace_name/stdout.term.svg b/tests/testsuite/cargo_add/workspace_name/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/workspace_name/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/workspace_path/mod.rs b/tests/testsuite/cargo_add/workspace_path/mod.rs index 16999968639b..fd376306bb2b 100644 --- a/tests/testsuite/cargo_add/workspace_path/mod.rs +++ b/tests/testsuite/cargo_add/workspace_path/mod.rs @@ -30,8 +30,8 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/workspace_path/stderr.log b/tests/testsuite/cargo_add/workspace_path/stderr.log deleted file mode 100644 index c98958c63df1..000000000000 --- a/tests/testsuite/cargo_add/workspace_path/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dependencies diff --git a/tests/testsuite/cargo_add/workspace_path/stderr.term.svg b/tests/testsuite/cargo_add/workspace_path/stderr.term.svg new file mode 100644 index 000000000000..29afd4237cbc --- /dev/null +++ b/tests/testsuite/cargo_add/workspace_path/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Adding cargo-list-test-fixture-dependency (local) to dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/workspace_path/stdout.term.svg b/tests/testsuite/cargo_add/workspace_path/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/workspace_path/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_add/workspace_path_dev/mod.rs b/tests/testsuite/cargo_add/workspace_path_dev/mod.rs index 29c71d0fdddc..373b84c8c2f7 100644 --- a/tests/testsuite/cargo_add/workspace_path_dev/mod.rs +++ b/tests/testsuite/cargo_add/workspace_path_dev/mod.rs @@ -30,8 +30,8 @@ fn case() { .current_dir(&cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_add/workspace_path_dev/stderr.log b/tests/testsuite/cargo_add/workspace_path_dev/stderr.log deleted file mode 100644 index a6ffd22940cf..000000000000 --- a/tests/testsuite/cargo_add/workspace_path_dev/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Adding cargo-list-test-fixture-dependency (local) to dev-dependencies diff --git a/tests/testsuite/cargo_add/workspace_path_dev/stderr.term.svg b/tests/testsuite/cargo_add/workspace_path_dev/stderr.term.svg new file mode 100644 index 000000000000..e25717d7a3d0 --- /dev/null +++ b/tests/testsuite/cargo_add/workspace_path_dev/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Adding cargo-list-test-fixture-dependency (local) to dev-dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_add/workspace_path_dev/stdout.term.svg b/tests/testsuite/cargo_add/workspace_path_dev/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_add/workspace_path_dev/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_bench/help/mod.rs b/tests/testsuite/cargo_bench/help/mod.rs index 104399937b29..ce3c2f3633fc 100644 --- a/tests/testsuite/cargo_bench/help/mod.rs +++ b/tests/testsuite/cargo_bench/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_bench/help/stderr.log b/tests/testsuite/cargo_bench/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_bench/help/stderr.term.svg b/tests/testsuite/cargo_bench/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_bench/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_bench/help/stdout.log b/tests/testsuite/cargo_bench/help/stdout.log deleted file mode 100644 index cfea6e01e416..000000000000 --- a/tests/testsuite/cargo_bench/help/stdout.log +++ /dev/null @@ -1,59 +0,0 @@ -Execute all benchmarks of a local package - -Usage: cargo[EXE] bench [OPTIONS] [BENCHNAME] [-- [ARGS]...] - -Arguments: - [BENCHNAME] If specified, only run benches containing this string in their names - [ARGS]... Arguments for the bench binary - -Options: - --no-run Compile, but don't run benchmarks - --no-fail-fast Run all benchmarks regardless of failure - --ignore-rust-version Ignore `rust-version` specification in packages - --message-format Error format - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package to run benchmarks for - --workspace Benchmark all packages in the workspace - --exclude Exclude packages from the benchmark - --all Alias for --workspace (deprecated) - -Target Selection: - --lib Benchmark only this package's library - --bins Benchmark all binaries - --bin [] Benchmark only the specified binary - --examples Benchmark all examples - --example [] Benchmark only the specified example - --tests Benchmark all test targets - --test [] Benchmark only the specified test target - --benches Benchmark all bench targets - --bench [] Benchmark only the specified bench target - --all-targets Benchmark all targets - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --profile Build artifacts with the specified profile - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help bench` for more detailed information. diff --git a/tests/testsuite/cargo_bench/help/stdout.term.svg b/tests/testsuite/cargo_bench/help/stdout.term.svg new file mode 100644 index 000000000000..e5e5a67ab9b0 --- /dev/null +++ b/tests/testsuite/cargo_bench/help/stdout.term.svg @@ -0,0 +1,140 @@ + + + + + + Execute all benchmarks of a local package + + + + Usage: cargo bench [OPTIONS] [BENCHNAME] [-- [ARGS]...] + + + + Arguments: + + [BENCHNAME] If specified, only run benches containing this string in their names + + [ARGS]... Arguments for the bench binary + + + + Options: + + --no-run Compile, but don't run benchmarks + + --no-fail-fast Run all benchmarks regardless of failure + + --ignore-rust-version Ignore `rust-version` specification in packages + + --message-format <FMT> Error format + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to run benchmarks for + + --workspace Benchmark all packages in the workspace + + --exclude <SPEC> Exclude packages from the benchmark + + --all Alias for --workspace (deprecated) + + + + Target Selection: + + --lib Benchmark only this package's library + + --bins Benchmark all binaries + + --bin [<NAME>] Benchmark only the specified binary + + --examples Benchmark all examples + + --example [<NAME>] Benchmark only the specified example + + --tests Benchmark all test targets + + --test [<NAME>] Benchmark only the specified test target + + --benches Benchmark all bench targets + + --bench [<NAME>] Benchmark only the specified bench target + + --all-targets Benchmark all targets + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help bench` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_bench/no_keep_going/mod.rs b/tests/testsuite/cargo_bench/no_keep_going/mod.rs index f996444d6d28..9c317bf6b8cf 100644 --- a/tests/testsuite/cargo_bench/no_keep_going/mod.rs +++ b/tests/testsuite/cargo_bench/no_keep_going/mod.rs @@ -15,6 +15,6 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_bench/no_keep_going/stderr.log b/tests/testsuite/cargo_bench/no_keep_going/stderr.log deleted file mode 100644 index daaa8f0932bb..000000000000 --- a/tests/testsuite/cargo_bench/no_keep_going/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ -error: unexpected argument '--keep-going' found - - tip: use `--no-fail-fast` to run as many tests as possible regardless of failure - -Usage: cargo[EXE] bench [OPTIONS] [BENCHNAME] [-- [ARGS]...] - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_bench/no_keep_going/stderr.term.svg b/tests/testsuite/cargo_bench/no_keep_going/stderr.term.svg new file mode 100644 index 000000000000..85b1679da398 --- /dev/null +++ b/tests/testsuite/cargo_bench/no_keep_going/stderr.term.svg @@ -0,0 +1,36 @@ + + + + + + error: unexpected argument '--keep-going' found + + + + tip: use `--no-fail-fast` to run as many tests as possible regardless of failure + + + + Usage: cargo bench [OPTIONS] [BENCHNAME] [-- [ARGS]...] + + + + For more information, try '--help'. + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_bench/no_keep_going/stdout.term.svg b/tests/testsuite/cargo_bench/no_keep_going/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_bench/no_keep_going/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_build/help/mod.rs b/tests/testsuite/cargo_build/help/mod.rs index d1271bf1f773..6b53ef137b39 100644 --- a/tests/testsuite/cargo_build/help/mod.rs +++ b/tests/testsuite/cargo_build/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_build/help/stderr.log b/tests/testsuite/cargo_build/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_build/help/stderr.term.svg b/tests/testsuite/cargo_build/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_build/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_build/help/stdout.log b/tests/testsuite/cargo_build/help/stdout.log deleted file mode 100644 index 3918fd44aafb..000000000000 --- a/tests/testsuite/cargo_build/help/stdout.log +++ /dev/null @@ -1,58 +0,0 @@ -Compile a local package and all of its dependencies - -Usage: cargo[EXE] build [OPTIONS] - -Options: - --ignore-rust-version Ignore `rust-version` specification in packages - --future-incompat-report Outputs a future incompatibility report at the end of the build - --message-format Error format - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package to build (see `cargo help pkgid`) - --workspace Build all packages in the workspace - --exclude Exclude packages from the build - --all Alias for --workspace (deprecated) - -Target Selection: - --lib Build only this package's library - --bins Build all binaries - --bin [] Build only the specified binary - --examples Build all examples - --example [] Build only the specified example - --tests Build all test targets - --test [] Build only the specified test target - --benches Build all bench targets - --bench [] Build only the specified bench target - --all-targets Build all targets - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -r, --release Build artifacts in release mode, with optimizations - --profile Build artifacts with the specified profile - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - --out-dir Copy final artifacts to this directory (unstable) - --build-plan Output the build plan in JSON (unstable) - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help build` for more detailed information. diff --git a/tests/testsuite/cargo_build/help/stdout.term.svg b/tests/testsuite/cargo_build/help/stdout.term.svg new file mode 100644 index 000000000000..081b2ce286cc --- /dev/null +++ b/tests/testsuite/cargo_build/help/stdout.term.svg @@ -0,0 +1,138 @@ + + + + + + Compile a local package and all of its dependencies + + + + Usage: cargo build [OPTIONS] + + + + Options: + + --ignore-rust-version Ignore `rust-version` specification in packages + + --future-incompat-report Outputs a future incompatibility report at the end of the build + + --message-format <FMT> Error format + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to build (see `cargo help pkgid`) + + --workspace Build all packages in the workspace + + --exclude <SPEC> Exclude packages from the build + + --all Alias for --workspace (deprecated) + + + + Target Selection: + + --lib Build only this package's library + + --bins Build all binaries + + --bin [<NAME>] Build only the specified binary + + --examples Build all examples + + --example [<NAME>] Build only the specified example + + --tests Build all test targets + + --test [<NAME>] Build only the specified test target + + --benches Build all bench targets + + --bench [<NAME>] Build only the specified bench target + + --all-targets Build all targets + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -r, --release Build artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --out-dir <PATH> Copy final artifacts to this directory (unstable) + + --build-plan Output the build plan in JSON (unstable) + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help build` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_check/help/mod.rs b/tests/testsuite/cargo_check/help/mod.rs index 32d87803fa8a..abd9a73d8423 100644 --- a/tests/testsuite/cargo_check/help/mod.rs +++ b/tests/testsuite/cargo_check/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_check/help/stderr.log b/tests/testsuite/cargo_check/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_check/help/stderr.term.svg b/tests/testsuite/cargo_check/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_check/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_check/help/stdout.log b/tests/testsuite/cargo_check/help/stdout.log deleted file mode 100644 index 7b6289798231..000000000000 --- a/tests/testsuite/cargo_check/help/stdout.log +++ /dev/null @@ -1,56 +0,0 @@ -Check a local package and all of its dependencies for errors - -Usage: cargo[EXE] check [OPTIONS] - -Options: - --ignore-rust-version Ignore `rust-version` specification in packages - --future-incompat-report Outputs a future incompatibility report at the end of the build - --message-format Error format - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package(s) to check - --workspace Check all packages in the workspace - --exclude Exclude packages from the check - --all Alias for --workspace (deprecated) - -Target Selection: - --lib Check only this package's library - --bins Check all binaries - --bin [] Check only the specified binary - --examples Check all examples - --example [] Check only the specified example - --tests Check all test targets - --test [] Check only the specified test target - --benches Check all bench targets - --bench [] Check only the specified bench target - --all-targets Check all targets - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - -r, --release Check artifacts in release mode, with optimizations - --profile Check artifacts with the specified profile - --target [] Check for the target triple - --target-dir Directory for all generated artifacts - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help check` for more detailed information. diff --git a/tests/testsuite/cargo_check/help/stdout.term.svg b/tests/testsuite/cargo_check/help/stdout.term.svg new file mode 100644 index 000000000000..45e782e571ad --- /dev/null +++ b/tests/testsuite/cargo_check/help/stdout.term.svg @@ -0,0 +1,134 @@ + + + + + + Check a local package and all of its dependencies for errors + + + + Usage: cargo check [OPTIONS] + + + + Options: + + --ignore-rust-version Ignore `rust-version` specification in packages + + --future-incompat-report Outputs a future incompatibility report at the end of the build + + --message-format <FMT> Error format + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package(s) to check + + --workspace Check all packages in the workspace + + --exclude <SPEC> Exclude packages from the check + + --all Alias for --workspace (deprecated) + + + + Target Selection: + + --lib Check only this package's library + + --bins Check all binaries + + --bin [<NAME>] Check only the specified binary + + --examples Check all examples + + --example [<NAME>] Check only the specified example + + --tests Check all test targets + + --test [<NAME>] Check only the specified test target + + --benches Check all bench targets + + --bench [<NAME>] Check only the specified bench target + + --all-targets Check all targets + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + -r, --release Check artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Check artifacts with the specified profile + + --target [<TRIPLE>] Check for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help check` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_clean/help/mod.rs b/tests/testsuite/cargo_clean/help/mod.rs index d4efe3c36aaa..34828dc184fb 100644 --- a/tests/testsuite/cargo_clean/help/mod.rs +++ b/tests/testsuite/cargo_clean/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_clean/help/stderr.log b/tests/testsuite/cargo_clean/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_clean/help/stderr.term.svg b/tests/testsuite/cargo_clean/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_clean/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_clean/help/stdout.log b/tests/testsuite/cargo_clean/help/stdout.log deleted file mode 100644 index 80571e5dccb0..000000000000 --- a/tests/testsuite/cargo_clean/help/stdout.log +++ /dev/null @@ -1,30 +0,0 @@ -Remove artifacts that cargo has generated in the past - -Usage: cargo[EXE] clean [OPTIONS] - -Options: - --doc Whether or not to clean just the documentation directory - -n, --dry-run Display what would be deleted without deleting anything - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Package Selection: - -p, --package [] Package to clean artifacts for - -Compilation Options: - -r, --release Whether or not to clean release artifacts - --profile Clean artifacts of the specified profile - --target [] Target triple to clean output for - --target-dir Directory for all generated artifacts - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help clean` for more detailed information. diff --git a/tests/testsuite/cargo_clean/help/stdout.term.svg b/tests/testsuite/cargo_clean/help/stdout.term.svg new file mode 100644 index 000000000000..44ad2e73e90f --- /dev/null +++ b/tests/testsuite/cargo_clean/help/stdout.term.svg @@ -0,0 +1,82 @@ + + + + + + Remove artifacts that cargo has generated in the past + + + + Usage: cargo clean [OPTIONS] + + + + Options: + + --doc Whether or not to clean just the documentation directory + + -n, --dry-run Display what would be deleted without deleting anything + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to clean artifacts for + + + + Compilation Options: + + -r, --release Whether or not to clean release artifacts + + --profile <PROFILE-NAME> Clean artifacts of the specified profile + + --target [<TRIPLE>] Target triple to clean output for + + --target-dir <DIRECTORY> Directory for all generated artifacts + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help clean` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_config/help/mod.rs b/tests/testsuite/cargo_config/help/mod.rs index 20bcef6832a2..ea62e6f51875 100644 --- a/tests/testsuite/cargo_config/help/mod.rs +++ b/tests/testsuite/cargo_config/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_config/help/stderr.log b/tests/testsuite/cargo_config/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_config/help/stderr.term.svg b/tests/testsuite/cargo_config/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_config/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_config/help/stdout.log b/tests/testsuite/cargo_config/help/stdout.log deleted file mode 100644 index 5c14335fc94e..000000000000 --- a/tests/testsuite/cargo_config/help/stdout.log +++ /dev/null @@ -1,19 +0,0 @@ -Inspect configuration values - -Usage: cargo[EXE] config [OPTIONS] - -Commands: - get - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network diff --git a/tests/testsuite/cargo_config/help/stdout.term.svg b/tests/testsuite/cargo_config/help/stdout.term.svg new file mode 100644 index 000000000000..1df38b92b5fe --- /dev/null +++ b/tests/testsuite/cargo_config/help/stdout.term.svg @@ -0,0 +1,60 @@ + + + + + + Inspect configuration values + + + + Usage: cargo config [OPTIONS] <COMMAND> + + + + Commands: + + get + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + + + diff --git a/tests/testsuite/cargo_doc/help/mod.rs b/tests/testsuite/cargo_doc/help/mod.rs index 4fc28adbac1e..bfa1c4a571be 100644 --- a/tests/testsuite/cargo_doc/help/mod.rs +++ b/tests/testsuite/cargo_doc/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_doc/help/stderr.log b/tests/testsuite/cargo_doc/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_doc/help/stderr.term.svg b/tests/testsuite/cargo_doc/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_doc/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_doc/help/stdout.log b/tests/testsuite/cargo_doc/help/stdout.log deleted file mode 100644 index e1a19bedd3b8..000000000000 --- a/tests/testsuite/cargo_doc/help/stdout.log +++ /dev/null @@ -1,53 +0,0 @@ -Build a package's documentation - -Usage: cargo[EXE] doc [OPTIONS] - -Options: - --open Opens the docs in a browser after the operation - --no-deps Don't build documentation for dependencies - --document-private-items Document private items - --ignore-rust-version Ignore `rust-version` specification in packages - --message-format Error format - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package to document - --workspace Document all packages in the workspace - --exclude Exclude packages from the build - --all Alias for --workspace (deprecated) - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Target Selection: - --lib Document only this package's library - --bins Document all binaries - --bin [] Document only the specified binary - --examples Document all examples - --example [] Document only the specified example - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - -r, --release Build artifacts in release mode, with optimizations - --profile Build artifacts with the specified profile - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help doc` for more detailed information. diff --git a/tests/testsuite/cargo_doc/help/stdout.term.svg b/tests/testsuite/cargo_doc/help/stdout.term.svg new file mode 100644 index 000000000000..acb401445359 --- /dev/null +++ b/tests/testsuite/cargo_doc/help/stdout.term.svg @@ -0,0 +1,128 @@ + + + + + + Build a package's documentation + + + + Usage: cargo doc [OPTIONS] + + + + Options: + + --open Opens the docs in a browser after the operation + + --no-deps Don't build documentation for dependencies + + --document-private-items Document private items + + --ignore-rust-version Ignore `rust-version` specification in packages + + --message-format <FMT> Error format + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to document + + --workspace Document all packages in the workspace + + --exclude <SPEC> Exclude packages from the build + + --all Alias for --workspace (deprecated) + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Target Selection: + + --lib Document only this package's library + + --bins Document all binaries + + --bin [<NAME>] Document only the specified binary + + --examples Document all examples + + --example [<NAME>] Document only the specified example + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + -r, --release Build artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help doc` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_fetch/help/mod.rs b/tests/testsuite/cargo_fetch/help/mod.rs index b0f8349f095a..0c15fae08930 100644 --- a/tests/testsuite/cargo_fetch/help/mod.rs +++ b/tests/testsuite/cargo_fetch/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_fetch/help/stderr.log b/tests/testsuite/cargo_fetch/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_fetch/help/stderr.term.svg b/tests/testsuite/cargo_fetch/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_fetch/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_fetch/help/stdout.log b/tests/testsuite/cargo_fetch/help/stdout.log deleted file mode 100644 index 5645a6c033df..000000000000 --- a/tests/testsuite/cargo_fetch/help/stdout.log +++ /dev/null @@ -1,22 +0,0 @@ -Fetch dependencies of a package from the network - -Usage: cargo[EXE] fetch [OPTIONS] - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Compilation Options: - --target [] Fetch dependencies for the target triple - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help fetch` for more detailed information. diff --git a/tests/testsuite/cargo_fetch/help/stdout.term.svg b/tests/testsuite/cargo_fetch/help/stdout.term.svg new file mode 100644 index 000000000000..ba491dd37aae --- /dev/null +++ b/tests/testsuite/cargo_fetch/help/stdout.term.svg @@ -0,0 +1,66 @@ + + + + + + Fetch dependencies of a package from the network + + + + Usage: cargo fetch [OPTIONS] + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Compilation Options: + + --target [<TRIPLE>] Fetch dependencies for the target triple + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help fetch` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_fix/help/mod.rs b/tests/testsuite/cargo_fix/help/mod.rs index 2a43ad544ba7..e9d96aeb0e95 100644 --- a/tests/testsuite/cargo_fix/help/mod.rs +++ b/tests/testsuite/cargo_fix/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_fix/help/stderr.log b/tests/testsuite/cargo_fix/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_fix/help/stderr.term.svg b/tests/testsuite/cargo_fix/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_fix/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_fix/help/stdout.log b/tests/testsuite/cargo_fix/help/stdout.log deleted file mode 100644 index a93215c502d5..000000000000 --- a/tests/testsuite/cargo_fix/help/stdout.log +++ /dev/null @@ -1,60 +0,0 @@ -Automatically fix lint warnings reported by rustc - -Usage: cargo[EXE] fix [OPTIONS] - -Options: - --edition Fix in preparation for the next edition - --edition-idioms Fix warnings to migrate to the idioms of an edition - --broken-code Fix code even if it already has compiler errors - --allow-no-vcs Fix code even if a VCS was not detected - --allow-dirty Fix code even if the working directory is dirty - --allow-staged Fix code even if the working directory has staged changes - --ignore-rust-version Ignore `rust-version` specification in packages - --message-format Error format - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package(s) to fix - --workspace Fix all packages in the workspace - --exclude Exclude packages from the fixes - --all Alias for --workspace (deprecated) - -Target Selection: - --lib Fix only this package's library - --bins Fix all binaries - --bin [] Fix only the specified binary - --examples Fix all examples - --example [] Fix only the specified example - --tests Fix all test targets - --test [] Fix only the specified test target - --benches Fix all bench targets - --bench [] Fix only the specified bench target - --all-targets Fix all targets (default) - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - -r, --release Fix artifacts in release mode, with optimizations - --profile Build artifacts with the specified profile - --target [] Fix for the target triple - --target-dir Directory for all generated artifacts - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help fix` for more detailed information. diff --git a/tests/testsuite/cargo_fix/help/stdout.term.svg b/tests/testsuite/cargo_fix/help/stdout.term.svg new file mode 100644 index 000000000000..5694b60bb64d --- /dev/null +++ b/tests/testsuite/cargo_fix/help/stdout.term.svg @@ -0,0 +1,142 @@ + + + + + + Automatically fix lint warnings reported by rustc + + + + Usage: cargo fix [OPTIONS] + + + + Options: + + --edition Fix in preparation for the next edition + + --edition-idioms Fix warnings to migrate to the idioms of an edition + + --broken-code Fix code even if it already has compiler errors + + --allow-no-vcs Fix code even if a VCS was not detected + + --allow-dirty Fix code even if the working directory is dirty + + --allow-staged Fix code even if the working directory has staged changes + + --ignore-rust-version Ignore `rust-version` specification in packages + + --message-format <FMT> Error format + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package(s) to fix + + --workspace Fix all packages in the workspace + + --exclude <SPEC> Exclude packages from the fixes + + --all Alias for --workspace (deprecated) + + + + Target Selection: + + --lib Fix only this package's library + + --bins Fix all binaries + + --bin [<NAME>] Fix only the specified binary + + --examples Fix all examples + + --example [<NAME>] Fix only the specified example + + --tests Fix all test targets + + --test [<NAME>] Fix only the specified test target + + --benches Fix all bench targets + + --bench [<NAME>] Fix only the specified bench target + + --all-targets Fix all targets (default) + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + -r, --release Fix artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + --target [<TRIPLE>] Fix for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help fix` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_generate_lockfile/help/mod.rs b/tests/testsuite/cargo_generate_lockfile/help/mod.rs index c22fb622f564..d6e439f24701 100644 --- a/tests/testsuite/cargo_generate_lockfile/help/mod.rs +++ b/tests/testsuite/cargo_generate_lockfile/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_generate_lockfile/help/stderr.log b/tests/testsuite/cargo_generate_lockfile/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_generate_lockfile/help/stderr.term.svg b/tests/testsuite/cargo_generate_lockfile/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_generate_lockfile/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_generate_lockfile/help/stdout.log b/tests/testsuite/cargo_generate_lockfile/help/stdout.log deleted file mode 100644 index 5d0bf1359b6c..000000000000 --- a/tests/testsuite/cargo_generate_lockfile/help/stdout.log +++ /dev/null @@ -1,19 +0,0 @@ -Generate the lockfile for a package - -Usage: cargo[EXE] generate-lockfile [OPTIONS] - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help generate-lockfile` for more detailed information. diff --git a/tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg b/tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg new file mode 100644 index 000000000000..9ff4da66e69e --- /dev/null +++ b/tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg @@ -0,0 +1,60 @@ + + + + + + Generate the lockfile for a package + + + + Usage: cargo generate-lockfile [OPTIONS] + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help generate-lockfile` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_git_checkout/help/mod.rs b/tests/testsuite/cargo_git_checkout/help/mod.rs index a11c97870911..e21ab667b4cb 100644 --- a/tests/testsuite/cargo_git_checkout/help/mod.rs +++ b/tests/testsuite/cargo_git_checkout/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_git_checkout/help/stderr.log b/tests/testsuite/cargo_git_checkout/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_git_checkout/help/stderr.term.svg b/tests/testsuite/cargo_git_checkout/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_git_checkout/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_git_checkout/help/stdout.log b/tests/testsuite/cargo_git_checkout/help/stdout.log deleted file mode 100644 index 675090fd344a..000000000000 --- a/tests/testsuite/cargo_git_checkout/help/stdout.log +++ /dev/null @@ -1 +0,0 @@ -The `git-checkout` command has been removed. diff --git a/tests/testsuite/cargo_git_checkout/help/stdout.term.svg b/tests/testsuite/cargo_git_checkout/help/stdout.term.svg new file mode 100644 index 000000000000..0234b8688a4b --- /dev/null +++ b/tests/testsuite/cargo_git_checkout/help/stdout.term.svg @@ -0,0 +1,24 @@ + + + + + + The `git-checkout` command has been removed. + + + + + + diff --git a/tests/testsuite/cargo_help/help/mod.rs b/tests/testsuite/cargo_help/help/mod.rs index ef54d25b321b..0d6121e65277 100644 --- a/tests/testsuite/cargo_help/help/mod.rs +++ b/tests/testsuite/cargo_help/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_help/help/stderr.log b/tests/testsuite/cargo_help/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_help/help/stderr.term.svg b/tests/testsuite/cargo_help/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_help/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_help/help/stdout.log b/tests/testsuite/cargo_help/help/stdout.log deleted file mode 100644 index 1f7a710d6d6f..000000000000 --- a/tests/testsuite/cargo_help/help/stdout.log +++ /dev/null @@ -1,19 +0,0 @@ -Displays help for a cargo subcommand - -Usage: cargo[EXE] help [OPTIONS] [COMMAND] - -Arguments: - [COMMAND] - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network diff --git a/tests/testsuite/cargo_help/help/stdout.term.svg b/tests/testsuite/cargo_help/help/stdout.term.svg new file mode 100644 index 000000000000..7b5338f88d3b --- /dev/null +++ b/tests/testsuite/cargo_help/help/stdout.term.svg @@ -0,0 +1,60 @@ + + + + + + Displays help for a cargo subcommand + + + + Usage: cargo help [OPTIONS] [COMMAND] + + + + Arguments: + + [COMMAND] + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + + + diff --git a/tests/testsuite/cargo_init/auto_git/mod.rs b/tests/testsuite/cargo_init/auto_git/mod.rs index 992fe1d122fa..7e3147b2b06d 100644 --- a/tests/testsuite/cargo_init/auto_git/mod.rs +++ b/tests/testsuite/cargo_init/auto_git/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert!(project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/auto_git/stderr.log b/tests/testsuite/cargo_init/auto_git/stderr.log deleted file mode 100644 index 2411ca5227c6..000000000000 --- a/tests/testsuite/cargo_init/auto_git/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/auto_git/stderr.term.svg b/tests/testsuite/cargo_init/auto_git/stderr.term.svg new file mode 100644 index 000000000000..b8b83dfbb91f --- /dev/null +++ b/tests/testsuite/cargo_init/auto_git/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/auto_git/stdout.term.svg b/tests/testsuite/cargo_init/auto_git/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/auto_git/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 470f4b2de802..2a869fd11e59 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.log deleted file mode 100644 index 9458b0272664..000000000000 --- a/tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.term.svg b/tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.term.svg new file mode 100644 index 000000000000..334d42a0d672 --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_explicit/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit/stdout.term.svg b/tests/testsuite/cargo_init/bin_already_exists_explicit/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_explicit/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 43f5a4194092..e01fcb3fe14d 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 @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("src").is_dir()); diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.log deleted file mode 100644 index 9458b0272664..000000000000 --- a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.term.svg b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.term.svg new file mode 100644 index 000000000000..334d42a0d672 --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stdout.term.svg b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 bcbb78be180f..6227a5b00f05 100644 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.log deleted file mode 100644 index 9458b0272664..000000000000 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.term.svg b/tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.term.svg new file mode 100644 index 000000000000..334d42a0d672 --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit/stdout.term.svg b/tests/testsuite/cargo_init/bin_already_exists_implicit/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 8c6ae8acbea1..0b3449c80974 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 @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("src").is_dir()); diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.log deleted file mode 100644 index 9458b0272664..000000000000 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.term.svg b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.term.svg new file mode 100644 index 000000000000..334d42a0d672 --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stdout.term.svg b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 d07cd385c2c8..cf4644496ad4 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 @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("src/main.rs").is_file()); diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.log deleted file mode 100644 index 9458b0272664..000000000000 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.term.svg b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.term.svg new file mode 100644 index 000000000000..334d42a0d672 --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stdout.term.svg b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 8c6ae8acbea1..0b3449c80974 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 @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("src").is_dir()); diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.log deleted file mode 100644 index 9458b0272664..000000000000 --- a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.term.svg b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.term.svg new file mode 100644 index 000000000000..334d42a0d672 --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stdout.term.svg b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 2be40317722a..e77f7a12717f 100644 --- a/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs +++ b/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs @@ -11,8 +11,8 @@ fn case() { .current_dir(&cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert!(!cwd.join("Cargo.toml").is_file()); } diff --git a/tests/testsuite/cargo_init/both_lib_and_bin/stderr.log b/tests/testsuite/cargo_init/both_lib_and_bin/stderr.log deleted file mode 100644 index 9d635a427251..000000000000 --- a/tests/testsuite/cargo_init/both_lib_and_bin/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: can't specify both lib and binary outputs diff --git a/tests/testsuite/cargo_init/both_lib_and_bin/stderr.term.svg b/tests/testsuite/cargo_init/both_lib_and_bin/stderr.term.svg new file mode 100644 index 000000000000..198301c28ef0 --- /dev/null +++ b/tests/testsuite/cargo_init/both_lib_and_bin/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: can't specify both lib and binary outputs + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/both_lib_and_bin/stdout.term.svg b/tests/testsuite/cargo_init/both_lib_and_bin/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/both_lib_and_bin/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 cc398155c15f..1112cffaca51 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 @@ -13,6 +13,6 @@ fn case() { .current_dir(project_root) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.log b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.log deleted file mode 100644 index 325e832453ed..000000000000 --- a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -error: cannot have a package with multiple libraries, found both `case.rs` and `lib.rs` diff --git a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.term.svg b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.term.svg new file mode 100644 index 000000000000..cefc09db3586 --- /dev/null +++ b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating library package + + error: cannot have a package with multiple libraries, found both `case.rs` and `lib.rs` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stdout.term.svg b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 62fd751d65df..8dcbaf2baefa 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 @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("Cargo.toml").is_file()); diff --git a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.log b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.log deleted file mode 100644 index 8dbd2aaf064f..000000000000 --- a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: cannot have a package with multiple libraries, found both `src/lib.rs` and `lib.rs` diff --git a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.term.svg b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.term.svg new file mode 100644 index 000000000000..1522d9358516 --- /dev/null +++ b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: cannot have a package with multiple libraries, found both `src/lib.rs` and `lib.rs` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stdout.term.svg b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 470f4b2de802..2a869fd11e59 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 @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.log b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.log deleted file mode 100644 index 9458b0272664..000000000000 --- a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.term.svg b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.term.svg new file mode 100644 index 000000000000..334d42a0d672 --- /dev/null +++ b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stdout.term.svg b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 470f4b2de802..2a869fd11e59 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 @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.log b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.log deleted file mode 100644 index 9c36c9c97e42..000000000000 --- a/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating binary (application) package -warning: file `case.rs` seems to be a library file -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.term.svg b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.term.svg new file mode 100644 index 000000000000..4614dae7b57f --- /dev/null +++ b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + Creating binary (application) package + + warning: file `case.rs` seems to be a library file + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stdout.term.svg b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 cd1d2046d33e..3de73b1b04d7 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 @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.log b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.log deleted file mode 100644 index 7063e1dd9709..000000000000 --- a/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating library package -warning: file `case.rs` seems to be a binary (application) file -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.term.svg b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.term.svg new file mode 100644 index 000000000000..9256988f3249 --- /dev/null +++ b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + Creating library package + + warning: file `case.rs` seems to be a binary (application) file + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stdout.term.svg b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 7c1efb243e80..02ef97cdb1f3 100644 --- a/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs +++ b/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/explicit_bin_with_git/stderr.log b/tests/testsuite/cargo_init/explicit_bin_with_git/stderr.log deleted file mode 100644 index 9458b0272664..000000000000 --- a/tests/testsuite/cargo_init/explicit_bin_with_git/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/explicit_bin_with_git/stderr.term.svg b/tests/testsuite/cargo_init/explicit_bin_with_git/stderr.term.svg new file mode 100644 index 000000000000..334d42a0d672 --- /dev/null +++ b/tests/testsuite/cargo_init/explicit_bin_with_git/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/explicit_bin_with_git/stdout.term.svg b/tests/testsuite/cargo_init/explicit_bin_with_git/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/explicit_bin_with_git/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/formats_source/mod.rs b/tests/testsuite/cargo_init/formats_source/mod.rs index 5d2c72b157c3..dd3e6ac00498 100644 --- a/tests/testsuite/cargo_init/formats_source/mod.rs +++ b/tests/testsuite/cargo_init/formats_source/mod.rs @@ -22,8 +22,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/formats_source/stderr.log b/tests/testsuite/cargo_init/formats_source/stderr.log deleted file mode 100644 index 2411ca5227c6..000000000000 --- a/tests/testsuite/cargo_init/formats_source/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/formats_source/stderr.term.svg b/tests/testsuite/cargo_init/formats_source/stderr.term.svg new file mode 100644 index 000000000000..b8b83dfbb91f --- /dev/null +++ b/tests/testsuite/cargo_init/formats_source/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/formats_source/stdout.term.svg b/tests/testsuite/cargo_init/formats_source/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/formats_source/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/fossil_autodetect/mod.rs b/tests/testsuite/cargo_init/fossil_autodetect/mod.rs index 0a5ba570e5be..110b8e74bd5d 100644 --- a/tests/testsuite/cargo_init/fossil_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/fossil_autodetect/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/fossil_autodetect/stderr.log b/tests/testsuite/cargo_init/fossil_autodetect/stderr.log deleted file mode 100644 index 2411ca5227c6..000000000000 --- a/tests/testsuite/cargo_init/fossil_autodetect/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/fossil_autodetect/stderr.term.svg b/tests/testsuite/cargo_init/fossil_autodetect/stderr.term.svg new file mode 100644 index 000000000000..b8b83dfbb91f --- /dev/null +++ b/tests/testsuite/cargo_init/fossil_autodetect/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/fossil_autodetect/stdout.term.svg b/tests/testsuite/cargo_init/fossil_autodetect/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/fossil_autodetect/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/git_autodetect/mod.rs b/tests/testsuite/cargo_init/git_autodetect/mod.rs index ae6963aba6c8..d206b7b893c6 100644 --- a/tests/testsuite/cargo_init/git_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/git_autodetect/mod.rs @@ -16,8 +16,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/git_autodetect/stderr.log b/tests/testsuite/cargo_init/git_autodetect/stderr.log deleted file mode 100644 index 2411ca5227c6..000000000000 --- a/tests/testsuite/cargo_init/git_autodetect/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/git_autodetect/stderr.term.svg b/tests/testsuite/cargo_init/git_autodetect/stderr.term.svg new file mode 100644 index 000000000000..b8b83dfbb91f --- /dev/null +++ b/tests/testsuite/cargo_init/git_autodetect/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/git_autodetect/stdout.term.svg b/tests/testsuite/cargo_init/git_autodetect/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/git_autodetect/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 3522534cabae..edf5a4b1f368 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 @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.log b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.log deleted file mode 100644 index 2411ca5227c6..000000000000 --- a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.term.svg b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.term.svg new file mode 100644 index 000000000000..b8b83dfbb91f --- /dev/null +++ b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stdout.term.svg b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/help/mod.rs b/tests/testsuite/cargo_init/help/mod.rs index 58febefe8a83..70c0c217a9e7 100644 --- a/tests/testsuite/cargo_init/help/mod.rs +++ b/tests/testsuite/cargo_init/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_init/help/stderr.log b/tests/testsuite/cargo_init/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/help/stderr.term.svg b/tests/testsuite/cargo_init/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/help/stdout.log b/tests/testsuite/cargo_init/help/stdout.log deleted file mode 100644 index 197a5f8d1e13..000000000000 --- a/tests/testsuite/cargo_init/help/stdout.log +++ /dev/null @@ -1,30 +0,0 @@ -Create a new cargo package in an existing directory - -Usage: cargo[EXE] init [OPTIONS] [PATH] - -Arguments: - [PATH] [default: .] - -Options: - --vcs Initialize a new repository for the given version control system, - overriding a global configuration. [possible values: git, hg, pijul, - fossil, none] - --bin Use a binary (application) template [default] - --lib Use a library template - --edition Edition to set for the crate generated [possible values: 2015, 2018, - 2021, 2024] - --name Set the resulting package name, defaults to the directory name - --registry Registry to use - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help init` for more detailed information. diff --git a/tests/testsuite/cargo_init/help/stdout.term.svg b/tests/testsuite/cargo_init/help/stdout.term.svg new file mode 100644 index 000000000000..a2753f357c0e --- /dev/null +++ b/tests/testsuite/cargo_init/help/stdout.term.svg @@ -0,0 +1,82 @@ + + + + + + Create a new cargo package in an existing directory + + + + Usage: cargo init [OPTIONS] [PATH] + + + + Arguments: + + [PATH] [default: .] + + + + Options: + + --vcs <VCS> Initialize a new repository for the given version control system, + + overriding a global configuration. [possible values: git, hg, pijul, + + fossil, none] + + --bin Use a binary (application) template [default] + + --lib Use a library template + + --edition <YEAR> Edition to set for the crate generated [possible values: 2015, 2018, + + 2021, 2024] + + --name <NAME> Set the resulting package name, defaults to the directory name + + --registry <REGISTRY> Registry to use + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help init` for more detailed information. + + + + + + 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 b2b927a4e338..15573f4901ee 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 @@ -15,8 +15,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.log b/tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.log deleted file mode 100644 index 2411ca5227c6..000000000000 --- a/tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.term.svg b/tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.term.svg new file mode 100644 index 000000000000..b8b83dfbb91f --- /dev/null +++ b/tests/testsuite/cargo_init/ignores_failure_to_format_source/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/ignores_failure_to_format_source/stdout.term.svg b/tests/testsuite/cargo_init/ignores_failure_to_format_source/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/ignores_failure_to_format_source/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 619045a0c6b8..adce522c2eb4 100644 --- a/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs +++ b/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/inferred_bin_with_git/stderr.log b/tests/testsuite/cargo_init/inferred_bin_with_git/stderr.log deleted file mode 100644 index 9458b0272664..000000000000 --- a/tests/testsuite/cargo_init/inferred_bin_with_git/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/inferred_bin_with_git/stderr.term.svg b/tests/testsuite/cargo_init/inferred_bin_with_git/stderr.term.svg new file mode 100644 index 000000000000..334d42a0d672 --- /dev/null +++ b/tests/testsuite/cargo_init/inferred_bin_with_git/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/inferred_bin_with_git/stdout.term.svg b/tests/testsuite/cargo_init/inferred_bin_with_git/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/inferred_bin_with_git/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 619045a0c6b8..adce522c2eb4 100644 --- a/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs +++ b/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/inferred_lib_with_git/stderr.log b/tests/testsuite/cargo_init/inferred_lib_with_git/stderr.log deleted file mode 100644 index 9458b0272664..000000000000 --- a/tests/testsuite/cargo_init/inferred_lib_with_git/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/inferred_lib_with_git/stderr.term.svg b/tests/testsuite/cargo_init/inferred_lib_with_git/stderr.term.svg new file mode 100644 index 000000000000..334d42a0d672 --- /dev/null +++ b/tests/testsuite/cargo_init/inferred_lib_with_git/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/inferred_lib_with_git/stdout.term.svg b/tests/testsuite/cargo_init/inferred_lib_with_git/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/inferred_lib_with_git/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 3132705f3bd1..d6c2a57af6a7 100644 --- a/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs +++ b/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.log b/tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.log deleted file mode 100644 index 9458b0272664..000000000000 --- a/tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.term.svg b/tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.term.svg new file mode 100644 index 000000000000..334d42a0d672 --- /dev/null +++ b/tests/testsuite/cargo_init/inherit_workspace_package_table/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/inherit_workspace_package_table/stdout.term.svg b/tests/testsuite/cargo_init/inherit_workspace_package_table/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/inherit_workspace_package_table/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/invalid_dir_name/mod.rs b/tests/testsuite/cargo_init/invalid_dir_name/mod.rs index 52f96cf35cc8..ee3783d7f2c3 100644 --- a/tests/testsuite/cargo_init/invalid_dir_name/mod.rs +++ b/tests/testsuite/cargo_init/invalid_dir_name/mod.rs @@ -13,8 +13,8 @@ fn case() { .current_dir(foo) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert!(!foo.join("Cargo.toml").is_file()); } diff --git a/tests/testsuite/cargo_init/invalid_dir_name/stderr.log b/tests/testsuite/cargo_init/invalid_dir_name/stderr.log deleted file mode 100644 index bf8653495863..000000000000 --- a/tests/testsuite/cargo_init/invalid_dir_name/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ - Creating binary (application) package -error: invalid character `.` in package name: `foo.bar`, characters must be Unicode XID characters (numbers, `-`, `_`, or most letters) -If you need a package name to not match the directory name, consider using --name flag. -If you need a binary with the name "foo.bar", use a valid package name, and set the binary name to be different from the package. This can be done by setting the binary filename to `src/bin/foo.bar.rs` or change the name in Cargo.toml with: - - [[bin]] - name = "foo.bar" - path = "src/main.rs" - diff --git a/tests/testsuite/cargo_init/invalid_dir_name/stderr.term.svg b/tests/testsuite/cargo_init/invalid_dir_name/stderr.term.svg new file mode 100644 index 000000000000..df6ef2e38881 --- /dev/null +++ b/tests/testsuite/cargo_init/invalid_dir_name/stderr.term.svg @@ -0,0 +1,43 @@ + + + + + + Creating binary (application) package + + error: invalid character `.` in package name: `foo.bar`, characters must be Unicode XID characters (numbers, `-`, `_`, or most letters) + + If you need a package name to not match the directory name, consider using --name flag. + + If you need a binary with the name "foo.bar", use a valid package name, and set the binary name to be different from the package. This can be done by setting the binary filename to `src/bin/foo.bar.rs` or change the name in Cargo.toml with: + + + + [[bin]] + + name = "foo.bar" + + path = "src/main.rs" + + + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/invalid_dir_name/stdout.term.svg b/tests/testsuite/cargo_init/invalid_dir_name/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/invalid_dir_name/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 d07cd385c2c8..cf4644496ad4 100644 --- a/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs +++ b/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("src/main.rs").is_file()); diff --git a/tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.log b/tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.log deleted file mode 100644 index 9458b0272664..000000000000 --- a/tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.term.svg b/tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.term.svg new file mode 100644 index 000000000000..334d42a0d672 --- /dev/null +++ b/tests/testsuite/cargo_init/lib_already_exists_nosrc/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/lib_already_exists_nosrc/stdout.term.svg b/tests/testsuite/cargo_init/lib_already_exists_nosrc/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/lib_already_exists_nosrc/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 d07cd385c2c8..cf4644496ad4 100644 --- a/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs +++ b/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("src/main.rs").is_file()); diff --git a/tests/testsuite/cargo_init/lib_already_exists_src/stderr.log b/tests/testsuite/cargo_init/lib_already_exists_src/stderr.log deleted file mode 100644 index 9458b0272664..000000000000 --- a/tests/testsuite/cargo_init/lib_already_exists_src/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/lib_already_exists_src/stderr.term.svg b/tests/testsuite/cargo_init/lib_already_exists_src/stderr.term.svg new file mode 100644 index 000000000000..334d42a0d672 --- /dev/null +++ b/tests/testsuite/cargo_init/lib_already_exists_src/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/lib_already_exists_src/stdout.term.svg b/tests/testsuite/cargo_init/lib_already_exists_src/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/lib_already_exists_src/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs b/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs index 0a5ba570e5be..110b8e74bd5d 100644 --- a/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/mercurial_autodetect/stderr.log b/tests/testsuite/cargo_init/mercurial_autodetect/stderr.log deleted file mode 100644 index 2411ca5227c6..000000000000 --- a/tests/testsuite/cargo_init/mercurial_autodetect/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/mercurial_autodetect/stderr.term.svg b/tests/testsuite/cargo_init/mercurial_autodetect/stderr.term.svg new file mode 100644 index 000000000000..b8b83dfbb91f --- /dev/null +++ b/tests/testsuite/cargo_init/mercurial_autodetect/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/mercurial_autodetect/stdout.term.svg b/tests/testsuite/cargo_init/mercurial_autodetect/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/mercurial_autodetect/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 5f2693e3f450..08e284ce1d0e 100644 --- a/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs +++ b/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join("Cargo.toml").is_file()); diff --git a/tests/testsuite/cargo_init/multibin_project_name_clash/stderr.log b/tests/testsuite/cargo_init/multibin_project_name_clash/stderr.log deleted file mode 100644 index 21a1dabee6d8..000000000000 --- a/tests/testsuite/cargo_init/multibin_project_name_clash/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ -error: multiple possible binary sources found: - main.rs - case.rs -cannot automatically generate Cargo.toml as the main target would be ambiguous diff --git a/tests/testsuite/cargo_init/multibin_project_name_clash/stderr.term.svg b/tests/testsuite/cargo_init/multibin_project_name_clash/stderr.term.svg new file mode 100644 index 000000000000..62c909fc5e4a --- /dev/null +++ b/tests/testsuite/cargo_init/multibin_project_name_clash/stderr.term.svg @@ -0,0 +1,32 @@ + + + + + + error: multiple possible binary sources found: + + main.rs + + case.rs + + cannot automatically generate Cargo.toml as the main target would be ambiguous + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/multibin_project_name_clash/stdout.term.svg b/tests/testsuite/cargo_init/multibin_project_name_clash/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/multibin_project_name_clash/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/no_filename/mod.rs b/tests/testsuite/cargo_init/no_filename/mod.rs index aca139169f95..2df38aeb4276 100644 --- a/tests/testsuite/cargo_init/no_filename/mod.rs +++ b/tests/testsuite/cargo_init/no_filename/mod.rs @@ -10,6 +10,6 @@ fn case() { .current_dir(paths::root()) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_init/no_filename/stderr.log b/tests/testsuite/cargo_init/no_filename/stderr.log deleted file mode 100644 index bd087ec90522..000000000000 --- a/tests/testsuite/cargo_init/no_filename/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: cannot auto-detect package name from path "/" ; use --name to override diff --git a/tests/testsuite/cargo_init/no_filename/stderr.term.svg b/tests/testsuite/cargo_init/no_filename/stderr.term.svg new file mode 100644 index 000000000000..e880def028da --- /dev/null +++ b/tests/testsuite/cargo_init/no_filename/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: cannot auto-detect package name from path "/" ; use --name to override + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/no_filename/stdout.term.svg b/tests/testsuite/cargo_init/no_filename/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/no_filename/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/path_contains_separator/mod.rs b/tests/testsuite/cargo_init/path_contains_separator/mod.rs index 7ec3707d5e28..d25c22dea945 100644 --- a/tests/testsuite/cargo_init/path_contains_separator/mod.rs +++ b/tests/testsuite/cargo_init/path_contains_separator/mod.rs @@ -18,8 +18,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".gitignore").is_file()); diff --git a/tests/testsuite/cargo_init/path_contains_separator/stderr.log b/tests/testsuite/cargo_init/path_contains_separator/stderr.log deleted file mode 100644 index c73f52114470..000000000000 --- a/tests/testsuite/cargo_init/path_contains_separator/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Creating binary (application) package -warning: the path `[ROOT]/case/test:ing/.` contains invalid PATH characters (usually `:`, `;`, or `"`) -It is recommended to use a different name to avoid problems. -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/path_contains_separator/stderr.term.svg b/tests/testsuite/cargo_init/path_contains_separator/stderr.term.svg new file mode 100644 index 000000000000..fb86c6284b6d --- /dev/null +++ b/tests/testsuite/cargo_init/path_contains_separator/stderr.term.svg @@ -0,0 +1,34 @@ + + + + + + Creating binary (application) package + + warning: the path `[ROOT]/case/test:ing/.` contains invalid PATH characters (usually `:`, `;`, or `"`) + + It is recommended to use a different name to avoid problems. + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/path_contains_separator/stdout.term.svg b/tests/testsuite/cargo_init/path_contains_separator/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/path_contains_separator/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/pijul_autodetect/mod.rs b/tests/testsuite/cargo_init/pijul_autodetect/mod.rs index 0a5ba570e5be..110b8e74bd5d 100644 --- a/tests/testsuite/cargo_init/pijul_autodetect/mod.rs +++ b/tests/testsuite/cargo_init/pijul_autodetect/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/pijul_autodetect/stderr.log b/tests/testsuite/cargo_init/pijul_autodetect/stderr.log deleted file mode 100644 index 2411ca5227c6..000000000000 --- a/tests/testsuite/cargo_init/pijul_autodetect/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/pijul_autodetect/stderr.term.svg b/tests/testsuite/cargo_init/pijul_autodetect/stderr.term.svg new file mode 100644 index 000000000000..b8b83dfbb91f --- /dev/null +++ b/tests/testsuite/cargo_init/pijul_autodetect/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/pijul_autodetect/stdout.term.svg b/tests/testsuite/cargo_init/pijul_autodetect/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/pijul_autodetect/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/reserved_name/mod.rs b/tests/testsuite/cargo_init/reserved_name/mod.rs index 2c9c54091778..9009c13933cb 100644 --- a/tests/testsuite/cargo_init/reserved_name/mod.rs +++ b/tests/testsuite/cargo_init/reserved_name/mod.rs @@ -13,8 +13,8 @@ fn case() { .current_dir(project_root) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert!(!project_root.join("Cargo.toml").is_file()); } diff --git a/tests/testsuite/cargo_init/reserved_name/stderr.log b/tests/testsuite/cargo_init/reserved_name/stderr.log deleted file mode 100644 index ccc1867bd251..000000000000 --- a/tests/testsuite/cargo_init/reserved_name/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ - Creating binary (application) package -error: the name `test` cannot be used as a package name, it conflicts with Rust's built-in test library -If you need a package name to not match the directory name, consider using --name flag. -If you need a binary with the name "test", use a valid package name, and set the binary name to be different from the package. This can be done by setting the binary filename to `src/bin/test.rs` or change the name in Cargo.toml with: - - [[bin]] - name = "test" - path = "src/main.rs" - diff --git a/tests/testsuite/cargo_init/reserved_name/stderr.term.svg b/tests/testsuite/cargo_init/reserved_name/stderr.term.svg new file mode 100644 index 000000000000..3b65d7721c85 --- /dev/null +++ b/tests/testsuite/cargo_init/reserved_name/stderr.term.svg @@ -0,0 +1,43 @@ + + + + + + Creating binary (application) package + + error: the name `test` cannot be used as a package name, it conflicts with Rust's built-in test library + + If you need a package name to not match the directory name, consider using --name flag. + + If you need a binary with the name "test", use a valid package name, and set the binary name to be different from the package. This can be done by setting the binary filename to `src/bin/test.rs` or change the name in Cargo.toml with: + + + + [[bin]] + + name = "test" + + path = "src/main.rs" + + + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/reserved_name/stdout.term.svg b/tests/testsuite/cargo_init/reserved_name/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/reserved_name/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/simple_bin/mod.rs b/tests/testsuite/cargo_init/simple_bin/mod.rs index b9aabc8b586e..5802228dff94 100644 --- a/tests/testsuite/cargo_init/simple_bin/mod.rs +++ b/tests/testsuite/cargo_init/simple_bin/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".gitignore").is_file()); diff --git a/tests/testsuite/cargo_init/simple_bin/stderr.log b/tests/testsuite/cargo_init/simple_bin/stderr.log deleted file mode 100644 index 9458b0272664..000000000000 --- a/tests/testsuite/cargo_init/simple_bin/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/simple_bin/stderr.term.svg b/tests/testsuite/cargo_init/simple_bin/stderr.term.svg new file mode 100644 index 000000000000..334d42a0d672 --- /dev/null +++ b/tests/testsuite/cargo_init/simple_bin/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/simple_bin/stdout.term.svg b/tests/testsuite/cargo_init/simple_bin/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/simple_bin/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/simple_git/mod.rs b/tests/testsuite/cargo_init/simple_git/mod.rs index 177f640e8f96..e617fea2d6b3 100644 --- a/tests/testsuite/cargo_init/simple_git/mod.rs +++ b/tests/testsuite/cargo_init/simple_git/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/simple_git/stderr.log b/tests/testsuite/cargo_init/simple_git/stderr.log deleted file mode 100644 index 2411ca5227c6..000000000000 --- a/tests/testsuite/cargo_init/simple_git/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/simple_git/stderr.term.svg b/tests/testsuite/cargo_init/simple_git/stderr.term.svg new file mode 100644 index 000000000000..b8b83dfbb91f --- /dev/null +++ b/tests/testsuite/cargo_init/simple_git/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/simple_git/stdout.term.svg b/tests/testsuite/cargo_init/simple_git/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/simple_git/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 93320c284ebe..be697c3ca989 100644 --- a/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs +++ b/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.log b/tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.log deleted file mode 100644 index 2411ca5227c6..000000000000 --- a/tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.term.svg b/tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.term.svg new file mode 100644 index 000000000000..b8b83dfbb91f --- /dev/null +++ b/tests/testsuite/cargo_init/simple_git_ignore_exists/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/simple_git_ignore_exists/stdout.term.svg b/tests/testsuite/cargo_init/simple_git_ignore_exists/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/simple_git_ignore_exists/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/simple_hg/mod.rs b/tests/testsuite/cargo_init/simple_hg/mod.rs index 1d272737e214..3ba12ae26bf9 100644 --- a/tests/testsuite/cargo_init/simple_hg/mod.rs +++ b/tests/testsuite/cargo_init/simple_hg/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/simple_hg/stderr.log b/tests/testsuite/cargo_init/simple_hg/stderr.log deleted file mode 100644 index 2411ca5227c6..000000000000 --- a/tests/testsuite/cargo_init/simple_hg/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html 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 e69de29bb2d1..000000000000 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 0a5ba570e5be..110b8e74bd5d 100644 --- a/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs +++ b/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".git").is_dir()); diff --git a/tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.log b/tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.log deleted file mode 100644 index 2411ca5227c6..000000000000 --- a/tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.term.svg b/tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.term.svg new file mode 100644 index 000000000000..b8b83dfbb91f --- /dev/null +++ b/tests/testsuite/cargo_init/simple_hg_ignore_exists/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/simple_hg_ignore_exists/stdout.term.svg b/tests/testsuite/cargo_init/simple_hg_ignore_exists/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/simple_hg_ignore_exists/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/simple_lib/mod.rs b/tests/testsuite/cargo_init/simple_lib/mod.rs index 2f46c9356e66..4e2a08e20568 100644 --- a/tests/testsuite/cargo_init/simple_lib/mod.rs +++ b/tests/testsuite/cargo_init/simple_lib/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); assert!(!project_root.join(".gitignore").is_file()); diff --git a/tests/testsuite/cargo_init/simple_lib/stderr.log b/tests/testsuite/cargo_init/simple_lib/stderr.log deleted file mode 100644 index 2411ca5227c6..000000000000 --- a/tests/testsuite/cargo_init/simple_lib/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating library package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/simple_lib/stderr.term.svg b/tests/testsuite/cargo_init/simple_lib/stderr.term.svg new file mode 100644 index 000000000000..b8b83dfbb91f --- /dev/null +++ b/tests/testsuite/cargo_init/simple_lib/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating library package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/simple_lib/stdout.term.svg b/tests/testsuite/cargo_init/simple_lib/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/simple_lib/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/unknown_flags/mod.rs b/tests/testsuite/cargo_init/unknown_flags/mod.rs index 4b61f9235ada..51f12f72f277 100644 --- a/tests/testsuite/cargo_init/unknown_flags/mod.rs +++ b/tests/testsuite/cargo_init/unknown_flags/mod.rs @@ -9,6 +9,6 @@ fn case() { .current_dir(paths::root()) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_init/unknown_flags/stderr.log b/tests/testsuite/cargo_init/unknown_flags/stderr.log deleted file mode 100644 index 04a3c3ff0d53..000000000000 --- a/tests/testsuite/cargo_init/unknown_flags/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ -error: unexpected argument '--flag' found - - tip: to pass '--flag' as a value, use '-- --flag' - -Usage: cargo[EXE] init - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_init/unknown_flags/stderr.term.svg b/tests/testsuite/cargo_init/unknown_flags/stderr.term.svg new file mode 100644 index 000000000000..fa97c12b26df --- /dev/null +++ b/tests/testsuite/cargo_init/unknown_flags/stderr.term.svg @@ -0,0 +1,36 @@ + + + + + + error: unexpected argument '--flag' found + + + + tip: to pass '--flag' as a value, use '-- --flag' + + + + Usage: cargo init <PATH> + + + + For more information, try '--help'. + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/unknown_flags/stdout.term.svg b/tests/testsuite/cargo_init/unknown_flags/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/unknown_flags/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/with_argument/mod.rs b/tests/testsuite/cargo_init/with_argument/mod.rs index 54db7d293f20..a25d29c90331 100644 --- a/tests/testsuite/cargo_init/with_argument/mod.rs +++ b/tests/testsuite/cargo_init/with_argument/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), project_root); } diff --git a/tests/testsuite/cargo_init/with_argument/stderr.log b/tests/testsuite/cargo_init/with_argument/stderr.log deleted file mode 100644 index 9458b0272664..000000000000 --- a/tests/testsuite/cargo_init/with_argument/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/with_argument/stderr.term.svg b/tests/testsuite/cargo_init/with_argument/stderr.term.svg new file mode 100644 index 000000000000..334d42a0d672 --- /dev/null +++ b/tests/testsuite/cargo_init/with_argument/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/with_argument/stdout.term.svg b/tests/testsuite/cargo_init/with_argument/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/with_argument/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_init/workspace_add_member/mod.rs b/tests/testsuite/cargo_init/workspace_add_member/mod.rs index 6dc2885a20fc..b6bcb388ac0d 100644 --- a/tests/testsuite/cargo_init/workspace_add_member/mod.rs +++ b/tests/testsuite/cargo_init/workspace_add_member/mod.rs @@ -14,8 +14,8 @@ fn case() { .current_dir(project_root.join("crates").join("foo")) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_init/workspace_add_member/stderr.log b/tests/testsuite/cargo_init/workspace_add_member/stderr.log deleted file mode 100644 index f8e6cce46eac..000000000000 --- a/tests/testsuite/cargo_init/workspace_add_member/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating binary (application) package - Adding `foo` as member of workspace at `[ROOT]/case` -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_init/workspace_add_member/stderr.term.svg b/tests/testsuite/cargo_init/workspace_add_member/stderr.term.svg new file mode 100644 index 000000000000..327ab181b2c3 --- /dev/null +++ b/tests/testsuite/cargo_init/workspace_add_member/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + Creating binary (application) package + + Adding `foo` as member of workspace at `[ROOT]/case` + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_init/workspace_add_member/stdout.term.svg b/tests/testsuite/cargo_init/workspace_add_member/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_init/workspace_add_member/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_install/help/mod.rs b/tests/testsuite/cargo_install/help/mod.rs index 9700da015d6d..886e4be0beed 100644 --- a/tests/testsuite/cargo_install/help/mod.rs +++ b/tests/testsuite/cargo_install/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_install/help/stderr.log b/tests/testsuite/cargo_install/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_install/help/stderr.term.svg b/tests/testsuite/cargo_install/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_install/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_install/help/stdout.log b/tests/testsuite/cargo_install/help/stdout.log deleted file mode 100644 index 5f072564680a..000000000000 --- a/tests/testsuite/cargo_install/help/stdout.log +++ /dev/null @@ -1,56 +0,0 @@ -Install a Rust binary - -Usage: cargo[EXE] install [OPTIONS] [CRATE[@]]... - -Arguments: - [CRATE[@]]... Select the package from the given source - -Options: - --version Specify a version to install - --index Registry index to install from - --registry Registry to use - --git Git URL to install the specified crate from - --branch Branch to use when installing from git - --tag Tag to use when installing from git - --rev Specific commit to use when installing from git - --path Filesystem path to local crate to install from - --root Directory to install packages into - -f, --force Force overwriting existing crates or binaries - --no-track Do not save tracking information - --list List all installed packages and their versions - --ignore-rust-version Ignore `rust-version` specification in packages - --message-format Error format - --debug Build in debug mode (with the 'dev' profile) instead of release mode - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Target Selection: - --bin [] Install only the specified binary - --bins Install all binaries - --example [] Install only the specified example - --examples Install all examples - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - --profile Install artifacts with the specified profile - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help install` for more detailed information. diff --git a/tests/testsuite/cargo_install/help/stdout.term.svg b/tests/testsuite/cargo_install/help/stdout.term.svg new file mode 100644 index 000000000000..c91e94b34095 --- /dev/null +++ b/tests/testsuite/cargo_install/help/stdout.term.svg @@ -0,0 +1,134 @@ + + + + + + Install a Rust binary + + + + Usage: cargo install [OPTIONS] [CRATE[@<VER>]]... + + + + Arguments: + + [CRATE[@<VER>]]... Select the package from the given source + + + + Options: + + --version <VERSION> Specify a version to install + + --index <INDEX> Registry index to install from + + --registry <REGISTRY> Registry to use + + --git <URL> Git URL to install the specified crate from + + --branch <BRANCH> Branch to use when installing from git + + --tag <TAG> Tag to use when installing from git + + --rev <SHA> Specific commit to use when installing from git + + --path <PATH> Filesystem path to local crate to install from + + --root <DIR> Directory to install packages into + + -f, --force Force overwriting existing crates or binaries + + --no-track Do not save tracking information + + --list List all installed packages and their versions + + --ignore-rust-version Ignore `rust-version` specification in packages + + --message-format <FMT> Error format + + --debug Build in debug mode (with the 'dev' profile) instead of release mode + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Target Selection: + + --bin [<NAME>] Install only the specified binary + + --bins Install all binaries + + --example [<NAME>] Install only the specified example + + --examples Install all examples + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + --profile <PROFILE-NAME> Install artifacts with the specified profile + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help install` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_locate_project/help/mod.rs b/tests/testsuite/cargo_locate_project/help/mod.rs index a1abcdb241d9..1724ccd0d094 100644 --- a/tests/testsuite/cargo_locate_project/help/mod.rs +++ b/tests/testsuite/cargo_locate_project/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_locate_project/help/stderr.log b/tests/testsuite/cargo_locate_project/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_locate_project/help/stderr.term.svg b/tests/testsuite/cargo_locate_project/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_locate_project/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_locate_project/help/stdout.log b/tests/testsuite/cargo_locate_project/help/stdout.log deleted file mode 100644 index f39d61b7aa60..000000000000 --- a/tests/testsuite/cargo_locate_project/help/stdout.log +++ /dev/null @@ -1,22 +0,0 @@ -Print a JSON representation of a Cargo.toml file's location - -Usage: cargo[EXE] locate-project [OPTIONS] - -Options: - --workspace Locate Cargo.toml of the workspace root - --message-format Output representation [possible values: json, plain] - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help locate-project` for more detailed information. diff --git a/tests/testsuite/cargo_locate_project/help/stdout.term.svg b/tests/testsuite/cargo_locate_project/help/stdout.term.svg new file mode 100644 index 000000000000..ffa6456a840f --- /dev/null +++ b/tests/testsuite/cargo_locate_project/help/stdout.term.svg @@ -0,0 +1,66 @@ + + + + + + Print a JSON representation of a Cargo.toml file's location + + + + Usage: cargo locate-project [OPTIONS] + + + + Options: + + --workspace Locate Cargo.toml of the workspace root + + --message-format <FMT> Output representation [possible values: json, plain] + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help locate-project` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_login/help/mod.rs b/tests/testsuite/cargo_login/help/mod.rs index d36f4551ff82..4a05ca99afe7 100644 --- a/tests/testsuite/cargo_login/help/mod.rs +++ b/tests/testsuite/cargo_login/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_login/help/stderr.log b/tests/testsuite/cargo_login/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_login/help/stderr.term.svg b/tests/testsuite/cargo_login/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_login/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_login/help/stdout.log b/tests/testsuite/cargo_login/help/stdout.log deleted file mode 100644 index 0a699f72f6b6..000000000000 --- a/tests/testsuite/cargo_login/help/stdout.log +++ /dev/null @@ -1,23 +0,0 @@ -Log in to a registry. - -Usage: cargo[EXE] login [OPTIONS] [TOKEN] [-- [args]...] - -Arguments: - [TOKEN] - [args]... Additional arguments for the credential provider - -Options: - --registry Registry to use - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help login` for more detailed information. diff --git a/tests/testsuite/cargo_login/help/stdout.term.svg b/tests/testsuite/cargo_login/help/stdout.term.svg new file mode 100644 index 000000000000..2dda8f92bf90 --- /dev/null +++ b/tests/testsuite/cargo_login/help/stdout.term.svg @@ -0,0 +1,68 @@ + + + + + + Log in to a registry. + + + + Usage: cargo login [OPTIONS] [TOKEN] [-- [args]...] + + + + Arguments: + + [TOKEN] + + [args]... Additional arguments for the credential provider + + + + Options: + + --registry <REGISTRY> Registry to use + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help login` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_logout/help/mod.rs b/tests/testsuite/cargo_logout/help/mod.rs index a141c3c7de75..fc866debb162 100644 --- a/tests/testsuite/cargo_logout/help/mod.rs +++ b/tests/testsuite/cargo_logout/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_logout/help/stderr.log b/tests/testsuite/cargo_logout/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_logout/help/stderr.term.svg b/tests/testsuite/cargo_logout/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_logout/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_logout/help/stdout.log b/tests/testsuite/cargo_logout/help/stdout.log deleted file mode 100644 index 3f9679f9ba75..000000000000 --- a/tests/testsuite/cargo_logout/help/stdout.log +++ /dev/null @@ -1,19 +0,0 @@ -Remove an API token from the registry locally - -Usage: cargo[EXE] logout [OPTIONS] - -Options: - --registry Registry to use - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help logout` for more detailed information. diff --git a/tests/testsuite/cargo_logout/help/stdout.term.svg b/tests/testsuite/cargo_logout/help/stdout.term.svg new file mode 100644 index 000000000000..e0f8417c497f --- /dev/null +++ b/tests/testsuite/cargo_logout/help/stdout.term.svg @@ -0,0 +1,60 @@ + + + + + + Remove an API token from the registry locally + + + + Usage: cargo logout [OPTIONS] + + + + Options: + + --registry <REGISTRY> Registry to use + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help logout` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_metadata/help/mod.rs b/tests/testsuite/cargo_metadata/help/mod.rs index 04d2e13a4222..ea789c0a34ea 100644 --- a/tests/testsuite/cargo_metadata/help/mod.rs +++ b/tests/testsuite/cargo_metadata/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_metadata/help/stderr.log b/tests/testsuite/cargo_metadata/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_metadata/help/stderr.term.svg b/tests/testsuite/cargo_metadata/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_metadata/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_metadata/help/stdout.log b/tests/testsuite/cargo_metadata/help/stdout.log deleted file mode 100644 index f44f66c8875c..000000000000 --- a/tests/testsuite/cargo_metadata/help/stdout.log +++ /dev/null @@ -1,30 +0,0 @@ -Output the resolved dependencies of a package, the concrete used versions including overrides, in -machine-readable format - -Usage: cargo[EXE] metadata [OPTIONS] - -Options: - --filter-platform Only include resolve dependencies matching the given target-triple - --no-deps Output information only about the workspace members and don't - fetch dependencies - --format-version Format version [possible values: 1] - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help metadata` for more detailed information. diff --git a/tests/testsuite/cargo_metadata/help/stdout.term.svg b/tests/testsuite/cargo_metadata/help/stdout.term.svg new file mode 100644 index 000000000000..edadd9ba8b8b --- /dev/null +++ b/tests/testsuite/cargo_metadata/help/stdout.term.svg @@ -0,0 +1,82 @@ + + + + + + Output the resolved dependencies of a package, the concrete used versions including overrides, in + + machine-readable format + + + + Usage: cargo metadata [OPTIONS] + + + + Options: + + --filter-platform <TRIPLE> Only include resolve dependencies matching the given target-triple + + --no-deps Output information only about the workspace members and don't + + fetch dependencies + + --format-version <VERSION> Format version [possible values: 1] + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help metadata` for more detailed information. + + + + + + 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 23ae2e31a580..a23744c9373b 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 @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_non_workspace/stderr.log b/tests/testsuite/cargo_new/add_members_to_non_workspace/stderr.log deleted file mode 100644 index 0f1529c26cd0..000000000000 --- a/tests/testsuite/cargo_new/add_members_to_non_workspace/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating library `bar` package - Adding `bar` as member of workspace at `[ROOT]/case` -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_non_workspace/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_non_workspace/stderr.term.svg new file mode 100644 index 000000000000..b3e328c570dc --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_non_workspace/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + Creating library `bar` package + + Adding `bar` as member of workspace at `[ROOT]/case` + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/add_members_to_non_workspace/stdout.term.svg b/tests/testsuite/cargo_new/add_members_to_non_workspace/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_non_workspace/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 4655b5f365aa..7454e9a1332a 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 @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stderr.log b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stderr.log deleted file mode 100644 index 34f20df55969..000000000000 --- a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating binary (application) `foo` package - Adding `foo` as member of workspace at `[ROOT]/case` -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stderr.term.svg new file mode 100644 index 000000000000..6f1b55327a88 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + Creating binary (application) `foo` package + + Adding `foo` as member of workspace at `[ROOT]/case` + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stdout.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 4655b5f365aa..7454e9a1332a 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 @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stderr.log b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stderr.log deleted file mode 100644 index 34f20df55969..000000000000 --- a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating binary (application) `foo` package - Adding `foo` as member of workspace at `[ROOT]/case` -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stderr.term.svg new file mode 100644 index 000000000000..6f1b55327a88 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + Creating binary (application) `foo` package + + Adding `foo` as member of workspace at `[ROOT]/case` + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stdout.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 c1d7ac485307..c7f116c3a895 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 @@ -17,8 +17,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stderr.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stderr.log deleted file mode 100644 index 34f20df55969..000000000000 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating binary (application) `foo` package - Adding `foo` as member of workspace at `[ROOT]/case` -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stderr.term.svg new file mode 100644 index 000000000000..6f1b55327a88 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + Creating binary (application) `foo` package + + Adding `foo` as member of workspace at `[ROOT]/case` + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stdout.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 4655b5f365aa..7454e9a1332a 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 @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stderr.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stderr.log deleted file mode 100644 index 34f20df55969..000000000000 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating binary (application) `foo` package - Adding `foo` as member of workspace at `[ROOT]/case` -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stderr.term.svg new file mode 100644 index 000000000000..6f1b55327a88 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + Creating binary (application) `foo` package + + Adding `foo` as member of workspace at `[ROOT]/case` + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stdout.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 4655b5f365aa..7454e9a1332a 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 @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stderr.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stderr.log deleted file mode 100644 index c3053272fb1e..000000000000 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `foo` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stderr.term.svg new file mode 100644 index 000000000000..48c48b198586 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) `foo` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stdout.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 4655b5f365aa..7454e9a1332a 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 @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stderr.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stderr.log deleted file mode 100644 index c3053272fb1e..000000000000 --- a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `foo` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stderr.term.svg new file mode 100644 index 000000000000..48c48b198586 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) `foo` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stdout.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 23ae2e31a580..a23744c9373b 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 @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stderr.log b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stderr.log deleted file mode 100644 index 0f1529c26cd0..000000000000 --- a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Creating library `bar` package - Adding `bar` as member of workspace at `[ROOT]/case` -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stderr.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stderr.term.svg new file mode 100644 index 000000000000..b3e328c570dc --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + Creating library `bar` package + + Adding `bar` as member of workspace at `[ROOT]/case` + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stdout.term.svg b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_new/empty_name/mod.rs b/tests/testsuite/cargo_new/empty_name/mod.rs index 73f4296e02ee..b3b89542f535 100644 --- a/tests/testsuite/cargo_new/empty_name/mod.rs +++ b/tests/testsuite/cargo_new/empty_name/mod.rs @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/empty_name/stderr.log b/tests/testsuite/cargo_new/empty_name/stderr.log deleted file mode 100644 index b6368939e3da..000000000000 --- a/tests/testsuite/cargo_new/empty_name/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `` package -error: package name cannot be empty diff --git a/tests/testsuite/cargo_new/empty_name/stderr.term.svg b/tests/testsuite/cargo_new/empty_name/stderr.term.svg new file mode 100644 index 000000000000..9163ab2fbac8 --- /dev/null +++ b/tests/testsuite/cargo_new/empty_name/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) `` package + + error: package name cannot be empty + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/empty_name/stdout.term.svg b/tests/testsuite/cargo_new/empty_name/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/empty_name/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_new/help/mod.rs b/tests/testsuite/cargo_new/help/mod.rs index 0804f38909f5..4a8cec256764 100644 --- a/tests/testsuite/cargo_new/help/mod.rs +++ b/tests/testsuite/cargo_new/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_new/help/stderr.log b/tests/testsuite/cargo_new/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/help/stderr.term.svg b/tests/testsuite/cargo_new/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_new/help/stdout.log b/tests/testsuite/cargo_new/help/stdout.log deleted file mode 100644 index 52a6f83a1865..000000000000 --- a/tests/testsuite/cargo_new/help/stdout.log +++ /dev/null @@ -1,30 +0,0 @@ -Create a new cargo package at - -Usage: cargo[EXE] new [OPTIONS] - -Arguments: - - -Options: - --vcs Initialize a new repository for the given version control system, - overriding a global configuration. [possible values: git, hg, pijul, - fossil, none] - --bin Use a binary (application) template [default] - --lib Use a library template - --edition Edition to set for the crate generated [possible values: 2015, 2018, - 2021, 2024] - --name Set the resulting package name, defaults to the directory name - --registry Registry to use - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help new` for more detailed information. diff --git a/tests/testsuite/cargo_new/help/stdout.term.svg b/tests/testsuite/cargo_new/help/stdout.term.svg new file mode 100644 index 000000000000..cf5f185b1f1e --- /dev/null +++ b/tests/testsuite/cargo_new/help/stdout.term.svg @@ -0,0 +1,82 @@ + + + + + + Create a new cargo package at <path> + + + + Usage: cargo new [OPTIONS] <PATH> + + + + Arguments: + + <PATH> + + + + Options: + + --vcs <VCS> Initialize a new repository for the given version control system, + + overriding a global configuration. [possible values: git, hg, pijul, + + fossil, none] + + --bin Use a binary (application) template [default] + + --lib Use a library template + + --edition <YEAR> Edition to set for the crate generated [possible values: 2015, 2018, + + 2021, 2024] + + --name <NAME> Set the resulting package name, defaults to the directory name + + --registry <REGISTRY> Registry to use + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help new` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs index 4655b5f365aa..7454e9a1332a 100644 --- a/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs +++ b/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/inherit_workspace_lints/stderr.log b/tests/testsuite/cargo_new/inherit_workspace_lints/stderr.log deleted file mode 100644 index c3053272fb1e..000000000000 --- a/tests/testsuite/cargo_new/inherit_workspace_lints/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `foo` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/inherit_workspace_lints/stderr.term.svg b/tests/testsuite/cargo_new/inherit_workspace_lints/stderr.term.svg new file mode 100644 index 000000000000..48c48b198586 --- /dev/null +++ b/tests/testsuite/cargo_new/inherit_workspace_lints/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) `foo` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/inherit_workspace_lints/stdout.term.svg b/tests/testsuite/cargo_new/inherit_workspace_lints/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/inherit_workspace_lints/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 4655b5f365aa..7454e9a1332a 100644 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table/stderr.log b/tests/testsuite/cargo_new/inherit_workspace_package_table/stderr.log deleted file mode 100644 index c3053272fb1e..000000000000 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `foo` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table/stderr.term.svg b/tests/testsuite/cargo_new/inherit_workspace_package_table/stderr.term.svg new file mode 100644 index 000000000000..48c48b198586 --- /dev/null +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) `foo` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table/stdout.term.svg b/tests/testsuite/cargo_new/inherit_workspace_package_table/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 b5ac01fa7a41..689a97009737 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 @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stderr.log b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stderr.log deleted file mode 100644 index c3053272fb1e..000000000000 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `foo` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stderr.term.svg b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stderr.term.svg new file mode 100644 index 000000000000..48c48b198586 --- /dev/null +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) `foo` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stdout.term.svg b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 85fbb21e7b70..e062a7cbfd30 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 @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stderr.log b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stderr.log deleted file mode 100644 index c3053272fb1e..000000000000 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `foo` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stderr.term.svg b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stderr.term.svg new file mode 100644 index 000000000000..48c48b198586 --- /dev/null +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) `foo` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stdout.term.svg b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 4655b5f365aa..7454e9a1332a 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 @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stderr.log b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stderr.log deleted file mode 100644 index c3053272fb1e..000000000000 --- a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `foo` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stderr.term.svg b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stderr.term.svg new file mode 100644 index 000000000000..48c48b198586 --- /dev/null +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) `foo` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stdout.term.svg b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 94508c7e6f56..89805e252617 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 @@ -16,8 +16,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.log b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.log deleted file mode 100644 index e3844ceab3e1..000000000000 --- a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Creating binary (application) `bar` package -note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.term.svg b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.term.svg new file mode 100644 index 000000000000..f4ec02d4df8b --- /dev/null +++ b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Creating binary (application) `bar` package + + note: see more `Cargo.toml` keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stdout.term.svg b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_owner/help/mod.rs b/tests/testsuite/cargo_owner/help/mod.rs index 69ff5c45575b..3846579f3fc5 100644 --- a/tests/testsuite/cargo_owner/help/mod.rs +++ b/tests/testsuite/cargo_owner/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_owner/help/stderr.log b/tests/testsuite/cargo_owner/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_owner/help/stderr.term.svg b/tests/testsuite/cargo_owner/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_owner/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_owner/help/stdout.log b/tests/testsuite/cargo_owner/help/stdout.log deleted file mode 100644 index b6f436d047bf..000000000000 --- a/tests/testsuite/cargo_owner/help/stdout.log +++ /dev/null @@ -1,27 +0,0 @@ -Manage the owners of a crate on the registry - -Usage: cargo[EXE] owner [OPTIONS] [CRATE] - -Arguments: - [CRATE] - -Options: - -a, --add Name of a user or team to invite as an owner - -r, --remove Name of a user or team to remove as an owner - -l, --list List owners of a crate - --index Registry index URL to modify owners for - --registry Registry to modify owners for - --token API token to use when authenticating - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help owner` for more detailed information. diff --git a/tests/testsuite/cargo_owner/help/stdout.term.svg b/tests/testsuite/cargo_owner/help/stdout.term.svg new file mode 100644 index 000000000000..8295e728f052 --- /dev/null +++ b/tests/testsuite/cargo_owner/help/stdout.term.svg @@ -0,0 +1,76 @@ + + + + + + Manage the owners of a crate on the registry + + + + Usage: cargo owner [OPTIONS] [CRATE] + + + + Arguments: + + [CRATE] + + + + Options: + + -a, --add <LOGIN> Name of a user or team to invite as an owner + + -r, --remove <LOGIN> Name of a user or team to remove as an owner + + -l, --list List owners of a crate + + --index <INDEX> Registry index URL to modify owners for + + --registry <REGISTRY> Registry to modify owners for + + --token <TOKEN> API token to use when authenticating + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help owner` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_package/help/mod.rs b/tests/testsuite/cargo_package/help/mod.rs index 10d1730e396b..c612b4c322e6 100644 --- a/tests/testsuite/cargo_package/help/mod.rs +++ b/tests/testsuite/cargo_package/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_package/help/stderr.log b/tests/testsuite/cargo_package/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_package/help/stderr.term.svg b/tests/testsuite/cargo_package/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_package/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_package/help/stdout.log b/tests/testsuite/cargo_package/help/stdout.log deleted file mode 100644 index ec2464a8d63f..000000000000 --- a/tests/testsuite/cargo_package/help/stdout.log +++ /dev/null @@ -1,39 +0,0 @@ -Assemble the local package into a distributable tarball - -Usage: cargo[EXE] package [OPTIONS] - -Options: - -l, --list Print files included in a package without making one - --no-verify Don't verify the contents by building them - --no-metadata Ignore warnings about a lack of human-usable metadata - --allow-dirty Allow dirty working directories to be packaged - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Package Selection: - -p, --package [] Package(s) to assemble - --workspace Assemble all packages in the workspace - --exclude Don't assemble specified packages - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help package` for more detailed information. diff --git a/tests/testsuite/cargo_package/help/stdout.term.svg b/tests/testsuite/cargo_package/help/stdout.term.svg new file mode 100644 index 000000000000..0e2709bd5ce2 --- /dev/null +++ b/tests/testsuite/cargo_package/help/stdout.term.svg @@ -0,0 +1,100 @@ + + + + + + Assemble the local package into a distributable tarball + + + + Usage: cargo package [OPTIONS] + + + + Options: + + -l, --list Print files included in a package without making one + + --no-verify Don't verify the contents by building them + + --no-metadata Ignore warnings about a lack of human-usable metadata + + --allow-dirty Allow dirty working directories to be packaged + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package(s) to assemble + + --workspace Assemble all packages in the workspace + + --exclude <SPEC> Don't assemble specified packages + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help package` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_pkgid/help/mod.rs b/tests/testsuite/cargo_pkgid/help/mod.rs index 9dea28b56f4f..aad6ce5f7386 100644 --- a/tests/testsuite/cargo_pkgid/help/mod.rs +++ b/tests/testsuite/cargo_pkgid/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_pkgid/help/stderr.log b/tests/testsuite/cargo_pkgid/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_pkgid/help/stderr.term.svg b/tests/testsuite/cargo_pkgid/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_pkgid/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_pkgid/help/stdout.log b/tests/testsuite/cargo_pkgid/help/stdout.log deleted file mode 100644 index 657bb9e5db2a..000000000000 --- a/tests/testsuite/cargo_pkgid/help/stdout.log +++ /dev/null @@ -1,25 +0,0 @@ -Print a fully qualified package specification - -Usage: cargo[EXE] pkgid [OPTIONS] [SPEC] - -Arguments: - [SPEC] - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Package Selection: - -p, --package [] Argument to get the package ID specifier for - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help pkgid` for more detailed information. diff --git a/tests/testsuite/cargo_pkgid/help/stdout.term.svg b/tests/testsuite/cargo_pkgid/help/stdout.term.svg new file mode 100644 index 000000000000..992e7225aa3c --- /dev/null +++ b/tests/testsuite/cargo_pkgid/help/stdout.term.svg @@ -0,0 +1,72 @@ + + + + + + Print a fully qualified package specification + + + + Usage: cargo pkgid [OPTIONS] [SPEC] + + + + Arguments: + + [SPEC] + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Argument to get the package ID specifier for + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help pkgid` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_publish/help/mod.rs b/tests/testsuite/cargo_publish/help/mod.rs index 57d090afa0c8..76d0151ee5aa 100644 --- a/tests/testsuite/cargo_publish/help/mod.rs +++ b/tests/testsuite/cargo_publish/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_publish/help/stderr.log b/tests/testsuite/cargo_publish/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_publish/help/stderr.term.svg b/tests/testsuite/cargo_publish/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_publish/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_publish/help/stdout.log b/tests/testsuite/cargo_publish/help/stdout.log deleted file mode 100644 index d598c93d6811..000000000000 --- a/tests/testsuite/cargo_publish/help/stdout.log +++ /dev/null @@ -1,39 +0,0 @@ -Upload a package to the registry - -Usage: cargo[EXE] publish [OPTIONS] - -Options: - -n, --dry-run Perform all checks without uploading - --index Registry index URL to upload the package to - --registry Registry to upload the package to - --token Token to use when uploading - --no-verify Don't verify the contents by building them - --allow-dirty Allow dirty working directories to be packaged - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Package Selection: - -p, --package [] Package to publish - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help publish` for more detailed information. diff --git a/tests/testsuite/cargo_publish/help/stdout.term.svg b/tests/testsuite/cargo_publish/help/stdout.term.svg new file mode 100644 index 000000000000..14f32c5009f7 --- /dev/null +++ b/tests/testsuite/cargo_publish/help/stdout.term.svg @@ -0,0 +1,100 @@ + + + + + + Upload a package to the registry + + + + Usage: cargo publish [OPTIONS] + + + + Options: + + -n, --dry-run Perform all checks without uploading + + --index <INDEX> Registry index URL to upload the package to + + --registry <REGISTRY> Registry to upload the package to + + --token <TOKEN> Token to use when uploading + + --no-verify Don't verify the contents by building them + + --allow-dirty Allow dirty working directories to be packaged + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to publish + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help publish` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_read_manifest/help/mod.rs b/tests/testsuite/cargo_read_manifest/help/mod.rs index ef18fa6b6c05..7c8891a5a557 100644 --- a/tests/testsuite/cargo_read_manifest/help/mod.rs +++ b/tests/testsuite/cargo_read_manifest/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_read_manifest/help/stderr.log b/tests/testsuite/cargo_read_manifest/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_read_manifest/help/stderr.term.svg b/tests/testsuite/cargo_read_manifest/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_read_manifest/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_read_manifest/help/stdout.log b/tests/testsuite/cargo_read_manifest/help/stdout.log deleted file mode 100644 index a645ea3c2b46..000000000000 --- a/tests/testsuite/cargo_read_manifest/help/stdout.log +++ /dev/null @@ -1,19 +0,0 @@ -Print a JSON representation of a Cargo.toml manifest. - -Deprecated, use `cargo metadata --no-deps` instead. - -Usage: cargo[EXE] read-manifest [OPTIONS] - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network diff --git a/tests/testsuite/cargo_read_manifest/help/stdout.term.svg b/tests/testsuite/cargo_read_manifest/help/stdout.term.svg new file mode 100644 index 000000000000..8043590a35ee --- /dev/null +++ b/tests/testsuite/cargo_read_manifest/help/stdout.term.svg @@ -0,0 +1,60 @@ + + + + + + Print a JSON representation of a Cargo.toml manifest. + + + + Deprecated, use `cargo metadata --no-deps` instead. + + + + Usage: cargo read-manifest [OPTIONS] + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + + + diff --git a/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs b/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs index 929332dd3e7b..38ba813aecf3 100644 --- a/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs +++ b/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/avoid_empty_tables/stderr.log b/tests/testsuite/cargo_remove/avoid_empty_tables/stderr.log deleted file mode 100644 index 486ef359fe2a..000000000000 --- a/tests/testsuite/cargo_remove/avoid_empty_tables/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing clippy from dependencies diff --git a/tests/testsuite/cargo_remove/avoid_empty_tables/stderr.term.svg b/tests/testsuite/cargo_remove/avoid_empty_tables/stderr.term.svg new file mode 100644 index 000000000000..9f35de9070c4 --- /dev/null +++ b/tests/testsuite/cargo_remove/avoid_empty_tables/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing clippy from dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/avoid_empty_tables/stdout.term.svg b/tests/testsuite/cargo_remove/avoid_empty_tables/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/avoid_empty_tables/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/build/mod.rs b/tests/testsuite/cargo_remove/build/mod.rs index fdde6f0d4bd7..bbac6f59f24b 100644 --- a/tests/testsuite/cargo_remove/build/mod.rs +++ b/tests/testsuite/cargo_remove/build/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/build/stderr.log b/tests/testsuite/cargo_remove/build/stderr.log deleted file mode 100644 index a51bea48c9ef..000000000000 --- a/tests/testsuite/cargo_remove/build/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing semver from build-dependencies diff --git a/tests/testsuite/cargo_remove/build/stderr.term.svg b/tests/testsuite/cargo_remove/build/stderr.term.svg new file mode 100644 index 000000000000..b4135ef6491e --- /dev/null +++ b/tests/testsuite/cargo_remove/build/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing semver from build-dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/build/stdout.log b/tests/testsuite/cargo_remove/build/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/build/stdout.term.svg b/tests/testsuite/cargo_remove/build/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/build/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/dev/mod.rs b/tests/testsuite/cargo_remove/dev/mod.rs index bb3ff4e84cfe..af7791716dff 100644 --- a/tests/testsuite/cargo_remove/dev/mod.rs +++ b/tests/testsuite/cargo_remove/dev/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/dev/stderr.log b/tests/testsuite/cargo_remove/dev/stderr.log deleted file mode 100644 index ccabdb193d4f..000000000000 --- a/tests/testsuite/cargo_remove/dev/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing regex from dev-dependencies diff --git a/tests/testsuite/cargo_remove/dev/stderr.term.svg b/tests/testsuite/cargo_remove/dev/stderr.term.svg new file mode 100644 index 000000000000..292871f668b2 --- /dev/null +++ b/tests/testsuite/cargo_remove/dev/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing regex from dev-dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/dev/stdout.log b/tests/testsuite/cargo_remove/dev/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/dev/stdout.term.svg b/tests/testsuite/cargo_remove/dev/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/dev/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/dry_run/mod.rs b/tests/testsuite/cargo_remove/dry_run/mod.rs index 7b1ce0c3eb8d..b98b65877f3e 100644 --- a/tests/testsuite/cargo_remove/dry_run/mod.rs +++ b/tests/testsuite/cargo_remove/dry_run/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/dry_run/stderr.log b/tests/testsuite/cargo_remove/dry_run/stderr.log deleted file mode 100644 index 8b118911c61c..000000000000 --- a/tests/testsuite/cargo_remove/dry_run/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing semver from dependencies -warning: aborting remove due to dry run diff --git a/tests/testsuite/cargo_remove/dry_run/stderr.term.svg b/tests/testsuite/cargo_remove/dry_run/stderr.term.svg new file mode 100644 index 000000000000..2c07d066393d --- /dev/null +++ b/tests/testsuite/cargo_remove/dry_run/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Removing semver from dependencies + + warning: aborting remove due to dry run + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/dry_run/stdout.term.svg b/tests/testsuite/cargo_remove/dry_run/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/dry_run/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 007f314a10a0..c6bd9654aa29 100644 --- a/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs +++ b/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs @@ -21,8 +21,8 @@ fn case() { .args(["--package", "serde", "serde_derive"]) .assert() .code(0) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/gc_keep_used_patch/stderr.log b/tests/testsuite/cargo_remove/gc_keep_used_patch/stderr.log deleted file mode 100644 index b4377b3a4b53..000000000000 --- a/tests/testsuite/cargo_remove/gc_keep_used_patch/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing serde_derive from dependencies diff --git a/tests/testsuite/cargo_remove/gc_keep_used_patch/stderr.term.svg b/tests/testsuite/cargo_remove/gc_keep_used_patch/stderr.term.svg new file mode 100644 index 000000000000..637ca6b62c31 --- /dev/null +++ b/tests/testsuite/cargo_remove/gc_keep_used_patch/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing serde_derive from dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/gc_keep_used_patch/stdout.term.svg b/tests/testsuite/cargo_remove/gc_keep_used_patch/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/gc_keep_used_patch/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/gc_patch/mod.rs b/tests/testsuite/cargo_remove/gc_patch/mod.rs index 4d68c216c788..6e8f8cf3206c 100644 --- a/tests/testsuite/cargo_remove/gc_patch/mod.rs +++ b/tests/testsuite/cargo_remove/gc_patch/mod.rs @@ -71,8 +71,8 @@ fn case() { .current_dir(&in_project.root()) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &in_project.root()); } diff --git a/tests/testsuite/cargo_remove/gc_patch/stderr.log b/tests/testsuite/cargo_remove/gc_patch/stderr.log deleted file mode 100644 index ba519ba1b912..000000000000 --- a/tests/testsuite/cargo_remove/gc_patch/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing bar from dependencies diff --git a/tests/testsuite/cargo_remove/gc_patch/stderr.term.svg b/tests/testsuite/cargo_remove/gc_patch/stderr.term.svg new file mode 100644 index 000000000000..23ee08c3c515 --- /dev/null +++ b/tests/testsuite/cargo_remove/gc_patch/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing bar from dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/gc_patch/stdout.term.svg b/tests/testsuite/cargo_remove/gc_patch/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/gc_patch/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/gc_profile/mod.rs b/tests/testsuite/cargo_remove/gc_profile/mod.rs index c1c52b1c6124..76b3728e7478 100644 --- a/tests/testsuite/cargo_remove/gc_profile/mod.rs +++ b/tests/testsuite/cargo_remove/gc_profile/mod.rs @@ -30,8 +30,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/gc_profile/stderr.log b/tests/testsuite/cargo_remove/gc_profile/stderr.log deleted file mode 100644 index 9dee9e2b713f..000000000000 --- a/tests/testsuite/cargo_remove/gc_profile/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing toml from dependencies diff --git a/tests/testsuite/cargo_remove/gc_profile/stderr.term.svg b/tests/testsuite/cargo_remove/gc_profile/stderr.term.svg new file mode 100644 index 000000000000..a879b9d409f0 --- /dev/null +++ b/tests/testsuite/cargo_remove/gc_profile/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing toml from dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/gc_profile/stdout.term.svg b/tests/testsuite/cargo_remove/gc_profile/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/gc_profile/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/gc_replace/mod.rs b/tests/testsuite/cargo_remove/gc_replace/mod.rs index 2f44c7427d78..dec94db9dee3 100644 --- a/tests/testsuite/cargo_remove/gc_replace/mod.rs +++ b/tests/testsuite/cargo_remove/gc_replace/mod.rs @@ -30,8 +30,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/gc_replace/stderr.log b/tests/testsuite/cargo_remove/gc_replace/stderr.log deleted file mode 100644 index 9dee9e2b713f..000000000000 --- a/tests/testsuite/cargo_remove/gc_replace/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing toml from dependencies diff --git a/tests/testsuite/cargo_remove/gc_replace/stderr.term.svg b/tests/testsuite/cargo_remove/gc_replace/stderr.term.svg new file mode 100644 index 000000000000..a879b9d409f0 --- /dev/null +++ b/tests/testsuite/cargo_remove/gc_replace/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing toml from dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/gc_replace/stdout.term.svg b/tests/testsuite/cargo_remove/gc_replace/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/gc_replace/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/help/mod.rs b/tests/testsuite/cargo_remove/help/mod.rs index 6af5b4c3fad4..44a3660c0033 100644 --- a/tests/testsuite/cargo_remove/help/mod.rs +++ b/tests/testsuite/cargo_remove/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_remove/help/stderr.log b/tests/testsuite/cargo_remove/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/help/stderr.term.svg b/tests/testsuite/cargo_remove/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/help/stdout.log b/tests/testsuite/cargo_remove/help/stdout.log deleted file mode 100644 index c3dc74b2da61..000000000000 --- a/tests/testsuite/cargo_remove/help/stdout.log +++ /dev/null @@ -1,31 +0,0 @@ -Remove dependencies from a Cargo.toml manifest file - -Usage: cargo[EXE] remove [OPTIONS] ... - -Arguments: - ... Dependencies to be removed - -Options: - -n, --dry-run Don't actually write the manifest - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Section: - --dev Remove from dev-dependencies - --build Remove from build-dependencies - --target Remove from target-dependencies - -Package Selection: - -p, --package [] Package to remove from - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help remove` for more detailed information. diff --git a/tests/testsuite/cargo_remove/help/stdout.term.svg b/tests/testsuite/cargo_remove/help/stdout.term.svg new file mode 100644 index 000000000000..2d675421471f --- /dev/null +++ b/tests/testsuite/cargo_remove/help/stdout.term.svg @@ -0,0 +1,84 @@ + + + + + + Remove dependencies from a Cargo.toml manifest file + + + + Usage: cargo remove [OPTIONS] <DEP_ID>... + + + + Arguments: + + <DEP_ID>... Dependencies to be removed + + + + Options: + + -n, --dry-run Don't actually write the manifest + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Section: + + --dev Remove from dev-dependencies + + --build Remove from build-dependencies + + --target <TARGET> Remove from target-dependencies + + + + Package Selection: + + -p, --package [<SPEC>] Package to remove from + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help remove` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_arg/mod.rs b/tests/testsuite/cargo_remove/invalid_arg/mod.rs index 2f4427517204..fa205ee9bf4f 100644 --- a/tests/testsuite/cargo_remove/invalid_arg/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_arg/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_arg/stderr.log b/tests/testsuite/cargo_remove/invalid_arg/stderr.log deleted file mode 100644 index ac5f3cfd175e..000000000000 --- a/tests/testsuite/cargo_remove/invalid_arg/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ -error: unexpected argument '--flag' found - - tip: to pass '--flag' as a value, use '-- --flag' - -Usage: cargo[EXE] remove ... - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_remove/invalid_arg/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_arg/stderr.term.svg new file mode 100644 index 000000000000..40d26a689fff --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_arg/stderr.term.svg @@ -0,0 +1,36 @@ + + + + + + error: unexpected argument '--flag' found + + + + tip: to pass '--flag' as a value, use '-- --flag' + + + + Usage: cargo remove <DEP_ID>... + + + + For more information, try '--help'. + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/invalid_arg/stdout.term.svg b/tests/testsuite/cargo_remove/invalid_arg/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_arg/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_dep/mod.rs index 93466218c04a..7bbbc714b0b3 100644 --- a/tests/testsuite/cargo_remove/invalid_dep/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_dep/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_dep/stderr.log b/tests/testsuite/cargo_remove/invalid_dep/stderr.log deleted file mode 100644 index 9bb137d1f469..000000000000 --- a/tests/testsuite/cargo_remove/invalid_dep/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing invalid_dependency_name from dependencies -error: the dependency `invalid_dependency_name` could not be found in `dependencies` diff --git a/tests/testsuite/cargo_remove/invalid_dep/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_dep/stderr.term.svg new file mode 100644 index 000000000000..67a07779efec --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_dep/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Removing invalid_dependency_name from dependencies + + error: the dependency `invalid_dependency_name` could not be found in `dependencies` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/invalid_dep/stdout.term.svg b/tests/testsuite/cargo_remove/invalid_dep/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_dep/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_package/mod.rs b/tests/testsuite/cargo_remove/invalid_package/mod.rs index 9376500ef892..fffdb94510fe 100644 --- a/tests/testsuite/cargo_remove/invalid_package/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_package/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_package/stderr.log b/tests/testsuite/cargo_remove/invalid_package/stderr.log deleted file mode 100644 index 683512ca007f..000000000000 --- a/tests/testsuite/cargo_remove/invalid_package/stderr.log +++ /dev/null @@ -1 +0,0 @@ -error: package(s) `dep-c` not found in workspace `[ROOT]/case` diff --git a/tests/testsuite/cargo_remove/invalid_package/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_package/stderr.term.svg new file mode 100644 index 000000000000..922e026167c1 --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_package/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + error: package(s) `dep-c` not found in workspace `[ROOT]/case` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/invalid_package/stdout.term.svg b/tests/testsuite/cargo_remove/invalid_package/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_package/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs b/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs index 4f8cd367053b..15cbaa694294 100644 --- a/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_package_multiple/stderr.log b/tests/testsuite/cargo_remove/invalid_package_multiple/stderr.log deleted file mode 100644 index 8a03c9e5b059..000000000000 --- a/tests/testsuite/cargo_remove/invalid_package_multiple/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ -error: `cargo remove` could not determine which package to modify. Use the `--package` option to specify a package. -available packages: dep-a, dep-b diff --git a/tests/testsuite/cargo_remove/invalid_package_multiple/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_package_multiple/stderr.term.svg new file mode 100644 index 000000000000..35f25579e3ee --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_package_multiple/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + error: `cargo remove` could not determine which package to modify. Use the `--package` option to specify a package. + + available packages: dep-a, dep-b + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/invalid_package_multiple/stdout.term.svg b/tests/testsuite/cargo_remove/invalid_package_multiple/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_package_multiple/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_section/mod.rs b/tests/testsuite/cargo_remove/invalid_section/mod.rs index 91bf47b7de8e..37cfcfe565b7 100644 --- a/tests/testsuite/cargo_remove/invalid_section/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_section/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_section/stderr.log b/tests/testsuite/cargo_remove/invalid_section/stderr.log deleted file mode 100644 index 8cbafa98e1a6..000000000000 --- a/tests/testsuite/cargo_remove/invalid_section/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing docopt from build-dependencies -error: the dependency `docopt` could not be found in `build-dependencies`; it is present in `dependencies` diff --git a/tests/testsuite/cargo_remove/invalid_section/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_section/stderr.term.svg new file mode 100644 index 000000000000..1c8df5127bbb --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_section/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Removing docopt from build-dependencies + + error: the dependency `docopt` could not be found in `build-dependencies`; it is present in `dependencies` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/invalid_section/stdout.term.svg b/tests/testsuite/cargo_remove/invalid_section/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_section/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs index f7537a4ffc9f..1e40575f4789 100644 --- a/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_section_dep/stderr.log b/tests/testsuite/cargo_remove/invalid_section_dep/stderr.log deleted file mode 100644 index 60c0f8b41a2a..000000000000 --- a/tests/testsuite/cargo_remove/invalid_section_dep/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing semver from dev-dependencies -error: the dependency `semver` could not be found in `dev-dependencies`; it is present in `dependencies` diff --git a/tests/testsuite/cargo_remove/invalid_section_dep/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_section_dep/stderr.term.svg new file mode 100644 index 000000000000..cc6115e3226c --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_section_dep/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Removing semver from dev-dependencies + + error: the dependency `semver` could not be found in `dev-dependencies`; it is present in `dependencies` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/invalid_section_dep/stdout.term.svg b/tests/testsuite/cargo_remove/invalid_section_dep/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_section_dep/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_target/mod.rs b/tests/testsuite/cargo_remove/invalid_target/mod.rs index 7f1b1c1138a9..39f246438603 100644 --- a/tests/testsuite/cargo_remove/invalid_target/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_target/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_target/stderr.log b/tests/testsuite/cargo_remove/invalid_target/stderr.log deleted file mode 100644 index eae9f7887621..000000000000 --- a/tests/testsuite/cargo_remove/invalid_target/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing dbus from dependencies for target `powerpc-unknown-linux-gnu` -error: the dependency `dbus` could not be found in `target.powerpc-unknown-linux-gnu.dependencies`; it is present in `target.x86_64-unknown-linux-gnu.dependencies` diff --git a/tests/testsuite/cargo_remove/invalid_target/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_target/stderr.term.svg new file mode 100644 index 000000000000..ad41723d21bd --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_target/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Removing dbus from dependencies for target `powerpc-unknown-linux-gnu` + + error: the dependency `dbus` could not be found in `target.powerpc-unknown-linux-gnu.dependencies`; it is present in `target.x86_64-unknown-linux-gnu.dependencies` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/invalid_target/stdout.term.svg b/tests/testsuite/cargo_remove/invalid_target/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_target/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs index bd045832940f..52e204c804cf 100644 --- a/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs +++ b/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/invalid_target_dep/stderr.log b/tests/testsuite/cargo_remove/invalid_target_dep/stderr.log deleted file mode 100644 index 635a7bd6c8fb..000000000000 --- a/tests/testsuite/cargo_remove/invalid_target_dep/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing toml from dependencies for target `x86_64-unknown-linux-gnu` -error: the dependency `toml` could not be found in `target.x86_64-unknown-linux-gnu.dependencies`; it is present in `dependencies` diff --git a/tests/testsuite/cargo_remove/invalid_target_dep/stderr.term.svg b/tests/testsuite/cargo_remove/invalid_target_dep/stderr.term.svg new file mode 100644 index 000000000000..503fc17b3a00 --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_target_dep/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + Removing toml from dependencies for target `x86_64-unknown-linux-gnu` + + error: the dependency `toml` could not be found in `target.x86_64-unknown-linux-gnu.dependencies`; it is present in `dependencies` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/invalid_target_dep/stdout.term.svg b/tests/testsuite/cargo_remove/invalid_target_dep/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/invalid_target_dep/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/multiple_deps/mod.rs b/tests/testsuite/cargo_remove/multiple_deps/mod.rs index a897114df552..e46d8ce75d25 100644 --- a/tests/testsuite/cargo_remove/multiple_deps/mod.rs +++ b/tests/testsuite/cargo_remove/multiple_deps/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/multiple_deps/stderr.log b/tests/testsuite/cargo_remove/multiple_deps/stderr.log deleted file mode 100644 index 111b1e94acdb..000000000000 --- a/tests/testsuite/cargo_remove/multiple_deps/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing docopt from dependencies - Removing semver from dependencies diff --git a/tests/testsuite/cargo_remove/multiple_deps/stderr.term.svg b/tests/testsuite/cargo_remove/multiple_deps/stderr.term.svg new file mode 100644 index 000000000000..fb267939ca74 --- /dev/null +++ b/tests/testsuite/cargo_remove/multiple_deps/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Removing docopt from dependencies + + Removing semver from dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/multiple_deps/stdout.term.svg b/tests/testsuite/cargo_remove/multiple_deps/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/multiple_deps/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/multiple_dev/mod.rs b/tests/testsuite/cargo_remove/multiple_dev/mod.rs index 17d658ba9bb1..f663a1796254 100644 --- a/tests/testsuite/cargo_remove/multiple_dev/mod.rs +++ b/tests/testsuite/cargo_remove/multiple_dev/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/multiple_dev/stderr.log b/tests/testsuite/cargo_remove/multiple_dev/stderr.log deleted file mode 100644 index 8a69c94f55cb..000000000000 --- a/tests/testsuite/cargo_remove/multiple_dev/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing regex from dev-dependencies - Removing serde from dev-dependencies diff --git a/tests/testsuite/cargo_remove/multiple_dev/stderr.term.svg b/tests/testsuite/cargo_remove/multiple_dev/stderr.term.svg new file mode 100644 index 000000000000..acbff24a0461 --- /dev/null +++ b/tests/testsuite/cargo_remove/multiple_dev/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Removing regex from dev-dependencies + + Removing serde from dev-dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/multiple_dev/stdout.term.svg b/tests/testsuite/cargo_remove/multiple_dev/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/multiple_dev/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/no_arg/mod.rs b/tests/testsuite/cargo_remove/no_arg/mod.rs index 794fa69c2e29..7dc596c8321a 100644 --- a/tests/testsuite/cargo_remove/no_arg/mod.rs +++ b/tests/testsuite/cargo_remove/no_arg/mod.rs @@ -28,8 +28,8 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/no_arg/stderr.log b/tests/testsuite/cargo_remove/no_arg/stderr.log deleted file mode 100644 index 54fa9f424056..000000000000 --- a/tests/testsuite/cargo_remove/no_arg/stderr.log +++ /dev/null @@ -1,6 +0,0 @@ -error: the following required arguments were not provided: - ... - -Usage: cargo[EXE] remove ... - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_remove/no_arg/stderr.term.svg b/tests/testsuite/cargo_remove/no_arg/stderr.term.svg new file mode 100644 index 000000000000..c4c7c06435f7 --- /dev/null +++ b/tests/testsuite/cargo_remove/no_arg/stderr.term.svg @@ -0,0 +1,34 @@ + + + + + + error: the following required arguments were not provided: + + <DEP_ID>... + + + + Usage: cargo remove <DEP_ID>... + + + + For more information, try '--help'. + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/no_arg/stdout.term.svg b/tests/testsuite/cargo_remove/no_arg/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/no_arg/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/offline/mod.rs b/tests/testsuite/cargo_remove/offline/mod.rs index a09fa197890f..f4a99aeec2bc 100644 --- a/tests/testsuite/cargo_remove/offline/mod.rs +++ b/tests/testsuite/cargo_remove/offline/mod.rs @@ -36,8 +36,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/offline/stderr.log b/tests/testsuite/cargo_remove/offline/stderr.log deleted file mode 100644 index 7083976b17de..000000000000 --- a/tests/testsuite/cargo_remove/offline/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing docopt from dependencies diff --git a/tests/testsuite/cargo_remove/offline/stderr.term.svg b/tests/testsuite/cargo_remove/offline/stderr.term.svg new file mode 100644 index 000000000000..7a1ed05603f3 --- /dev/null +++ b/tests/testsuite/cargo_remove/offline/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing docopt from dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/offline/stdout.log b/tests/testsuite/cargo_remove/offline/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/offline/stdout.term.svg b/tests/testsuite/cargo_remove/offline/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/offline/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs b/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs index 89999c97351a..a49db6e7cc10 100644 --- a/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs +++ b/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/optional_dep_feature/stderr.log b/tests/testsuite/cargo_remove/optional_dep_feature/stderr.log deleted file mode 100644 index d3656ec540e9..000000000000 --- a/tests/testsuite/cargo_remove/optional_dep_feature/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing serde from dev-dependencies diff --git a/tests/testsuite/cargo_remove/optional_dep_feature/stderr.term.svg b/tests/testsuite/cargo_remove/optional_dep_feature/stderr.term.svg new file mode 100644 index 000000000000..41bf8ba7f1af --- /dev/null +++ b/tests/testsuite/cargo_remove/optional_dep_feature/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing serde from dev-dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/optional_dep_feature/stdout.term.svg b/tests/testsuite/cargo_remove/optional_dep_feature/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/optional_dep_feature/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 ed024fbbeaf3..3c057e13ff0e 100644 --- a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs +++ b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stderr.log b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stderr.log deleted file mode 100644 index 7bceb0f94457..000000000000 --- a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Removing docopt from dependencies - Removing toml from dependencies diff --git a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stderr.term.svg b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stderr.term.svg new file mode 100644 index 000000000000..51c91c114222 --- /dev/null +++ b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + Removing docopt from dependencies + + Removing toml from dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stdout.term.svg b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/optional_feature/mod.rs b/tests/testsuite/cargo_remove/optional_feature/mod.rs index 45f1d7c6124a..7ed0658d843c 100644 --- a/tests/testsuite/cargo_remove/optional_feature/mod.rs +++ b/tests/testsuite/cargo_remove/optional_feature/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/optional_feature/stderr.log b/tests/testsuite/cargo_remove/optional_feature/stderr.log deleted file mode 100644 index ef7354ef1838..000000000000 --- a/tests/testsuite/cargo_remove/optional_feature/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing semver from dependencies diff --git a/tests/testsuite/cargo_remove/optional_feature/stderr.term.svg b/tests/testsuite/cargo_remove/optional_feature/stderr.term.svg new file mode 100644 index 000000000000..39c2296257ca --- /dev/null +++ b/tests/testsuite/cargo_remove/optional_feature/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing semver from dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/optional_feature/stdout.term.svg b/tests/testsuite/cargo_remove/optional_feature/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/optional_feature/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/package/mod.rs b/tests/testsuite/cargo_remove/package/mod.rs index 6704532315b8..c20e07f0435e 100644 --- a/tests/testsuite/cargo_remove/package/mod.rs +++ b/tests/testsuite/cargo_remove/package/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/package/stderr.log b/tests/testsuite/cargo_remove/package/stderr.log deleted file mode 100644 index 7083976b17de..000000000000 --- a/tests/testsuite/cargo_remove/package/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing docopt from dependencies diff --git a/tests/testsuite/cargo_remove/package/stderr.term.svg b/tests/testsuite/cargo_remove/package/stderr.term.svg new file mode 100644 index 000000000000..7a1ed05603f3 --- /dev/null +++ b/tests/testsuite/cargo_remove/package/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing docopt from dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/package/stdout.log b/tests/testsuite/cargo_remove/package/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/package/stdout.term.svg b/tests/testsuite/cargo_remove/package/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/package/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/remove_basic/mod.rs b/tests/testsuite/cargo_remove/remove_basic/mod.rs index 886f24204ba1..2991a2825dec 100644 --- a/tests/testsuite/cargo_remove/remove_basic/mod.rs +++ b/tests/testsuite/cargo_remove/remove_basic/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/remove_basic/stderr.log b/tests/testsuite/cargo_remove/remove_basic/stderr.log deleted file mode 100644 index 7083976b17de..000000000000 --- a/tests/testsuite/cargo_remove/remove_basic/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing docopt from dependencies diff --git a/tests/testsuite/cargo_remove/remove_basic/stderr.term.svg b/tests/testsuite/cargo_remove/remove_basic/stderr.term.svg new file mode 100644 index 000000000000..7a1ed05603f3 --- /dev/null +++ b/tests/testsuite/cargo_remove/remove_basic/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing docopt from dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/remove_basic/stdout.term.svg b/tests/testsuite/cargo_remove/remove_basic/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/remove_basic/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + 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 f8ea82a9f941..38f7fbebcca0 100644 --- a/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs +++ b/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs @@ -19,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/skip_gc_glob_profile/stderr.log b/tests/testsuite/cargo_remove/skip_gc_glob_profile/stderr.log deleted file mode 100644 index 9dee9e2b713f..000000000000 --- a/tests/testsuite/cargo_remove/skip_gc_glob_profile/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing toml from dependencies diff --git a/tests/testsuite/cargo_remove/skip_gc_glob_profile/stderr.term.svg b/tests/testsuite/cargo_remove/skip_gc_glob_profile/stderr.term.svg new file mode 100644 index 000000000000..a879b9d409f0 --- /dev/null +++ b/tests/testsuite/cargo_remove/skip_gc_glob_profile/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing toml from dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/skip_gc_glob_profile/stdout.term.svg b/tests/testsuite/cargo_remove/skip_gc_glob_profile/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/skip_gc_glob_profile/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/target/mod.rs b/tests/testsuite/cargo_remove/target/mod.rs index b9c966a1f41d..467b5b3e4461 100644 --- a/tests/testsuite/cargo_remove/target/mod.rs +++ b/tests/testsuite/cargo_remove/target/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/target/stderr.log b/tests/testsuite/cargo_remove/target/stderr.log deleted file mode 100644 index 8fb1b5000b85..000000000000 --- a/tests/testsuite/cargo_remove/target/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing dbus from dependencies for target `x86_64-unknown-linux-gnu` diff --git a/tests/testsuite/cargo_remove/target/stderr.term.svg b/tests/testsuite/cargo_remove/target/stderr.term.svg new file mode 100644 index 000000000000..8bc1c10cc3eb --- /dev/null +++ b/tests/testsuite/cargo_remove/target/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing dbus from dependencies for target `x86_64-unknown-linux-gnu` + + + + + + diff --git a/tests/testsuite/cargo_remove/target/stdout.log b/tests/testsuite/cargo_remove/target/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/target/stdout.term.svg b/tests/testsuite/cargo_remove/target/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/target/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/target_build/mod.rs b/tests/testsuite/cargo_remove/target_build/mod.rs index 54beb798b36a..dc55d3bce53a 100644 --- a/tests/testsuite/cargo_remove/target_build/mod.rs +++ b/tests/testsuite/cargo_remove/target_build/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/target_build/stderr.log b/tests/testsuite/cargo_remove/target_build/stderr.log deleted file mode 100644 index 673a47cebd2b..000000000000 --- a/tests/testsuite/cargo_remove/target_build/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing semver from build-dependencies for target `x86_64-unknown-linux-gnu` diff --git a/tests/testsuite/cargo_remove/target_build/stderr.term.svg b/tests/testsuite/cargo_remove/target_build/stderr.term.svg new file mode 100644 index 000000000000..8edfd4305e1c --- /dev/null +++ b/tests/testsuite/cargo_remove/target_build/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing semver from build-dependencies for target `x86_64-unknown-linux-gnu` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/target_build/stdout.term.svg b/tests/testsuite/cargo_remove/target_build/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/target_build/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/target_dev/mod.rs b/tests/testsuite/cargo_remove/target_dev/mod.rs index 12a3a10286b3..3919b2d46772 100644 --- a/tests/testsuite/cargo_remove/target_dev/mod.rs +++ b/tests/testsuite/cargo_remove/target_dev/mod.rs @@ -31,8 +31,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/target_dev/stderr.log b/tests/testsuite/cargo_remove/target_dev/stderr.log deleted file mode 100644 index 854aff44a77f..000000000000 --- a/tests/testsuite/cargo_remove/target_dev/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing ncurses from dev-dependencies for target `x86_64-unknown-linux-gnu` diff --git a/tests/testsuite/cargo_remove/target_dev/stderr.term.svg b/tests/testsuite/cargo_remove/target_dev/stderr.term.svg new file mode 100644 index 000000000000..c2e0c05e55b2 --- /dev/null +++ b/tests/testsuite/cargo_remove/target_dev/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing ncurses from dev-dependencies for target `x86_64-unknown-linux-gnu` + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/target_dev/stdout.term.svg b/tests/testsuite/cargo_remove/target_dev/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/target_dev/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/update_lock_file/mod.rs b/tests/testsuite/cargo_remove/update_lock_file/mod.rs index a589aa9759ba..d65ad9519605 100644 --- a/tests/testsuite/cargo_remove/update_lock_file/mod.rs +++ b/tests/testsuite/cargo_remove/update_lock_file/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/update_lock_file/stderr.log b/tests/testsuite/cargo_remove/update_lock_file/stderr.log deleted file mode 100644 index 1494b0fc5794..000000000000 --- a/tests/testsuite/cargo_remove/update_lock_file/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing rustc-serialize from dependencies diff --git a/tests/testsuite/cargo_remove/update_lock_file/stderr.term.svg b/tests/testsuite/cargo_remove/update_lock_file/stderr.term.svg new file mode 100644 index 000000000000..cecdc67fd360 --- /dev/null +++ b/tests/testsuite/cargo_remove/update_lock_file/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing rustc-serialize from dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/update_lock_file/stdout.term.svg b/tests/testsuite/cargo_remove/update_lock_file/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/update_lock_file/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/workspace/mod.rs b/tests/testsuite/cargo_remove/workspace/mod.rs index cdc707e80697..3a5a863412bf 100644 --- a/tests/testsuite/cargo_remove/workspace/mod.rs +++ b/tests/testsuite/cargo_remove/workspace/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/workspace/stderr.log b/tests/testsuite/cargo_remove/workspace/stderr.log deleted file mode 100644 index a51bea48c9ef..000000000000 --- a/tests/testsuite/cargo_remove/workspace/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing semver from build-dependencies diff --git a/tests/testsuite/cargo_remove/workspace/stderr.term.svg b/tests/testsuite/cargo_remove/workspace/stderr.term.svg new file mode 100644 index 000000000000..b4135ef6491e --- /dev/null +++ b/tests/testsuite/cargo_remove/workspace/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing semver from build-dependencies + + + + + + diff --git a/tests/testsuite/cargo_remove/workspace/stdout.log b/tests/testsuite/cargo_remove/workspace/stdout.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/workspace/stdout.term.svg b/tests/testsuite/cargo_remove/workspace/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/workspace/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs b/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs index cdc707e80697..3a5a863412bf 100644 --- a/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs +++ b/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/workspace_non_virtual/stderr.log b/tests/testsuite/cargo_remove/workspace_non_virtual/stderr.log deleted file mode 100644 index a51bea48c9ef..000000000000 --- a/tests/testsuite/cargo_remove/workspace_non_virtual/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing semver from build-dependencies diff --git a/tests/testsuite/cargo_remove/workspace_non_virtual/stderr.term.svg b/tests/testsuite/cargo_remove/workspace_non_virtual/stderr.term.svg new file mode 100644 index 000000000000..b4135ef6491e --- /dev/null +++ b/tests/testsuite/cargo_remove/workspace_non_virtual/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing semver from build-dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/workspace_non_virtual/stdout.term.svg b/tests/testsuite/cargo_remove/workspace_non_virtual/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/workspace_non_virtual/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_remove/workspace_preserved/mod.rs b/tests/testsuite/cargo_remove/workspace_preserved/mod.rs index cdc707e80697..3a5a863412bf 100644 --- a/tests/testsuite/cargo_remove/workspace_preserved/mod.rs +++ b/tests/testsuite/cargo_remove/workspace_preserved/mod.rs @@ -29,8 +29,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/testsuite/cargo_remove/workspace_preserved/stderr.log b/tests/testsuite/cargo_remove/workspace_preserved/stderr.log deleted file mode 100644 index a51bea48c9ef..000000000000 --- a/tests/testsuite/cargo_remove/workspace_preserved/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Removing semver from build-dependencies diff --git a/tests/testsuite/cargo_remove/workspace_preserved/stderr.term.svg b/tests/testsuite/cargo_remove/workspace_preserved/stderr.term.svg new file mode 100644 index 000000000000..b4135ef6491e --- /dev/null +++ b/tests/testsuite/cargo_remove/workspace_preserved/stderr.term.svg @@ -0,0 +1,26 @@ + + + + + + Removing semver from build-dependencies + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_remove/workspace_preserved/stdout.term.svg b/tests/testsuite/cargo_remove/workspace_preserved/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_remove/workspace_preserved/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_report/help/mod.rs b/tests/testsuite/cargo_report/help/mod.rs index 3522164751b2..388da5fa57aa 100644 --- a/tests/testsuite/cargo_report/help/mod.rs +++ b/tests/testsuite/cargo_report/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_report/help/stderr.log b/tests/testsuite/cargo_report/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_report/help/stderr.term.svg b/tests/testsuite/cargo_report/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_report/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_report/help/stdout.log b/tests/testsuite/cargo_report/help/stdout.log deleted file mode 100644 index 95872662ef54..000000000000 --- a/tests/testsuite/cargo_report/help/stdout.log +++ /dev/null @@ -1,21 +0,0 @@ -Generate and display various kinds of reports - -Usage: cargo[EXE] report [OPTIONS] - -Commands: - future-incompatibilities Reports any crates which will eventually stop compiling - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help report` for more detailed information. diff --git a/tests/testsuite/cargo_report/help/stdout.term.svg b/tests/testsuite/cargo_report/help/stdout.term.svg new file mode 100644 index 000000000000..6a66bb02317b --- /dev/null +++ b/tests/testsuite/cargo_report/help/stdout.term.svg @@ -0,0 +1,64 @@ + + + + + + Generate and display various kinds of reports + + + + Usage: cargo report [OPTIONS] <COMMAND> + + + + Commands: + + future-incompatibilities Reports any crates which will eventually stop compiling + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help report` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_run/help/mod.rs b/tests/testsuite/cargo_run/help/mod.rs index fc2db82578f6..44b8b900c9d7 100644 --- a/tests/testsuite/cargo_run/help/mod.rs +++ b/tests/testsuite/cargo_run/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_run/help/stderr.log b/tests/testsuite/cargo_run/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_run/help/stderr.term.svg b/tests/testsuite/cargo_run/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_run/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_run/help/stdout.log b/tests/testsuite/cargo_run/help/stdout.log deleted file mode 100644 index 2e39d4f9ebd8..000000000000 --- a/tests/testsuite/cargo_run/help/stdout.log +++ /dev/null @@ -1,47 +0,0 @@ -Run a binary or example of the local package - -Usage: cargo[EXE] run [OPTIONS] [ARGS]... - -Arguments: - [ARGS]... Arguments for the binary or example to run - -Options: - --ignore-rust-version Ignore `rust-version` specification in packages - --message-format Error format - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package with the target to run - -Target Selection: - --bin [] Name of the bin target to run - --example [] Name of the example target to run - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - -r, --release Build artifacts in release mode, with optimizations - --profile Build artifacts with the specified profile - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help run` for more detailed information. diff --git a/tests/testsuite/cargo_run/help/stdout.term.svg b/tests/testsuite/cargo_run/help/stdout.term.svg new file mode 100644 index 000000000000..81874e734810 --- /dev/null +++ b/tests/testsuite/cargo_run/help/stdout.term.svg @@ -0,0 +1,116 @@ + + + + + + Run a binary or example of the local package + + + + Usage: cargo run [OPTIONS] [ARGS]... + + + + Arguments: + + [ARGS]... Arguments for the binary or example to run + + + + Options: + + --ignore-rust-version Ignore `rust-version` specification in packages + + --message-format <FMT> Error format + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package with the target to run + + + + Target Selection: + + --bin [<NAME>] Name of the bin target to run + + --example [<NAME>] Name of the example target to run + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + -r, --release Build artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help run` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_rustc/help/mod.rs b/tests/testsuite/cargo_rustc/help/mod.rs index 9f95e5f102ea..7f39f6587479 100644 --- a/tests/testsuite/cargo_rustc/help/mod.rs +++ b/tests/testsuite/cargo_rustc/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_rustc/help/stderr.log b/tests/testsuite/cargo_rustc/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_rustc/help/stderr.term.svg b/tests/testsuite/cargo_rustc/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_rustc/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_rustc/help/stdout.log b/tests/testsuite/cargo_rustc/help/stdout.log deleted file mode 100644 index 8952330b0328..000000000000 --- a/tests/testsuite/cargo_rustc/help/stdout.log +++ /dev/null @@ -1,58 +0,0 @@ -Compile a package, and pass extra options to the compiler - -Usage: cargo[EXE] rustc [OPTIONS] [ARGS]... - -Arguments: - [ARGS]... Extra rustc flags - -Options: - --print Output compiler information without compiling - --crate-type Comma separated list of types of crates for the compiler to emit - --future-incompat-report Outputs a future incompatibility report at the end of the build - --ignore-rust-version Ignore `rust-version` specification in packages - --message-format Error format - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package to build - -Target Selection: - --lib Build only this package's library - --bins Build all binaries - --bin [] Build only the specified binary - --examples Build all examples - --example [] Build only the specified example - --tests Build all test targets - --test [] Build only the specified test target - --benches Build all bench targets - --bench [] Build only the specified bench target - --all-targets Build all targets - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - -r, --release Build artifacts in release mode, with optimizations - --profile Build artifacts with the specified profile - --target [] Target triple which compiles will be for - --target-dir Directory for all generated artifacts - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help rustc` for more detailed information. diff --git a/tests/testsuite/cargo_rustc/help/stdout.term.svg b/tests/testsuite/cargo_rustc/help/stdout.term.svg new file mode 100644 index 000000000000..5dfcc6096714 --- /dev/null +++ b/tests/testsuite/cargo_rustc/help/stdout.term.svg @@ -0,0 +1,138 @@ + + + + + + Compile a package, and pass extra options to the compiler + + + + Usage: cargo rustc [OPTIONS] [ARGS]... + + + + Arguments: + + [ARGS]... Extra rustc flags + + + + Options: + + --print <INFO> Output compiler information without compiling + + --crate-type <CRATE-TYPE> Comma separated list of types of crates for the compiler to emit + + --future-incompat-report Outputs a future incompatibility report at the end of the build + + --ignore-rust-version Ignore `rust-version` specification in packages + + --message-format <FMT> Error format + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to build + + + + Target Selection: + + --lib Build only this package's library + + --bins Build all binaries + + --bin [<NAME>] Build only the specified binary + + --examples Build all examples + + --example [<NAME>] Build only the specified example + + --tests Build all test targets + + --test [<NAME>] Build only the specified test target + + --benches Build all bench targets + + --bench [<NAME>] Build only the specified bench target + + --all-targets Build all targets + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + -r, --release Build artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + --target [<TRIPLE>] Target triple which compiles will be for + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help rustc` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_rustdoc/help/mod.rs b/tests/testsuite/cargo_rustdoc/help/mod.rs index bd6e2977eaf9..dbf0f35f3495 100644 --- a/tests/testsuite/cargo_rustdoc/help/mod.rs +++ b/tests/testsuite/cargo_rustdoc/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_rustdoc/help/stderr.log b/tests/testsuite/cargo_rustdoc/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_rustdoc/help/stderr.term.svg b/tests/testsuite/cargo_rustdoc/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_rustdoc/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_rustdoc/help/stdout.log b/tests/testsuite/cargo_rustdoc/help/stdout.log deleted file mode 100644 index 6e0e999178e2..000000000000 --- a/tests/testsuite/cargo_rustdoc/help/stdout.log +++ /dev/null @@ -1,57 +0,0 @@ -Build a package's documentation, using specified custom flags. - -Usage: cargo[EXE] rustdoc [OPTIONS] [ARGS]... - -Arguments: - [ARGS]... Extra rustdoc flags - -Options: - --open Opens the docs in a browser after the operation - --ignore-rust-version Ignore `rust-version` specification in packages - --message-format Error format - --output-format The output type to write (unstable) [possible values: html, json] - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package to document - -Target Selection: - --lib Build only this package's library - --bins Build all binaries - --bin [] Build only the specified binary - --examples Build all examples - --example [] Build only the specified example - --tests Build all test targets - --test [] Build only the specified test target - --benches Build all bench targets - --bench [] Build only the specified bench target - --all-targets Build all targets - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - --keep-going Do not abort the build as soon as there is an error - -r, --release Build artifacts in release mode, with optimizations - --profile Build artifacts with the specified profile - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help rustdoc` for more detailed information. diff --git a/tests/testsuite/cargo_rustdoc/help/stdout.term.svg b/tests/testsuite/cargo_rustdoc/help/stdout.term.svg new file mode 100644 index 000000000000..bffb78e10d6d --- /dev/null +++ b/tests/testsuite/cargo_rustdoc/help/stdout.term.svg @@ -0,0 +1,136 @@ + + + + + + Build a package's documentation, using specified custom flags. + + + + Usage: cargo rustdoc [OPTIONS] [ARGS]... + + + + Arguments: + + [ARGS]... Extra rustdoc flags + + + + Options: + + --open Opens the docs in a browser after the operation + + --ignore-rust-version Ignore `rust-version` specification in packages + + --message-format <FMT> Error format + + --output-format <FMT> The output type to write (unstable) [possible values: html, json] + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to document + + + + Target Selection: + + --lib Build only this package's library + + --bins Build all binaries + + --bin [<NAME>] Build only the specified binary + + --examples Build all examples + + --example [<NAME>] Build only the specified example + + --tests Build all test targets + + --test [<NAME>] Build only the specified test target + + --benches Build all bench targets + + --bench [<NAME>] Build only the specified bench target + + --all-targets Build all targets + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + --keep-going Do not abort the build as soon as there is an error + + -r, --release Build artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help rustdoc` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_search/help/mod.rs b/tests/testsuite/cargo_search/help/mod.rs index f8f78c52b53b..5cdcdcbffde7 100644 --- a/tests/testsuite/cargo_search/help/mod.rs +++ b/tests/testsuite/cargo_search/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_search/help/stderr.log b/tests/testsuite/cargo_search/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_search/help/stderr.term.svg b/tests/testsuite/cargo_search/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_search/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_search/help/stdout.log b/tests/testsuite/cargo_search/help/stdout.log deleted file mode 100644 index e2024a9903b8..000000000000 --- a/tests/testsuite/cargo_search/help/stdout.log +++ /dev/null @@ -1,24 +0,0 @@ -Search packages in the registry. Default registry is crates.io - -Usage: cargo[EXE] search [OPTIONS] [QUERY]... - -Arguments: - [QUERY]... - -Options: - --limit Limit the number of results (default: 10, max: 100) - --index Registry index URL to search packages in - --registry Registry to search packages in - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help search` for more detailed information. diff --git a/tests/testsuite/cargo_search/help/stdout.term.svg b/tests/testsuite/cargo_search/help/stdout.term.svg new file mode 100644 index 000000000000..54f75c6805eb --- /dev/null +++ b/tests/testsuite/cargo_search/help/stdout.term.svg @@ -0,0 +1,70 @@ + + + + + + Search packages in the registry. Default registry is crates.io + + + + Usage: cargo search [OPTIONS] [QUERY]... + + + + Arguments: + + [QUERY]... + + + + Options: + + --limit <LIMIT> Limit the number of results (default: 10, max: 100) + + --index <INDEX> Registry index URL to search packages in + + --registry <REGISTRY> Registry to search packages in + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help search` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_test/help/mod.rs b/tests/testsuite/cargo_test/help/mod.rs index 1a3cdf4ce477..9e0d67f2bde2 100644 --- a/tests/testsuite/cargo_test/help/mod.rs +++ b/tests/testsuite/cargo_test/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_test/help/stderr.log b/tests/testsuite/cargo_test/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_test/help/stderr.term.svg b/tests/testsuite/cargo_test/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_test/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_test/help/stdout.log b/tests/testsuite/cargo_test/help/stdout.log deleted file mode 100644 index eabfd19bca1c..000000000000 --- a/tests/testsuite/cargo_test/help/stdout.log +++ /dev/null @@ -1,63 +0,0 @@ -Execute all unit and integration tests and build examples of a local package - -Usage: cargo[EXE] test [OPTIONS] [TESTNAME] [-- [ARGS]...] - -Arguments: - [TESTNAME] If specified, only run tests containing this string in their names - [ARGS]... Arguments for the test binary - -Options: - --doc Test only this library's documentation - --no-run Compile, but don't run tests - --no-fail-fast Run all tests regardless of failure - --ignore-rust-version Ignore `rust-version` specification in packages - --future-incompat-report Outputs a future incompatibility report at the end of the build - --message-format Error format - -q, --quiet Display one character per test instead of one line - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Package Selection: - -p, --package [] Package to run tests for - --workspace Test all packages in the workspace - --exclude Exclude packages from the test - --all Alias for --workspace (deprecated) - -Target Selection: - --lib Test only this package's library - --bins Test all binaries - --bin [] Test only the specified binary - --examples Test all examples - --example [] Test only the specified example - --tests Test all test targets - --test [] Test only the specified test target - --benches Test all bench targets - --bench [] Test only the specified bench target - --all-targets Test all targets (does not include doctests) - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - -j, --jobs Number of parallel jobs, defaults to # of CPUs. - -r, --release Build artifacts in release mode, with optimizations - --profile Build artifacts with the specified profile - --target [] Build for the target triple - --target-dir Directory for all generated artifacts - --unit-graph Output build graph in JSON (unstable) - --timings[=] Timing output formats (unstable) (comma separated): html, json - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help test` for more detailed information. -Run `cargo test -- --help` for test binary options. diff --git a/tests/testsuite/cargo_test/help/stdout.term.svg b/tests/testsuite/cargo_test/help/stdout.term.svg new file mode 100644 index 000000000000..6b858e6ce501 --- /dev/null +++ b/tests/testsuite/cargo_test/help/stdout.term.svg @@ -0,0 +1,148 @@ + + + + + + Execute all unit and integration tests and build examples of a local package + + + + Usage: cargo test [OPTIONS] [TESTNAME] [-- [ARGS]...] + + + + Arguments: + + [TESTNAME] If specified, only run tests containing this string in their names + + [ARGS]... Arguments for the test binary + + + + Options: + + --doc Test only this library's documentation + + --no-run Compile, but don't run tests + + --no-fail-fast Run all tests regardless of failure + + --ignore-rust-version Ignore `rust-version` specification in packages + + --future-incompat-report Outputs a future incompatibility report at the end of the build + + --message-format <FMT> Error format + + -q, --quiet Display one character per test instead of one line + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to run tests for + + --workspace Test all packages in the workspace + + --exclude <SPEC> Exclude packages from the test + + --all Alias for --workspace (deprecated) + + + + Target Selection: + + --lib Test only this package's library + + --bins Test all binaries + + --bin [<NAME>] Test only the specified binary + + --examples Test all examples + + --example [<NAME>] Test only the specified example + + --tests Test all test targets + + --test [<NAME>] Test only the specified test target + + --benches Test all bench targets + + --bench [<NAME>] Test only the specified bench target + + --all-targets Test all targets (does not include doctests) + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + + -r, --release Build artifacts in release mode, with optimizations + + --profile <PROFILE-NAME> Build artifacts with the specified profile + + --target [<TRIPLE>] Build for the target triple + + --target-dir <DIRECTORY> Directory for all generated artifacts + + --unit-graph Output build graph in JSON (unstable) + + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help test` for more detailed information. + + Run `cargo test -- --help` for test binary options. + + + + + + diff --git a/tests/testsuite/cargo_test/no_keep_going/mod.rs b/tests/testsuite/cargo_test/no_keep_going/mod.rs index 17c65fa3da54..9a3e0a99b876 100644 --- a/tests/testsuite/cargo_test/no_keep_going/mod.rs +++ b/tests/testsuite/cargo_test/no_keep_going/mod.rs @@ -15,6 +15,6 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_test/no_keep_going/stderr.log b/tests/testsuite/cargo_test/no_keep_going/stderr.log deleted file mode 100644 index 22323e651e79..000000000000 --- a/tests/testsuite/cargo_test/no_keep_going/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ -error: unexpected argument '--keep-going' found - - tip: use `--no-fail-fast` to run as many tests as possible regardless of failure - -Usage: cargo[EXE] test [OPTIONS] [TESTNAME] [-- [ARGS]...] - -For more information, try '--help'. diff --git a/tests/testsuite/cargo_test/no_keep_going/stderr.term.svg b/tests/testsuite/cargo_test/no_keep_going/stderr.term.svg new file mode 100644 index 000000000000..d0cf98beb1b0 --- /dev/null +++ b/tests/testsuite/cargo_test/no_keep_going/stderr.term.svg @@ -0,0 +1,36 @@ + + + + + + error: unexpected argument '--keep-going' found + + + + tip: use `--no-fail-fast` to run as many tests as possible regardless of failure + + + + Usage: cargo test [OPTIONS] [TESTNAME] [-- [ARGS]...] + + + + For more information, try '--help'. + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_test/no_keep_going/stdout.term.svg b/tests/testsuite/cargo_test/no_keep_going/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_test/no_keep_going/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_tree/help/mod.rs b/tests/testsuite/cargo_tree/help/mod.rs index d67582e6a15e..844c746d4490 100644 --- a/tests/testsuite/cargo_tree/help/mod.rs +++ b/tests/testsuite/cargo_tree/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_tree/help/stderr.log b/tests/testsuite/cargo_tree/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_tree/help/stderr.term.svg b/tests/testsuite/cargo_tree/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_tree/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_tree/help/stdout.log b/tests/testsuite/cargo_tree/help/stdout.log deleted file mode 100644 index 9865fd59e283..000000000000 --- a/tests/testsuite/cargo_tree/help/stdout.log +++ /dev/null @@ -1,45 +0,0 @@ -Display a tree visualization of a dependency graph - -Usage: cargo[EXE] tree [OPTIONS] - -Options: - -e, --edges The kinds of dependencies to display (features, normal, build, dev, all, - no-normal, no-build, no-dev, no-proc-macro) - -i, --invert [] Invert the tree direction and focus on the given package - --prune Prune the given package from the display of the dependency tree - --depth Maximum display depth of the dependency tree - --prefix Change the prefix (indentation) of how each entry is displayed [default: - indent] [possible values: depth, indent, none] - --no-dedupe Do not de-duplicate (repeats all shared dependencies) - -d, --duplicates Show only dependencies which come in multiple versions (implies -i) - --charset Character set to use in output [default: utf8] [possible values: utf8, - ascii] - -f, --format Format string used for printing dependencies [default: {p}] - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Package Selection: - -p, --package [] Package to be used as the root of the tree - --workspace Display the tree for all packages in the workspace - --exclude Exclude specific workspace members - -Feature Selection: - -F, --features Space or comma separated list of features to activate - --all-features Activate all available features - --no-default-features Do not activate the `default` feature - -Compilation Options: - --target [] Filter dependencies matching the given target-triple (default host - platform). Pass `all` to include all targets. - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help tree` for more detailed information. diff --git a/tests/testsuite/cargo_tree/help/stdout.term.svg b/tests/testsuite/cargo_tree/help/stdout.term.svg new file mode 100644 index 000000000000..b2d894811573 --- /dev/null +++ b/tests/testsuite/cargo_tree/help/stdout.term.svg @@ -0,0 +1,112 @@ + + + + + + Display a tree visualization of a dependency graph + + + + Usage: cargo tree [OPTIONS] + + + + Options: + + -e, --edges <KINDS> The kinds of dependencies to display (features, normal, build, dev, all, + + no-normal, no-build, no-dev, no-proc-macro) + + -i, --invert [<SPEC>] Invert the tree direction and focus on the given package + + --prune <SPEC> Prune the given package from the display of the dependency tree + + --depth <DEPTH> Maximum display depth of the dependency tree + + --prefix <PREFIX> Change the prefix (indentation) of how each entry is displayed [default: + + indent] [possible values: depth, indent, none] + + --no-dedupe Do not de-duplicate (repeats all shared dependencies) + + -d, --duplicates Show only dependencies which come in multiple versions (implies -i) + + --charset <CHARSET> Character set to use in output [default: utf8] [possible values: utf8, + + ascii] + + -f, --format <FORMAT> Format string used for printing dependencies [default: {p}] + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to be used as the root of the tree + + --workspace Display the tree for all packages in the workspace + + --exclude <SPEC> Exclude specific workspace members + + + + Feature Selection: + + -F, --features <FEATURES> Space or comma separated list of features to activate + + --all-features Activate all available features + + --no-default-features Do not activate the `default` feature + + + + Compilation Options: + + --target [<TRIPLE>] Filter dependencies matching the given target-triple (default host + + platform). Pass `all` to include all targets. + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help tree` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_uninstall/help/mod.rs b/tests/testsuite/cargo_uninstall/help/mod.rs index b32a378aa39e..64163a7b85b7 100644 --- a/tests/testsuite/cargo_uninstall/help/mod.rs +++ b/tests/testsuite/cargo_uninstall/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_uninstall/help/stderr.log b/tests/testsuite/cargo_uninstall/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_uninstall/help/stderr.term.svg b/tests/testsuite/cargo_uninstall/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_uninstall/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_uninstall/help/stdout.log b/tests/testsuite/cargo_uninstall/help/stdout.log deleted file mode 100644 index 1988e7a0e8e9..000000000000 --- a/tests/testsuite/cargo_uninstall/help/stdout.log +++ /dev/null @@ -1,28 +0,0 @@ -Remove a Rust binary - -Usage: cargo[EXE] uninstall [OPTIONS] [SPEC]... - -Arguments: - [SPEC]... - -Options: - --root Directory to uninstall packages from - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Package Selection: - -p, --package [] Package to uninstall - -Target Selection: - --bin Only uninstall the binary NAME - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help uninstall` for more detailed information. diff --git a/tests/testsuite/cargo_uninstall/help/stdout.term.svg b/tests/testsuite/cargo_uninstall/help/stdout.term.svg new file mode 100644 index 000000000000..bbe82f967223 --- /dev/null +++ b/tests/testsuite/cargo_uninstall/help/stdout.term.svg @@ -0,0 +1,78 @@ + + + + + + Remove a Rust binary + + + + Usage: cargo uninstall [OPTIONS] [SPEC]... + + + + Arguments: + + [SPEC]... + + + + Options: + + --root <DIR> Directory to uninstall packages from + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Package Selection: + + -p, --package [<SPEC>] Package to uninstall + + + + Target Selection: + + --bin <NAME> Only uninstall the binary NAME + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help uninstall` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_update/help/mod.rs b/tests/testsuite/cargo_update/help/mod.rs index b3bc2146c898..ab4d64294060 100644 --- a/tests/testsuite/cargo_update/help/mod.rs +++ b/tests/testsuite/cargo_update/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_update/help/stderr.log b/tests/testsuite/cargo_update/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_update/help/stderr.term.svg b/tests/testsuite/cargo_update/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_update/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_update/help/stdout.log b/tests/testsuite/cargo_update/help/stdout.log deleted file mode 100644 index 8e0bf2ccb2d4..000000000000 --- a/tests/testsuite/cargo_update/help/stdout.log +++ /dev/null @@ -1,26 +0,0 @@ -Update dependencies as recorded in the local lock file - -Usage: cargo[EXE] update [OPTIONS] [SPEC]... - -Options: - -n, --dry-run Don't actually write the lockfile - --recursive Force updating all dependencies of [SPEC]... as well - --precise Update [SPEC] to exactly PRECISE - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Package Selection: - -w, --workspace Only update the workspace packages - [SPEC]... Package to update - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help update` for more detailed information. diff --git a/tests/testsuite/cargo_update/help/stdout.term.svg b/tests/testsuite/cargo_update/help/stdout.term.svg new file mode 100644 index 000000000000..166c5d9e46a0 --- /dev/null +++ b/tests/testsuite/cargo_update/help/stdout.term.svg @@ -0,0 +1,74 @@ + + + + + + Update dependencies as recorded in the local lock file + + + + Usage: cargo update [OPTIONS] [SPEC]... + + + + Options: + + -n, --dry-run Don't actually write the lockfile + + --recursive Force updating all dependencies of [SPEC]... as well + + --precise <PRECISE> Update [SPEC] to exactly PRECISE + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Package Selection: + + -w, --workspace Only update the workspace packages + + [SPEC]... Package to update + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help update` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs b/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs index f5e9d1f640c6..6bee7fad8e32 100644 --- a/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs +++ b/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs @@ -15,6 +15,6 @@ fn case() { .current_dir(cwd) .assert() .code(101) - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_update/toolchain_pkgname/stderr.log b/tests/testsuite/cargo_update/toolchain_pkgname/stderr.log deleted file mode 100644 index 7e5870c540a2..000000000000 --- a/tests/testsuite/cargo_update/toolchain_pkgname/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ -error: invalid character `+` in package name: `+stable` - Use `cargo +stable update` if you meant to use the `stable` toolchain. diff --git a/tests/testsuite/cargo_update/toolchain_pkgname/stderr.term.svg b/tests/testsuite/cargo_update/toolchain_pkgname/stderr.term.svg new file mode 100644 index 000000000000..cfe2c931c441 --- /dev/null +++ b/tests/testsuite/cargo_update/toolchain_pkgname/stderr.term.svg @@ -0,0 +1,28 @@ + + + + + + error: invalid character `+` in package name: `+stable` + + Use `cargo +stable update` if you meant to use the `stable` toolchain. + + + + + + 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 e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_update/toolchain_pkgname/stdout.term.svg b/tests/testsuite/cargo_update/toolchain_pkgname/stdout.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_update/toolchain_pkgname/stdout.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_vendor/help/mod.rs b/tests/testsuite/cargo_vendor/help/mod.rs index 1b4b53501c93..4ecbd1d61cf1 100644 --- a/tests/testsuite/cargo_vendor/help/mod.rs +++ b/tests/testsuite/cargo_vendor/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_vendor/help/stderr.log b/tests/testsuite/cargo_vendor/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_vendor/help/stderr.term.svg b/tests/testsuite/cargo_vendor/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_vendor/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_vendor/help/stdout.log b/tests/testsuite/cargo_vendor/help/stdout.log deleted file mode 100644 index 4e05e75c8fa2..000000000000 --- a/tests/testsuite/cargo_vendor/help/stdout.log +++ /dev/null @@ -1,27 +0,0 @@ -Vendor all dependencies for a project locally - -Usage: cargo[EXE] vendor [OPTIONS] [path] - -Arguments: - [path] Where to vendor crates (`vendor` by default) - -Options: - --no-delete Don't delete older crates in the vendor directory - -s, --sync Additional `Cargo.toml` to sync and vendor - --respect-source-config Respect `[source]` config in `.cargo/config` - --versioned-dirs Always include version in subdir name - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - details - -h, --help Print help - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help vendor` for more detailed information. diff --git a/tests/testsuite/cargo_vendor/help/stdout.term.svg b/tests/testsuite/cargo_vendor/help/stdout.term.svg new file mode 100644 index 000000000000..e274ff6d5166 --- /dev/null +++ b/tests/testsuite/cargo_vendor/help/stdout.term.svg @@ -0,0 +1,76 @@ + + + + + + Vendor all dependencies for a project locally + + + + Usage: cargo vendor [OPTIONS] [path] + + + + Arguments: + + [path] Where to vendor crates (`vendor` by default) + + + + Options: + + --no-delete Don't delete older crates in the vendor directory + + -s, --sync <TOML> Additional `Cargo.toml` to sync and vendor + + --respect-source-config Respect `[source]` config in `.cargo/config` + + --versioned-dirs Always include version in subdir name + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + + details + + -h, --help Print help + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help vendor` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_verify_project/help/mod.rs b/tests/testsuite/cargo_verify_project/help/mod.rs index b3f1ad689af8..c70b6cc23e11 100644 --- a/tests/testsuite/cargo_verify_project/help/mod.rs +++ b/tests/testsuite/cargo_verify_project/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_verify_project/help/stderr.log b/tests/testsuite/cargo_verify_project/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_verify_project/help/stderr.term.svg b/tests/testsuite/cargo_verify_project/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_verify_project/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_verify_project/help/stdout.log b/tests/testsuite/cargo_verify_project/help/stdout.log deleted file mode 100644 index 7adc34e6c750..000000000000 --- a/tests/testsuite/cargo_verify_project/help/stdout.log +++ /dev/null @@ -1,19 +0,0 @@ -Check correctness of crate manifest - -Usage: cargo[EXE] verify-project [OPTIONS] - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --manifest-path Path to Cargo.toml - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help verify-project` for more detailed information. diff --git a/tests/testsuite/cargo_verify_project/help/stdout.term.svg b/tests/testsuite/cargo_verify_project/help/stdout.term.svg new file mode 100644 index 000000000000..00008fbdea16 --- /dev/null +++ b/tests/testsuite/cargo_verify_project/help/stdout.term.svg @@ -0,0 +1,60 @@ + + + + + + Check correctness of crate manifest + + + + Usage: cargo verify-project [OPTIONS] + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --manifest-path <PATH> Path to Cargo.toml + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help verify-project` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_version/help/mod.rs b/tests/testsuite/cargo_version/help/mod.rs index 8520e0b0ec4e..fcad55545db4 100644 --- a/tests/testsuite/cargo_version/help/mod.rs +++ b/tests/testsuite/cargo_version/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_version/help/stderr.log b/tests/testsuite/cargo_version/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_version/help/stderr.term.svg b/tests/testsuite/cargo_version/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_version/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_version/help/stdout.log b/tests/testsuite/cargo_version/help/stdout.log deleted file mode 100644 index 2ad1c551c8c1..000000000000 --- a/tests/testsuite/cargo_version/help/stdout.log +++ /dev/null @@ -1,18 +0,0 @@ -Show version information - -Usage: cargo[EXE] version [OPTIONS] - -Options: - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help version` for more detailed information. diff --git a/tests/testsuite/cargo_version/help/stdout.term.svg b/tests/testsuite/cargo_version/help/stdout.term.svg new file mode 100644 index 000000000000..f139a9a4a2e1 --- /dev/null +++ b/tests/testsuite/cargo_version/help/stdout.term.svg @@ -0,0 +1,58 @@ + + + + + + Show version information + + + + Usage: cargo version [OPTIONS] + + + + Options: + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help version` for more detailed information. + + + + + + diff --git a/tests/testsuite/cargo_yank/help/mod.rs b/tests/testsuite/cargo_yank/help/mod.rs index 9ea87f287b05..82c9a1295cc8 100644 --- a/tests/testsuite/cargo_yank/help/mod.rs +++ b/tests/testsuite/cargo_yank/help/mod.rs @@ -8,6 +8,6 @@ fn case() { .arg("--help") .assert() .success() - .stdout_matches(file!["stdout.log"]) - .stderr_matches(file!["stderr.log"]); + .stdout_matches(file!["stdout.term.svg"]) + .stderr_matches(file!["stderr.term.svg"]); } diff --git a/tests/testsuite/cargo_yank/help/stderr.log b/tests/testsuite/cargo_yank/help/stderr.log deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/testsuite/cargo_yank/help/stderr.term.svg b/tests/testsuite/cargo_yank/help/stderr.term.svg new file mode 100644 index 000000000000..7f2e1ff7d370 --- /dev/null +++ b/tests/testsuite/cargo_yank/help/stderr.term.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/tests/testsuite/cargo_yank/help/stdout.log b/tests/testsuite/cargo_yank/help/stdout.log deleted file mode 100644 index 072ceaac7deb..000000000000 --- a/tests/testsuite/cargo_yank/help/stdout.log +++ /dev/null @@ -1,26 +0,0 @@ -Remove a pushed crate from the index - -Usage: cargo[EXE] yank [OPTIONS] [CRATE] - -Arguments: - [CRATE] - -Options: - --version The version to yank or un-yank - --undo Undo a yank, putting a version back into the index - --index Registry index URL to yank from - --registry Registry to yank from - --token API token to use when authenticating - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet Do not print cargo log messages - --color Coloring: auto, always, never - --config Override a configuration value - -Z Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -h, --help Print help - -Manifest Options: - --frozen Require Cargo.lock and cache are up to date - --locked Require Cargo.lock is up to date - --offline Run without accessing the network - -Run `cargo help yank` for more detailed information. diff --git a/tests/testsuite/cargo_yank/help/stdout.term.svg b/tests/testsuite/cargo_yank/help/stdout.term.svg new file mode 100644 index 000000000000..f78849a44f60 --- /dev/null +++ b/tests/testsuite/cargo_yank/help/stdout.term.svg @@ -0,0 +1,74 @@ + + + + + + Remove a pushed crate from the index + + + + Usage: cargo yank [OPTIONS] [CRATE] + + + + Arguments: + + [CRATE] + + + + Options: + + --version <VERSION> The version to yank or un-yank + + --undo Undo a yank, putting a version back into the index + + --index <INDEX> Registry index URL to yank from + + --registry <REGISTRY> Registry to yank from + + --token <TOKEN> API token to use when authenticating + + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + + -q, --quiet Do not print cargo log messages + + --color <WHEN> Coloring: auto, always, never + + --config <KEY=VALUE> Override a configuration value + + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + + -h, --help Print help + + + + Manifest Options: + + --frozen Require Cargo.lock and cache are up to date + + --locked Require Cargo.lock is up to date + + --offline Run without accessing the network + + + + Run `cargo help yank` for more detailed information. + + + + + +