From c1e4122ba268c986cd5f8d0e27135551b066370b Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Sat, 22 Nov 2025 06:01:51 -0500 Subject: [PATCH 1/4] Reduce noise --- tests/integrations/basic-bin/Cargo.lock | 848 ------ tests/integrations/basic-bin/Cargo.stdout | 10 - tests/integrations/basic-bin/Cargo.toml | 14 - tests/integrations/basic-bin/src/main.rs | 1 - .../basic-bin/tests/actual_tests/foomp.rs | 8 - .../basic-bin/tests/actual_tests/foomp.stderr | 9 - .../integrations/basic-bin/tests/ui_tests.rs | 38 - tests/integrations/basic-fail-mode/Cargo.lock | 848 ------ .../integrations/basic-fail-mode/Cargo.stdout | 20 - tests/integrations/basic-fail-mode/Cargo.toml | 18 - tests/integrations/basic-fail-mode/src/lib.rs | 3 - .../tests/actual_tests/foomp.rs | 6 - .../tests/actual_tests/foomp.stderr | 17 - .../basic-fail-mode/tests/run_file.rs | 71 - .../tests/run_file/run_file.rs | 1 - .../tests/run_file/run_file_with_deps.rs | 5 - .../basic-fail-mode/tests/ui_tests.rs | 30 - tests/integrations/basic-fail/Cargo.lock | 848 ------ tests/integrations/basic-fail/Cargo.stderr | 48 - tests/integrations/basic-fail/Cargo.stdout | 2279 ----------------- tests/integrations/basic-fail/Cargo.toml | 36 - tests/integrations/basic-fail/src/lib.rs | 3 - .../tests/actual_tests/bad_pattern.rs | 6 - .../tests/actual_tests/bad_pattern.stderr | 17 - .../actual_tests/bad_pattern_multiple.rs | 8 - .../actual_tests/bad_pattern_multiple.stderr | 31 - .../tests/actual_tests/executable.rs | 7 - .../tests/actual_tests/executable.run.stdout | 1 - .../actual_tests/executable_compile_err.rs | 4 - .../tests/actual_tests/exit_code_fail.rs | 1 - .../basic-fail/tests/actual_tests/filters.rs | 3 - .../basic-fail/tests/actual_tests/foomp.rs | 6 - .../tests/actual_tests/foomp.stderr | 15 - .../tests/actual_tests/foomp2.fixed | 2 - .../basic-fail/tests/actual_tests/foomp2.rs | 6 - .../tests/actual_tests/foomp2.stderr | 17 - .../tests/actual_tests/ice_annotations.rs | 10 - .../tests/actual_tests/inline_chain.rs | 6 - .../tests/actual_tests/joined_wrong_order.rs | 7 - .../tests/actual_tests/lone_joined_pattern.rs | 7 - .../actual_tests/pattern_too_many_arrow.rs | 6 - .../pattern_too_many_arrow_above.rs | 6 - .../tests/actual_tests/rustc_ice.rs | 10 - .../tests/actual_tests/rustc_ice.stderr | 15 - .../actual_tests/touching_above_below.rs | 8 - .../touching_above_below_chain.rs | 9 - .../tests/actual_tests_bless/abort.rs | 5 - .../actual_tests_bless/aux_build_not_found.rs | 3 - .../aux_proc_macro_misuse.rs | 8 - .../aux_proc_macro_no_main.rs | 7 - .../aux_proc_macro_no_main.stderr | 8 - .../actual_tests_bless/auxiliary/foomp.rs | 1 - .../actual_tests_bless/auxiliary/nested.rs | 5 - .../auxiliary/the_proc_macro.rs | 10 - .../compile_flags_quotes.rs | 3 - .../compiletest-rs-command.rs | 6 - .../actual_tests_bless/edition_override.rs | 9 - .../edition_override.stderr | 12 - .../actual_tests_bless/failing_executable.rs | 5 - .../failing_executable.run.stderr | 5 - .../tests/actual_tests_bless/foomp_aux.rs | 8 - .../tests/actual_tests_bless/foomp_aux.stderr | 17 - .../tests/actual_tests_bless/nested_aux.rs | 8 - .../tests/actual_tests_bless/no_main.rs | 1 - .../actual_tests_bless/no_main_manual.rs | 3 - .../actual_tests_bless/no_main_manual.stderr | 11 - .../tests/actual_tests_bless/no_test.rs | 2 - .../non_top_level_configs.rs | 5 - .../normalization_override.rs | 7 - .../normalization_override.stderr | 9 - .../tests/actual_tests_bless/pass.rs | 3 - .../pass_with_annotation.rs | 4 - .../actual_tests_bless/revised_revision.rs | 13 - .../revisioned_executable.rs | 5 - ...visioned_executable_panic.panic.run.stderr | 3 - .../revisioned_executable_panic.rs | 7 - ...revisioned_executable_panic.run.run.stderr | 3 - .../actual_tests_bless/revisions.bar.stderr | 17 - .../actual_tests_bless/revisions.foo.stderr | 17 - .../tests/actual_tests_bless/revisions.rs | 13 - .../revisions_bad.bar.stderr | 9 - .../revisions_bad.foo.stderr | 17 - .../tests/actual_tests_bless/revisions_bad.rs | 10 - .../actual_tests_bless/revisions_filter.rs | 14 - .../revisions_filter2.bar.stderr | 17 - .../actual_tests_bless/revisions_filter2.rs | 14 - ...visions_multiple_per_annotation.bar.stderr | 17 - ...visions_multiple_per_annotation.foo.stderr | 17 - .../revisions_multiple_per_annotation.rs | 7 - .../revisions_same_everywhere.bar.stderr | 17 - .../revisions_same_everywhere.foo.stderr | 17 - .../revisions_same_everywhere.rs | 7 - .../tests/actual_tests_bless/run_panic.rs | 5 - .../actual_tests_bless/run_panic.run.stderr | 3 - .../rustfix-fail-revisions.a.fixed | 12 - .../rustfix-fail-revisions.a.stderr | 8 - .../rustfix-fail-revisions.b.fixed | 12 - .../rustfix-fail-revisions.b.stderr | 8 - .../rustfix-fail-revisions.rs | 12 - .../actual_tests_bless/rustfix-fail.fixed | 11 - .../tests/actual_tests_bless/rustfix-fail.rs | 11 - .../actual_tests_bless/rustfix-fail.stderr | 8 - .../tests/actual_tests_bless/unicode.rs | 8 - .../tests/actual_tests_bless/unicode.stderr | 18 - .../actual_tests_bless/unknown_revision.rs | 4 - .../actual_tests_bless/unknown_revision2.rs | 6 - .../wrong_diagnostic_code.rs | 9 - .../wrong_diagnostic_code.stderr | 28 - .../revisions_bad.bar.stderr | 9 - .../revisions_bad.foo.stderr | 17 - .../actual_tests_bless_yolo/revisions_bad.rs | 10 - .../rustfix-maybe-incorrect.fixed | 6 - .../rustfix-maybe-incorrect.rs | 6 - .../rustfix-maybe-incorrect.stderr | 12 - .../rustfix-multiple-fail.1.fixed | 8 - .../rustfix-multiple-fail.2.fixed | 8 - .../rustfix-multiple-fail.3.fixed | 8 - .../rustfix-multiple-fail.rs | 8 - .../rustfix-multiple-fail.stderr | 24 - tests/integrations/basic-fail/tests/json.rs | 34 - .../integrations/basic-fail/tests/ui_tests.rs | 35 - .../basic-fail/tests/ui_tests_bless.rs | 62 - .../basic-fail/tests/ui_tests_diff_only.rs | 18 - .../tests/ui_tests_invalid_program.rs | 19 - .../tests/ui_tests_invalid_program2.rs | 20 - tests/integrations/cargo-run/Cargo.lock | 848 ------ tests/integrations/cargo-run/Cargo.stdout | 12 - tests/integrations/cargo-run/Cargo.toml | 14 - tests/integrations/cargo-run/src/main.rs | 13 - .../tests/actual_tests/empty_no_stdin.rs | 0 .../tests/actual_tests/empty_no_stdin.stderr | 3 - .../tests/actual_tests/matching_stdin.rs | 2 - .../tests/actual_tests/matching_stdin.stderr | 3 - .../tests/actual_tests/matching_stdin.stdin | 2 - .../tests/actual_tests/mismatching_stdin.rs | 2 - .../actual_tests/mismatching_stdin.stderr | 5 - .../actual_tests/mismatching_stdin.stdin | 1 - .../cargo-run/tests/actual_tests/no_stdin.rs | 2 - .../tests/actual_tests/no_stdin.stderr | 3 - .../integrations/cargo-run/tests/ui_tests.rs | 26 - tests/integrations/dep-fail/Cargo.lock | 675 ----- tests/integrations/dep-fail/Cargo.stderr | 10 - tests/integrations/dep-fail/Cargo.stdout | 40 - tests/integrations/dep-fail/Cargo.toml | 11 - tests/integrations/dep-fail/src/lib.rs | 0 .../dep-fail/tested_crate/Cargo.lock | 7 - .../dep-fail/tested_crate/Cargo.toml | 8 - .../dep-fail/tested_crate/src/lib.rs | 1 - tests/integrations/dep-fail/tests/ui.rs | 29 - .../dep-fail/tests/ui/basic_test.rs | 1 - tests/integrations/ui_test_dep_bug/Cargo.lock | 680 ----- .../integrations/ui_test_dep_bug/Cargo.stdout | 15 - tests/integrations/ui_test_dep_bug/Cargo.toml | 20 - tests/integrations/ui_test_dep_bug/src/lib.rs | 0 .../ui_test_dep_bug/tested_crate/Cargo.toml | 8 - .../ui_test_dep_bug/tested_crate/src/lib.rs | 2 - .../integrations/ui_test_dep_bug/tests/ui.rs | 26 - .../ui_test_dep_bug/tests/ui/basic_test.rs | 6 - 158 files changed, 8717 deletions(-) delete mode 100644 tests/integrations/basic-bin/Cargo.lock delete mode 100644 tests/integrations/basic-bin/Cargo.stdout delete mode 100644 tests/integrations/basic-bin/Cargo.toml delete mode 100644 tests/integrations/basic-bin/src/main.rs delete mode 100644 tests/integrations/basic-bin/tests/actual_tests/foomp.rs delete mode 100644 tests/integrations/basic-bin/tests/actual_tests/foomp.stderr delete mode 100644 tests/integrations/basic-bin/tests/ui_tests.rs delete mode 100644 tests/integrations/basic-fail-mode/Cargo.lock delete mode 100644 tests/integrations/basic-fail-mode/Cargo.stdout delete mode 100644 tests/integrations/basic-fail-mode/Cargo.toml delete mode 100644 tests/integrations/basic-fail-mode/src/lib.rs delete mode 100644 tests/integrations/basic-fail-mode/tests/actual_tests/foomp.rs delete mode 100644 tests/integrations/basic-fail-mode/tests/actual_tests/foomp.stderr delete mode 100644 tests/integrations/basic-fail-mode/tests/run_file.rs delete mode 100644 tests/integrations/basic-fail-mode/tests/run_file/run_file.rs delete mode 100644 tests/integrations/basic-fail-mode/tests/run_file/run_file_with_deps.rs delete mode 100644 tests/integrations/basic-fail-mode/tests/ui_tests.rs delete mode 100644 tests/integrations/basic-fail/Cargo.lock delete mode 100644 tests/integrations/basic-fail/Cargo.stderr delete mode 100644 tests/integrations/basic-fail/Cargo.stdout delete mode 100644 tests/integrations/basic-fail/Cargo.toml delete mode 100644 tests/integrations/basic-fail/src/lib.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/bad_pattern.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/bad_pattern.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/executable.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/executable.run.stdout delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/executable_compile_err.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/exit_code_fail.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/filters.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/foomp.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/foomp.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/foomp2.fixed delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/foomp2.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/foomp2.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/ice_annotations.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/inline_chain.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/joined_wrong_order.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/lone_joined_pattern.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow_above.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/rustc_ice.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/rustc_ice.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/touching_above_below.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests/touching_above_below_chain.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/abort.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/aux_build_not_found.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_misuse.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/foomp.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/nested.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/the_proc_macro.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/compile_flags_quotes.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/compiletest-rs-command.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.run.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/nested_aux.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/no_main.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/no_test.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/non_top_level_configs.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/pass.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/pass_with_annotation.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revised_revision.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.panic.run.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.run.run.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions.bar.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions.foo.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.bar.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.foo.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.bar.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.bar.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.foo.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.bar.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.foo.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.run.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.fixed delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.fixed delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.fixed delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/unicode.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/unicode.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision2.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.bar.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.foo.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.fixed delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.stderr delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.1.fixed delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.3.fixed delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.rs delete mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.stderr delete mode 100644 tests/integrations/basic-fail/tests/json.rs delete mode 100644 tests/integrations/basic-fail/tests/ui_tests.rs delete mode 100644 tests/integrations/basic-fail/tests/ui_tests_bless.rs delete mode 100644 tests/integrations/basic-fail/tests/ui_tests_diff_only.rs delete mode 100644 tests/integrations/basic-fail/tests/ui_tests_invalid_program.rs delete mode 100644 tests/integrations/basic-fail/tests/ui_tests_invalid_program2.rs delete mode 100644 tests/integrations/cargo-run/Cargo.lock delete mode 100644 tests/integrations/cargo-run/Cargo.stdout delete mode 100644 tests/integrations/cargo-run/Cargo.toml delete mode 100644 tests/integrations/cargo-run/src/main.rs delete mode 100644 tests/integrations/cargo-run/tests/actual_tests/empty_no_stdin.rs delete mode 100644 tests/integrations/cargo-run/tests/actual_tests/empty_no_stdin.stderr delete mode 100644 tests/integrations/cargo-run/tests/actual_tests/matching_stdin.rs delete mode 100644 tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stderr delete mode 100644 tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stdin delete mode 100644 tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.rs delete mode 100644 tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stderr delete mode 100644 tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stdin delete mode 100644 tests/integrations/cargo-run/tests/actual_tests/no_stdin.rs delete mode 100644 tests/integrations/cargo-run/tests/actual_tests/no_stdin.stderr delete mode 100644 tests/integrations/cargo-run/tests/ui_tests.rs delete mode 100644 tests/integrations/dep-fail/Cargo.lock delete mode 100644 tests/integrations/dep-fail/Cargo.stderr delete mode 100644 tests/integrations/dep-fail/Cargo.stdout delete mode 100644 tests/integrations/dep-fail/Cargo.toml delete mode 100644 tests/integrations/dep-fail/src/lib.rs delete mode 100644 tests/integrations/dep-fail/tested_crate/Cargo.lock delete mode 100644 tests/integrations/dep-fail/tested_crate/Cargo.toml delete mode 100644 tests/integrations/dep-fail/tested_crate/src/lib.rs delete mode 100644 tests/integrations/dep-fail/tests/ui.rs delete mode 100644 tests/integrations/dep-fail/tests/ui/basic_test.rs delete mode 100644 tests/integrations/ui_test_dep_bug/Cargo.lock delete mode 100644 tests/integrations/ui_test_dep_bug/Cargo.stdout delete mode 100644 tests/integrations/ui_test_dep_bug/Cargo.toml delete mode 100644 tests/integrations/ui_test_dep_bug/src/lib.rs delete mode 100644 tests/integrations/ui_test_dep_bug/tested_crate/Cargo.toml delete mode 100644 tests/integrations/ui_test_dep_bug/tested_crate/src/lib.rs delete mode 100644 tests/integrations/ui_test_dep_bug/tests/ui.rs delete mode 100644 tests/integrations/ui_test_dep_bug/tests/ui/basic_test.rs diff --git a/tests/integrations/basic-bin/Cargo.lock b/tests/integrations/basic-bin/Cargo.lock deleted file mode 100644 index cacf869f..00000000 --- a/tests/integrations/basic-bin/Cargo.lock +++ /dev/null @@ -1,848 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "annotate-snippets" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5a59f105fb9635e9eebdc1e29d53e764fa5795b9cf899a638a53e61567ef61" -dependencies = [ - "anstyle", - "unicode-width", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anyhow" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "basic_bin" -version = "0.1.0" -dependencies = [ - "tempfile", - "ui_test", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bstr" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" -dependencies = [ - "memchr", - "regex-automata 0.4.3", - "serde", -] - -[[package]] -name = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "color-eyre" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" -dependencies = [ - "backtrace", - "color-spantrace", - "eyre", - "indenter", - "once_cell", - "owo-colors 3.5.0", - "tracing-error", -] - -[[package]] -name = "color-spantrace" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" -dependencies = [ - "once_cell", - "owo-colors 3.5.0", - "tracing-core", - "tracing-error", -] - -[[package]] -name = "colored" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "comma" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" - -[[package]] -name = "console" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.45.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "eyre" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "indicatif" -version = "0.17.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "itoa" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "levenshtein" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" - -[[package]] -name = "libc" -version = "0.2.156" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "owo-colors" -version = "4.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" - -[[package]] -name = "pin-project-lite" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" - -[[package]] -name = "portable-atomic" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc55135a600d700580e406b4de0d59cb9ad25e344a3a091a97ded2622ec4ec6" - -[[package]] -name = "prettydiff" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac17546d82912e64874e3d5b40681ce32eac4e5834344f51efcf689ff1550a65" -dependencies = [ - "owo-colors 4.2.3", -] - -[[package]] -name = "proc-macro2" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" -dependencies = [ - "regex-automata 0.3.2", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" -dependencies = [ - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" - -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustfix" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4" -dependencies = [ - "serde", - "serde_json", - "thiserror", - "tracing", -] - -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "ryu" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "spanned" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8e76fd7aeee255ddaa885b9de506484b21cbd458ae9d04d1b24851e82ee58a" -dependencies = [ - "anyhow", - "bstr", - "color-eyre", -] - -[[package]] -name = "syn" -version = "2.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" -dependencies = [ - "autocfg", - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" -dependencies = [ - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core", -] - -[[package]] -name = "ui_test" -version = "0.30.3" -dependencies = [ - "annotate-snippets", - "anyhow", - "bstr", - "cargo-platform", - "cargo_metadata", - "color-eyre", - "colored", - "comma", - "crossbeam-channel", - "indicatif", - "levenshtein", - "prettydiff", - "regex", - "rustc_version", - "rustfix", - "serde", - "serde_json", - "spanned", -] - -[[package]] -name = "unicode-ident" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.1", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/tests/integrations/basic-bin/Cargo.stdout b/tests/integrations/basic-bin/Cargo.stdout deleted file mode 100644 index 058d8047..00000000 --- a/tests/integrations/basic-bin/Cargo.stdout +++ /dev/null @@ -1,10 +0,0 @@ - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished - -Building dependencies ... ok -tests/actual_tests/foomp.rs ... ok - -test result: ok. 1 passed - diff --git a/tests/integrations/basic-bin/Cargo.toml b/tests/integrations/basic-bin/Cargo.toml deleted file mode 100644 index 7474d9c4..00000000 --- a/tests/integrations/basic-bin/Cargo.toml +++ /dev/null @@ -1,14 +0,0 @@ -[package] -name = "basic_bin" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dev-dependencies] -ui_test = { path = "../../.."} -tempfile = "3.3.0" - -[[test]] -name = "ui_tests" -harness = false diff --git a/tests/integrations/basic-bin/src/main.rs b/tests/integrations/basic-bin/src/main.rs deleted file mode 100644 index f328e4d9..00000000 --- a/tests/integrations/basic-bin/src/main.rs +++ /dev/null @@ -1 +0,0 @@ -fn main() {} diff --git a/tests/integrations/basic-bin/tests/actual_tests/foomp.rs b/tests/integrations/basic-bin/tests/actual_tests/foomp.rs deleted file mode 100644 index 3391c4d6..00000000 --- a/tests/integrations/basic-bin/tests/actual_tests/foomp.rs +++ /dev/null @@ -1,8 +0,0 @@ -//@normalize-stderr-test: "(file name should be).*" -> "$1" - -use basic_bin::add; -//~^ ERROR: unresolved import - -fn main() { - add("42", 3); -} diff --git a/tests/integrations/basic-bin/tests/actual_tests/foomp.stderr b/tests/integrations/basic-bin/tests/actual_tests/foomp.stderr deleted file mode 100644 index a15fc324..00000000 --- a/tests/integrations/basic-bin/tests/actual_tests/foomp.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0432]: unresolved import `basic_bin` - --> tests/actual_tests/foomp.rs:3:5 - | -3 | use basic_bin::add; - | ^^^^^^^^^ use of undeclared crate or module `basic_bin` - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0432`. diff --git a/tests/integrations/basic-bin/tests/ui_tests.rs b/tests/integrations/basic-bin/tests/ui_tests.rs deleted file mode 100644 index 852d0d25..00000000 --- a/tests/integrations/basic-bin/tests/ui_tests.rs +++ /dev/null @@ -1,38 +0,0 @@ -use ui_test::{dependencies::DependencyBuilder, *}; - -fn main() -> ui_test::color_eyre::Result<()> { - let path = "../../../target"; - let mut config = Config { - output_conflict_handling: if std::env::var_os("BLESS").is_some() { - ui_test::bless_output_files - } else { - ui_test::error_on_output_conflict - }, - bless_command: Some("cargo test".to_string()), - ..Config::rustc("tests/actual_tests") - }; - config - .comment_defaults - .base() - .set_custom("dependencies", DependencyBuilder::default()); - config.stderr_filter("in ([0-9]m )?[0-9\\.]+s", ""); - config.stdout_filter("in ([0-9]m )?[0-9\\.]+s", ""); - config.stderr_filter(r"[^ ]*/\.?cargo/registry/.*/", "$$CARGO_REGISTRY"); - config.stderr_filter(r"\.exe", ""); - config.stderr_filter("/target/[^/]+/[0-9]+/[^/]+/debug", "/target/$$TMP/$$TRIPLE/debug"); - config.path_stderr_filter(&std::path::Path::new(path), "$DIR"); - - // hide binaries generated for successfully passing tests - let tmp_dir = tempfile::tempdir_in(path)?; - let tmp_dir = tmp_dir.path(); - config.out_dir = tmp_dir.into(); - config.path_stderr_filter(tmp_dir, "$$TMP"); - - run_tests_generic( - vec![config], - default_file_filter, - default_per_file_config, - // Avoid github actions, as these would end up showing up in `Cargo.stderr` - status_emitter::Text::verbose(), - ) -} diff --git a/tests/integrations/basic-fail-mode/Cargo.lock b/tests/integrations/basic-fail-mode/Cargo.lock deleted file mode 100644 index f0bef7a7..00000000 --- a/tests/integrations/basic-fail-mode/Cargo.lock +++ /dev/null @@ -1,848 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "annotate-snippets" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5a59f105fb9635e9eebdc1e29d53e764fa5795b9cf899a638a53e61567ef61" -dependencies = [ - "anstyle", - "unicode-width", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anyhow" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "basic_fail_mode" -version = "0.1.0" -dependencies = [ - "tempfile", - "ui_test", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bstr" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" -dependencies = [ - "memchr", - "regex-automata 0.4.3", - "serde", -] - -[[package]] -name = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "color-eyre" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" -dependencies = [ - "backtrace", - "color-spantrace", - "eyre", - "indenter", - "once_cell", - "owo-colors 3.5.0", - "tracing-error", -] - -[[package]] -name = "color-spantrace" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" -dependencies = [ - "once_cell", - "owo-colors 3.5.0", - "tracing-core", - "tracing-error", -] - -[[package]] -name = "colored" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "comma" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" - -[[package]] -name = "console" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.45.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "eyre" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "indicatif" -version = "0.17.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "itoa" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "levenshtein" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" - -[[package]] -name = "libc" -version = "0.2.156" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "owo-colors" -version = "4.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" - -[[package]] -name = "pin-project-lite" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" - -[[package]] -name = "portable-atomic" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc55135a600d700580e406b4de0d59cb9ad25e344a3a091a97ded2622ec4ec6" - -[[package]] -name = "prettydiff" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac17546d82912e64874e3d5b40681ce32eac4e5834344f51efcf689ff1550a65" -dependencies = [ - "owo-colors 4.2.3", -] - -[[package]] -name = "proc-macro2" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" -dependencies = [ - "regex-automata 0.3.2", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" -dependencies = [ - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" - -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustfix" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4" -dependencies = [ - "serde", - "serde_json", - "thiserror", - "tracing", -] - -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "ryu" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "spanned" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8e76fd7aeee255ddaa885b9de506484b21cbd458ae9d04d1b24851e82ee58a" -dependencies = [ - "anyhow", - "bstr", - "color-eyre", -] - -[[package]] -name = "syn" -version = "2.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" -dependencies = [ - "autocfg", - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" -dependencies = [ - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core", -] - -[[package]] -name = "ui_test" -version = "0.30.3" -dependencies = [ - "annotate-snippets", - "anyhow", - "bstr", - "cargo-platform", - "cargo_metadata", - "color-eyre", - "colored", - "comma", - "crossbeam-channel", - "indicatif", - "levenshtein", - "prettydiff", - "regex", - "rustc_version", - "rustfix", - "serde", - "serde_json", - "spanned", -] - -[[package]] -name = "unicode-ident" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.1", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/tests/integrations/basic-fail-mode/Cargo.stdout b/tests/integrations/basic-fail-mode/Cargo.stdout deleted file mode 100644 index 15df52b1..00000000 --- a/tests/integrations/basic-fail-mode/Cargo.stdout +++ /dev/null @@ -1,20 +0,0 @@ - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished - - -running 3 tests -... -test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished - -Building dependencies ... ok -tests/actual_tests/foomp.rs ... ok - -test result: ok. 1 passed - - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished - diff --git a/tests/integrations/basic-fail-mode/Cargo.toml b/tests/integrations/basic-fail-mode/Cargo.toml deleted file mode 100644 index fdada374..00000000 --- a/tests/integrations/basic-fail-mode/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "basic_fail_mode" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dev-dependencies] -ui_test = { path = "../../.."} -tempfile = "3.3.0" - -[[test]] -name = "ui_tests" -harness = false - -[[test]] -name = "run_file" -harness = true diff --git a/tests/integrations/basic-fail-mode/src/lib.rs b/tests/integrations/basic-fail-mode/src/lib.rs deleted file mode 100644 index 211bfff7..00000000 --- a/tests/integrations/basic-fail-mode/src/lib.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub fn add(left: usize, right: usize) -> usize { - left + right -} diff --git a/tests/integrations/basic-fail-mode/tests/actual_tests/foomp.rs b/tests/integrations/basic-fail-mode/tests/actual_tests/foomp.rs deleted file mode 100644 index cfef747a..00000000 --- a/tests/integrations/basic-fail-mode/tests/actual_tests/foomp.rs +++ /dev/null @@ -1,6 +0,0 @@ -use basic_fail_mode::add; - -fn main() { - add("42", 3); - //~^ ERROR: mismatched types -} diff --git a/tests/integrations/basic-fail-mode/tests/actual_tests/foomp.stderr b/tests/integrations/basic-fail-mode/tests/actual_tests/foomp.stderr deleted file mode 100644 index e34df4f8..00000000 --- a/tests/integrations/basic-fail-mode/tests/actual_tests/foomp.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests/foomp.rs:4:9 - | -4 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail-mode/src/lib.rs:1:8 - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail-mode/tests/run_file.rs b/tests/integrations/basic-fail-mode/tests/run_file.rs deleted file mode 100644 index 5864b7c4..00000000 --- a/tests/integrations/basic-fail-mode/tests/run_file.rs +++ /dev/null @@ -1,71 +0,0 @@ -use std::path::{Path, PathBuf}; -use ui_test::color_eyre::{eyre::ensure, Result}; -use ui_test::dependencies::DependencyBuilder; -use ui_test::*; - -#[test] -fn run_file() -> Result<()> { - let mut config = Config::rustc(PathBuf::new()); - - let tmp_dir = tempfile::tempdir_in(env!("CARGO_TARGET_TMPDIR"))?; - let tmp_dir = tmp_dir.path(); - config.out_dir = tmp_dir.into(); - config.path_stderr_filter(tmp_dir, "$TMP"); - - let mut result = ui_test::test_command( - config, - &Path::new(file!()) - .parent() - .unwrap() - .join("run_file/run_file.rs"), - )?; - ensure!(result.output()?.status.success(), ""); - Ok(()) -} - -#[test] -fn fail_run_file() { - let mut config = Config::rustc(PathBuf::new()); - config.host = Some(String::new()); - config.program = CommandBuilder::cmd("invalid_alsdkfjalsdfjalskdfj"); - - let _ = ui_test::test_command( - config, - &Path::new(file!()) - .parent() - .unwrap() - .join("run_file/run_file.rs"), - ) - .unwrap() - .output() - .unwrap_err(); -} - -#[test] -fn run_file_no_deps() -> Result<()> { - let path = "../../../target"; - - let mut config = Config::rustc(PathBuf::new()); - - let tmp_dir = tempfile::tempdir_in(path)?; - let tmp_dir = tmp_dir.path(); - config.out_dir = tmp_dir.into(); - config.path_stderr_filter(tmp_dir, "$TMP"); - - // Don't build a binary, we only provide .rmeta dependencies for now - config.program.args.push("--emit=metadata".into()); - config - .comment_defaults - .base() - .set_custom("dependencies", DependencyBuilder::default()); - - let mut result = ui_test::test_command( - config, - &Path::new(file!()) - .parent() - .unwrap() - .join("run_file/run_file_with_deps.rs"), - )?; - ensure!(result.output()?.status.success(), ""); - Ok(()) -} diff --git a/tests/integrations/basic-fail-mode/tests/run_file/run_file.rs b/tests/integrations/basic-fail-mode/tests/run_file/run_file.rs deleted file mode 100644 index f328e4d9..00000000 --- a/tests/integrations/basic-fail-mode/tests/run_file/run_file.rs +++ /dev/null @@ -1 +0,0 @@ -fn main() {} diff --git a/tests/integrations/basic-fail-mode/tests/run_file/run_file_with_deps.rs b/tests/integrations/basic-fail-mode/tests/run_file/run_file_with_deps.rs deleted file mode 100644 index 982b8015..00000000 --- a/tests/integrations/basic-fail-mode/tests/run_file/run_file_with_deps.rs +++ /dev/null @@ -1,5 +0,0 @@ -use basic_fail_mode::add; - -fn main() { - assert_eq!(add(1, 2), 3); -} diff --git a/tests/integrations/basic-fail-mode/tests/ui_tests.rs b/tests/integrations/basic-fail-mode/tests/ui_tests.rs deleted file mode 100644 index 92b14795..00000000 --- a/tests/integrations/basic-fail-mode/tests/ui_tests.rs +++ /dev/null @@ -1,30 +0,0 @@ -use ui_test::{dependencies::DependencyBuilder, *}; - -fn main() -> ui_test::color_eyre::Result<()> { - let path = "../../../target"; - let mut config = Config { - output_conflict_handling: if std::env::var_os("BLESS").is_some() { - ui_test::bless_output_files - } else { - ui_test::error_on_output_conflict - }, - bless_command: Some("cargo test".to_string()), - ..Config::rustc("tests/actual_tests") - }; - config - .comment_defaults - .base() - .set_custom("dependencies", DependencyBuilder::default()); - config.stderr_filter("in ([0-9]m )?[0-9\\.]+s", ""); - config.stdout_filter("in ([0-9]m )?[0-9\\.]+s", ""); - config.stderr_filter(r"[^ ]*/\.?cargo/registry/.*/", "$$CARGO_REGISTRY"); - config.path_stderr_filter(&std::path::Path::new(path), "$DIR"); - - run_tests_generic( - vec![config], - default_file_filter, - default_per_file_config, - // Avoid github actions, as these would end up showing up in `Cargo.stderr` - status_emitter::Text::verbose(), - ) -} diff --git a/tests/integrations/basic-fail/Cargo.lock b/tests/integrations/basic-fail/Cargo.lock deleted file mode 100644 index a55f949a..00000000 --- a/tests/integrations/basic-fail/Cargo.lock +++ /dev/null @@ -1,848 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "annotate-snippets" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5a59f105fb9635e9eebdc1e29d53e764fa5795b9cf899a638a53e61567ef61" -dependencies = [ - "anstyle", - "unicode-width", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anyhow" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "basic_fail" -version = "0.1.0" -dependencies = [ - "tempfile", - "ui_test", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bstr" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" -dependencies = [ - "memchr", - "regex-automata 0.4.3", - "serde", -] - -[[package]] -name = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "color-eyre" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" -dependencies = [ - "backtrace", - "color-spantrace", - "eyre", - "indenter", - "once_cell", - "owo-colors 3.5.0", - "tracing-error", -] - -[[package]] -name = "color-spantrace" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" -dependencies = [ - "once_cell", - "owo-colors 3.5.0", - "tracing-core", - "tracing-error", -] - -[[package]] -name = "colored" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "comma" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" - -[[package]] -name = "console" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.45.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "eyre" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "indicatif" -version = "0.17.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "itoa" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "levenshtein" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" - -[[package]] -name = "libc" -version = "0.2.156" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "owo-colors" -version = "4.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" - -[[package]] -name = "pin-project-lite" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" - -[[package]] -name = "portable-atomic" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc55135a600d700580e406b4de0d59cb9ad25e344a3a091a97ded2622ec4ec6" - -[[package]] -name = "prettydiff" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac17546d82912e64874e3d5b40681ce32eac4e5834344f51efcf689ff1550a65" -dependencies = [ - "owo-colors 4.2.3", -] - -[[package]] -name = "proc-macro2" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" -dependencies = [ - "regex-automata 0.3.2", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" -dependencies = [ - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" - -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustfix" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4" -dependencies = [ - "serde", - "serde_json", - "thiserror", - "tracing", -] - -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "ryu" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "spanned" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8e76fd7aeee255ddaa885b9de506484b21cbd458ae9d04d1b24851e82ee58a" -dependencies = [ - "anyhow", - "bstr", - "color-eyre", -] - -[[package]] -name = "syn" -version = "2.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" -dependencies = [ - "autocfg", - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" -dependencies = [ - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core", -] - -[[package]] -name = "ui_test" -version = "0.30.3" -dependencies = [ - "annotate-snippets", - "anyhow", - "bstr", - "cargo-platform", - "cargo_metadata", - "color-eyre", - "colored", - "comma", - "crossbeam-channel", - "indicatif", - "levenshtein", - "prettydiff", - "regex", - "rustc_version", - "rustfix", - "serde", - "serde_json", - "spanned", -] - -[[package]] -name = "unicode-ident" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.1", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/tests/integrations/basic-fail/Cargo.stderr b/tests/integrations/basic-fail/Cargo.stderr deleted file mode 100644 index 20a86fcc..00000000 --- a/tests/integrations/basic-fail/Cargo.stderr +++ /dev/null @@ -1,48 +0,0 @@ -Error: tests failed - -Location: - $DIR/src/lib.rs:LL:CC -error: test failed, to rerun pass `--test json` - -Caused by: - process didn't exit successfully: `$DIR/target/ui/1/tests/integrations/basic-fail/debug/deps/json-HASH` (exit status: 1) -Error: tests failed - -Location: - $DIR/src/lib.rs:LL:CC -error: test failed, to rerun pass `--test ui_tests` - -Caused by: - process didn't exit successfully: `$DIR/target/ui/1/tests/integrations/basic-fail/debug/deps/ui_tests-HASH` (exit status: 1) -Error: tests failed - -Location: - $DIR/src/lib.rs:LL:CC -error: test failed, to rerun pass `--test ui_tests_diff_only` - -Caused by: - process didn't exit successfully: `$DIR/target/ui/1/tests/integrations/basic-fail/debug/deps/ui_tests_diff_only-HASH` (exit status: 1) -Error: failed to parse rustc version info: invalid_foobarlaksdfalsdfj - -Caused by: - -Location: - $DIR/src/config.rs:LL:CC -error: test failed, to rerun pass `--test ui_tests_invalid_program` - -Caused by: - process didn't exit successfully: `$DIR/target/ui/1/tests/integrations/basic-fail/debug/deps/ui_tests_invalid_program-HASH` (exit status: 1) -Error: tests failed - -Location: - $DIR/src/lib.rs:LL:CC -error: test failed, to rerun pass `--test ui_tests_invalid_program2` - -Caused by: - process didn't exit successfully: `$DIR/target/ui/1/tests/integrations/basic-fail/debug/deps/ui_tests_invalid_program2-HASH` (exit status: 1) -error: 5 targets failed: - `--test json` - `--test ui_tests` - `--test ui_tests_diff_only` - `--test ui_tests_invalid_program` - `--test ui_tests_invalid_program2` diff --git a/tests/integrations/basic-fail/Cargo.stdout b/tests/integrations/basic-fail/Cargo.stdout deleted file mode 100644 index 6c600128..00000000 --- a/tests/integrations/basic-fail/Cargo.stdout +++ /dev/null @@ -1,2279 +0,0 @@ - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished - -{ "type": "suite", "event": "started" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/bad_pattern.rs () - tests/actual_tests/bad_pattern.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/bad_pattern_multiple.rs () - tests/actual_tests/bad_pattern_multiple.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/executable.rs () - tests/actual_tests/executable.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/executable_compile_err.rs () - tests/actual_tests/executable_compile_err.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/exit_code_fail.rs () - tests/actual_tests/exit_code_fail.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/filters.rs () - tests/actual_tests/filters.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/foomp.rs () - tests/actual_tests/foomp.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/foomp2.rs () - tests/actual_tests/foomp2.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/ice_annotations.rs () - tests/actual_tests/ice_annotations.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/inline_chain.rs () - tests/actual_tests/inline_chain.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/joined_wrong_order.rs () - tests/actual_tests/joined_wrong_order.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/lone_joined_pattern.rs () - tests/actual_tests/lone_joined_pattern.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/pattern_too_many_arrow.rs () - tests/actual_tests/pattern_too_many_arrow.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/pattern_too_many_arrow_above.rs () - tests/actual_tests/pattern_too_many_arrow_above.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/rustc_ice.rs () - tests/actual_tests/rustc_ice.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/touching_above_below.rs () - tests/actual_tests/touching_above_below.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/touching_above_below_chain.rs () - tests/actual_tests/touching_above_below_chain.rs" } -{ "type": "test", "event": "ok", "name": "tests/actual_tests/bad_pattern.rs (Building dependencies) - tests/actual_tests/bad_pattern.rs" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/bad_pattern.rs () - tests/actual_tests/bad_pattern.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/bad_pattern.rs\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/bad_pattern.rs:4:9\n |\n4 | add(\"42\", 3);\n | --- ^^^^ expected `usize`, found `&str`\n | |\n | arguments to this function are incorrect\n |\nnote: function defined here\n --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC\n |\n1 | pub fn add(left: usize, right: usize) -> usize {\n | ^^^\n\nerror: aborting due to 1 previous error\n\nFor more information about this error, try `rustc --explain E0308`.\n> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/bad_pattern_multiple.rs () - tests/actual_tests/bad_pattern_multiple.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/bad_pattern_multiple.rs\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/bad_pattern_multiple.rs:4:9\n |\n4 | add(\"42\", 3);\n | --- ^^^^ expected `usize`, found `&str`\n | |\n | arguments to this function are incorrect\n |\nnote: function defined here\n --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC\n |\n1 | pub fn add(left: usize, right: usize) -> usize {\n | ^^^\n\nerror[E0308]: mismatched types\n --> tests/actual_tests/bad_pattern_multiple.rs:6:9\n |\n6 | add(\"42\", 3);\n | --- ^^^^ expected `usize`, found `&str`\n | |\n | arguments to this function are incorrect\n |\nnote: function defined here\n --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC\n |\n1 | pub fn add(left: usize, right: usize) -> usize {\n | ^^^\n\nerror: aborting due to 2 previous errors\n\nFor more information about this error, try `rustc --explain E0308`.\n> stderr: <>" } -{ "type": "test", "event": "ok", "name": "tests/actual_tests/executable.rs () - tests/actual_tests/executable.rs" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/executable.rs (run) - tests/actual_tests/executable.rs", "stdout": "command: <\"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests/executable\"> stdout: <> stderr: <42\n>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/executable_compile_err.rs () - tests/actual_tests/executable_compile_err.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/executable_compile_err.rs\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/executable_compile_err.rs:4:2\n |\n3 | fn main() {\n | - unclosed delimiter\n4 |\n | ^\n\nerror: aborting due to 1 previous error\n\n> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/exit_code_fail.rs () - tests/actual_tests/exit_code_fail.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/exit_code_fail.rs\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: <> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/filters.rs () - tests/actual_tests/filters.rs", "stdout": "command: stdout: <> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/foomp.rs () - tests/actual_tests/foomp.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/foomp.rs\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/foomp.rs:4:9\n |\n4 | add(\"42\", 3);\n | --- ^^^^ expected `usize`, found `&str`\n | |\n | arguments to this function are incorrect\n |\nnote: function defined here\n --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC\n |\n1 | pub fn add(left: usize, right: usize) -> usize {\n | ^^^\n\nerror: aborting due to 1 previous error\n\nFor more information about this error, try `rustc --explain E0308`.\n> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/foomp2.rs () - tests/actual_tests/foomp2.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/foomp2.rs\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/foomp2.rs:4:9\n |\n4 | add(\"42\", 3);\n | --- ^^^^ expected `usize`, found `&str`\n | |\n | arguments to this function are incorrect\n |\nnote: function defined here\n --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC\n |\n1 | pub fn add(left: usize, right: usize) -> usize {\n | ^^^\n\nerror: aborting due to 1 previous error\n\nFor more information about this error, try `rustc --explain E0308`.\n> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/ice_annotations.rs () - tests/actual_tests/ice_annotations.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/ice_annotations.rs\" \"-Ztreat-err-as-bug\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/ice_annotations.rs:8:9\n |\n8 | add(\"42\", 3);\n | --- ^^^^ expected `usize`, found `&str`\n | |\n | arguments to this function are incorrect\n |\nnote: function defined here\n --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC\n |\n1 | pub fn add(left: usize, right: usize) -> usize {\n | ^^^\n\nthread 'rustc' panicked at compiler/rustc_errors/src/lib.rs:\naborting due to `-Z treat-err-as-bug=1`\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n\nerror: the compiler unexpectedly panicked. this is a bug.\n\nnote: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md\n\nnote: please make sure that you have updated to the latest nightly\n\n -{ "type": "test", "event": "failed", "name": "tests/actual_tests/inline_chain.rs () - tests/actual_tests/inline_chain.rs", "stdout": "command: stdout: <> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/joined_wrong_order.rs () - tests/actual_tests/joined_wrong_order.rs", "stdout": "command: stdout: <> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/lone_joined_pattern.rs () - tests/actual_tests/lone_joined_pattern.rs", "stdout": "command: stdout: <> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/pattern_too_many_arrow.rs () - tests/actual_tests/pattern_too_many_arrow.rs", "stdout": "command: stdout: <> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/pattern_too_many_arrow_above.rs () - tests/actual_tests/pattern_too_many_arrow_above.rs", "stdout": "command: stdout: <> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustc_ice.rs () - tests/actual_tests/rustc_ice.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustc_ice.rs\" \"-Ztreat-err-as-bug\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustc_ice.rs:8:9\n |\n8 | add(\"42\", 3);\n | --- ^^^^ expected `usize`, found `&str`\n | |\n | arguments to this function are incorrect\n |\nnote: function defined here\n --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC\n |\n1 | pub fn add(left: usize, right: usize) -> usize {\n | ^^^\n\nthread 'rustc' panicked at compiler/rustc_errors/src/lib.rs:\naborting due to `-Z treat-err-as-bug=1`\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n\nerror: the compiler unexpectedly panicked. this is a bug.\n\nnote: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md\n\nnote: please make sure that you have updated to the latest nightly\n\n -{ "type": "test", "event": "failed", "name": "tests/actual_tests/touching_above_below.rs () - tests/actual_tests/touching_above_below.rs", "stdout": "command: stdout: <> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/touching_above_below_chain.rs () - tests/actual_tests/touching_above_below_chain.rs", "stdout": "command: stdout: <> stderr: <>" } -{ "type": "suite", "event": "failed", "passed": 1, "failed": 17, "ignored": 0, "measured": 0, "filtered_out": 0 } -Building dependencies ... ok -tests/actual_tests/bad_pattern.rs ... FAILED -tests/actual_tests/bad_pattern_multiple.rs ... FAILED -tests/actual_tests/executable.rs ... ok -tests/actual_tests/executable.rs (revision `run`) ... FAILED -tests/actual_tests/executable_compile_err.rs ... FAILED -tests/actual_tests/exit_code_fail.rs ... FAILED -tests/actual_tests/filters.rs ... FAILED -tests/actual_tests/foomp.rs ... FAILED -tests/actual_tests/foomp2.rs ... FAILED -tests/actual_tests/ice_annotations.rs ... FAILED -tests/actual_tests/inline_chain.rs ... FAILED -tests/actual_tests/joined_wrong_order.rs ... FAILED -tests/actual_tests/lone_joined_pattern.rs ... FAILED -tests/actual_tests/pattern_too_many_arrow.rs ... FAILED -tests/actual_tests/pattern_too_many_arrow_above.rs ... FAILED -tests/actual_tests/rustc_ice.rs ... FAILED -tests/actual_tests/touching_above_below.rs ... FAILED -tests/actual_tests/touching_above_below_chain.rs ... FAILED - -FAILED TEST: tests/actual_tests/bad_pattern.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/bad_pattern.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" - -error: actual output differed from expected -Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/bad_pattern.stderr` to the actual output ---- tests/actual_tests/bad_pattern.stderr -+++ - error[E0308]: mismatched types - --> tests/actual_tests/bad_pattern.rs:4:9 -... 10 lines skipped ... - | ^^^ - --error: aborting due to previous error -+error: aborting due to 1 previous error - - For more information about this error, try `rustc --explain E0308`. - -Full unnormalized output: -error[E0308]: mismatched types - --> tests/actual_tests/bad_pattern.rs:4:9 - | -4 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. - - -error: `miesmätsched types` not found in diagnostics on line 4 - --> tests/actual_tests/bad_pattern.rs:5:17 - | -5 | //~^ ERROR: miesmätsched types - | ^^^^^^^^^^^^^^^^^^ expected because of this pattern - | - -error: there was 1 unmatched diagnostic - --> tests/actual_tests/bad_pattern.rs:4:9 - | -4 | add("42", 3); - | ^^^^ Error[E0308]: mismatched types - | - -full stderr: -error[E0308]: mismatched types - --> tests/actual_tests/bad_pattern.rs:4:9 - | -4 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. - -full stdout: - - - -FAILED TEST: tests/actual_tests/bad_pattern_multiple.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/bad_pattern_multiple.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" - -error: actual output differed from expected -Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/bad_pattern_multiple.stderr` to the actual output ---- tests/actual_tests/bad_pattern_multiple.stderr -+++ - error[E0308]: mismatched types - --> tests/actual_tests/bad_pattern_multiple.rs:4:9 -... 11 lines skipped ... - - error[E0308]: mismatched types -- --> tests/actual_tests/bad_pattern_multiple.rs:6:9 -+ --> tests/actual_tests/bad_pattern_multiple.rs:6:9 - | - 6 | add("42", 3); -... 3 lines skipped ... - | - note: function defined here -- --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC -+ --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | - 1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -- error: aborting due to 2 previous errors -+error: aborting due to 2 previous errors - - For more information about this error, try `rustc --explain E0308`. - -Full unnormalized output: -error[E0308]: mismatched types - --> tests/actual_tests/bad_pattern_multiple.rs:4:9 - | -4 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error[E0308]: mismatched types - --> tests/actual_tests/bad_pattern_multiple.rs:6:9 - | -6 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 2 previous errors - -For more information about this error, try `rustc --explain E0308`. - - -error: `miesmätsched types` not found in diagnostics on line 4 - --> tests/actual_tests/bad_pattern_multiple.rs:5:17 - | -5 | //~^ ERROR: miesmätsched types - | ^^^^^^^^^^^^^^^^^^ expected because of this pattern - | - -error: `miesmätsched types` not found in diagnostics on line 6 - --> tests/actual_tests/bad_pattern_multiple.rs:7:17 - | -7 | //~^ ERROR: miesmätsched types - | ^^^^^^^^^^^^^^^^^^ expected because of this pattern - | - -error: there was 1 unmatched diagnostic - --> tests/actual_tests/bad_pattern_multiple.rs:4:9 - | -4 | add("42", 3); - | ^^^^ Error[E0308]: mismatched types - | - -error: there was 1 unmatched diagnostic - --> tests/actual_tests/bad_pattern_multiple.rs:6:9 - | -6 | add("42", 3); - | ^^^^ Error[E0308]: mismatched types - | - -full stderr: -error[E0308]: mismatched types - --> tests/actual_tests/bad_pattern_multiple.rs:4:9 - | -4 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error[E0308]: mismatched types - --> tests/actual_tests/bad_pattern_multiple.rs:6:9 - | -6 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 2 previous errors - -For more information about this error, try `rustc --explain E0308`. - -full stdout: - - - -FAILED TEST: tests/actual_tests/executable.rs (revision `run`) -command: "$CMD" - -error: actual output differed from expected -Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/executable.run.stdout` to the actual output ---- tests/actual_tests/executable.run.stdout -+++ --69 -+42 - -Full unnormalized output: -42 - - -full stderr: - -full stdout: -42 - - - -FAILED TEST: tests/actual_tests/executable_compile_err.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/executable_compile_err.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" - -error: test got exit status: 1, but expected 0 - --> tests/actual_tests/executable_compile_err.rs:1:4 - | -1 | //@run - | ^^^ compilation failed, but was expected to succeed - | - -error: no output was expected -Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/executable_compile_err.stderr` to the actual output -+++ -error: this file contains an unclosed delimiter - --> tests/actual_tests/executable_compile_err.rs:4:2 - | -3 | fn main() { - | - unclosed delimiter -4 | - | ^ - -error: aborting due to 1 previous error - - - -full stderr: -error: this file contains an unclosed delimiter - --> tests/actual_tests/executable_compile_err.rs:4:2 - | -3 | fn main() { - | - unclosed delimiter -4 | - | ^ - -error: aborting due to 1 previous error - - -full stdout: - - - -FAILED TEST: tests/actual_tests/exit_code_fail.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/exit_code_fail.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" - -error: test got exit status: 0, but expected 1 - = note: compilation succeeded, but was expected to fail - -error: expected error patterns, but found none - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests/filters.rs -command: parse comments - -error: `x86_64` is not a valid condition, expected `on-host`, /[0-9]+bit/, /host-.*/, or /target-.*/ - --> tests/actual_tests/filters.rs:1:9 - | -1 | //@only-x86_64 - | ^^^^^^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests/foomp.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/foomp.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" - -error: actual output differed from expected -Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/foomp.stderr` to the actual output ---- tests/actual_tests/foomp.stderr -+++ - error[E0308]: mismatched types - --> tests/actual_tests/foomp.rs:4:9 - | - 4 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` -+ | | -+ | arguments to this function are incorrect - | - note: function defined here -- --> $DIR/tests/integrations/basic/src/lib.rs:LL:CC -+ --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | - 1 | pub fn add(left: usize, right: usize) -> usize { -- | ^^^ some expected text that isn't in the actual message -+ | ^^^ - --error: aborting doo to previous error -+error: aborting due to 1 previous error - - For more information about this error, try `rustc --explain E0308`. - -Full unnormalized output: -error[E0308]: mismatched types - --> tests/actual_tests/foomp.rs:4:9 - | -4 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. - - -full stderr: -error[E0308]: mismatched types - --> tests/actual_tests/foomp.rs:4:9 - | -4 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. - -full stdout: - - - -FAILED TEST: tests/actual_tests/foomp2.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/foomp2.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" - -error: actual output differed from expected -Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/foomp2.stderr` to the actual output ---- tests/actual_tests/foomp2.stderr -+++ - error[E0308]: mismatched types - --> tests/actual_tests/foomp2.rs:4:9 -... 10 lines skipped ... - | ^^^ - --error: aborting due to previous error -+error: aborting due to 1 previous error - - For more information about this error, try `rustc --explain E0308`. - -Full unnormalized output: -error[E0308]: mismatched types - --> tests/actual_tests/foomp2.rs:4:9 - | -4 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. - - -full stderr: -error[E0308]: mismatched types - --> tests/actual_tests/foomp2.rs:4:9 - | -4 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. - -full stdout: - - - -FAILED TEST: tests/actual_tests/ice_annotations.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/ice_annotations.rs" "-Ztreat-err-as-bug" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" - -error: test got exit status: 101, but expected 1 - = note: the compiler panicked - -error: no output was expected -Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/ice_annotations.stderr` to the actual output -+++ -error: internal compiler error[E0308]: mismatched types - --> tests/actual_tests/ice_annotations.rs:8:9 - | -8 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs: -aborting due to `-Z treat-err-as-bug=1` -note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace - -error: the compiler unexpectedly panicked. this is a bug. - -note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md - -note: please make sure that you have updated to the latest nightly - - - -note: compiler flags: -Z treat-err-as-bug - -query stack during panic: -#0 [typeck] type-checking `main` -#1 [analysis] running analysis passes on this crate -end of query stack - - -full stderr: -error: internal compiler error[E0308]: mismatched types - --> tests/actual_tests/ice_annotations.rs:8:9 - | -8 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs: -aborting due to `-Z treat-err-as-bug=1` -note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace - -error: the compiler unexpectedly panicked. this is a bug. - -note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md - -note: please make sure that you have updated to the latest nightly - - - -note: compiler flags: -Z treat-err-as-bug - -query stack during panic: -#0 [typeck] type-checking `main` -#1 [analysis] running analysis passes on this crate -end of query stack - -full stdout: - - - -FAILED TEST: tests/actual_tests/inline_chain.rs -command: parse comments - -error: `//~|` comment not attached to anchoring matcher - --> tests/actual_tests/inline_chain.rs:5:26 - | -5 | //~| unused_variables - | ^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests/joined_wrong_order.rs -command: parse comments - -error: `//~|` comment not attached to anchoring matcher - --> tests/actual_tests/joined_wrong_order.rs:5:8 - | -5 | //~| unused_mut - | ^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests/lone_joined_pattern.rs -command: parse comments - -error: `//~|` comment not attached to anchoring matcher - --> tests/actual_tests/lone_joined_pattern.rs:2:8 - | -2 | //~| ERROR: mismatched types - | ^ - | - -error: `//~|` comment not attached to anchoring matcher - --> tests/actual_tests/lone_joined_pattern.rs:4:8 - | -4 | //~| ERROR: mismatched types - | ^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests/pattern_too_many_arrow.rs -command: parse comments - -error: //~^ pattern is trying to refer to 7 lines above, but there are only 2 lines above - --> tests/actual_tests/pattern_too_many_arrow.rs:3:8 - | -3 | //~^^^^^^^ ERROR: mismatched types - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests/pattern_too_many_arrow_above.rs -command: parse comments - -error: //~v pattern is trying to refer to line 8, but the file only has 6 lines - --> tests/actual_tests/pattern_too_many_arrow_above.rs:2:22 - | -2 | //~vvvvvv ERROR: mismatched types - | ^^^^^^^^^^^^^^^^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests/rustc_ice.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustc_ice.rs" "-Ztreat-err-as-bug" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" - -error: test got exit status: 101, but expected 1 - = note: the compiler panicked - -error: `mismatched types` not found in diagnostics on line 8 - --> tests/actual_tests/rustc_ice.rs:9:17 - | -9 | //~^ ERROR: mismatched types - | ^^^^^^^^^^^^^^^^ expected because of this pattern - | - -error: there was 1 unmatched diagnostic - --> tests/actual_tests/rustc_ice.rs:8:9 - | -8 | add("42", 3); - | ^^^^ Ice: mismatched types - | - -full stderr: -error: internal compiler error[E0308]: mismatched types - --> tests/actual_tests/rustc_ice.rs:8:9 - | -8 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs: -aborting due to `-Z treat-err-as-bug=1` -note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace - -error: the compiler unexpectedly panicked. this is a bug. - -note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md - -note: please make sure that you have updated to the latest nightly - - - -note: compiler flags: -Z treat-err-as-bug - -query stack during panic: -#0 [typeck] type-checking `main` -#1 [analysis] running analysis passes on this crate -end of query stack - -full stdout: - - - -FAILED TEST: tests/actual_tests/touching_above_below.rs -command: parse comments - -error: `//~v` comment immediately following a `//~^` comment chain - --> tests/actual_tests/touching_above_below.rs:4:8 - | -4 | //~v ERROR: mismatched types - | ^^^^^^^^^^^^^^^^^^^^^^^^^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests/touching_above_below_chain.rs -command: parse comments - -error: `//~v` comment immediately following a `//~^` comment chain - --> tests/actual_tests/touching_above_below_chain.rs:5:8 - | -5 | //~v ERROR: unused variable - | ^^^^^^^^^^^^^^^^^^^^^^^^ - | - -full stderr: - -full stdout: - - -FAILURES: - tests/actual_tests/bad_pattern.rs - tests/actual_tests/bad_pattern_multiple.rs - tests/actual_tests/executable.rs (revision run) - tests/actual_tests/executable_compile_err.rs - tests/actual_tests/exit_code_fail.rs - tests/actual_tests/filters.rs - tests/actual_tests/foomp.rs - tests/actual_tests/foomp2.rs - tests/actual_tests/ice_annotations.rs - tests/actual_tests/inline_chain.rs - tests/actual_tests/joined_wrong_order.rs - tests/actual_tests/lone_joined_pattern.rs - tests/actual_tests/pattern_too_many_arrow.rs - tests/actual_tests/pattern_too_many_arrow_above.rs - tests/actual_tests/rustc_ice.rs - tests/actual_tests/touching_above_below.rs - tests/actual_tests/touching_above_below_chain.rs - -test result: FAIL. 17 failed; 1 passed - -Building dependencies ... ok -tests/actual_tests_bless/abort.rs ... ok -tests/actual_tests_bless/abort.rs (revision `run`) ... FAILED -tests/actual_tests_bless/aux_build_not_found.rs ... FAILED -tests/actual_tests_bless/aux_proc_macro_misuse.rs ... FAILED -Building aux file tests/actual_tests_bless/auxiliary/the_proc_macro.rs ... ok -tests/actual_tests_bless/aux_proc_macro_no_main.rs ... FAILED -tests/actual_tests_bless/compile_flags_quotes.rs ... FAILED -tests/actual_tests_bless/compiletest-rs-command.rs ... FAILED -tests/actual_tests_bless/edition_override.rs ... ok -tests/actual_tests_bless/failing_executable.rs ... ok -tests/actual_tests_bless/failing_executable.rs (revision `run`) ... FAILED -Building aux file tests/actual_tests_bless/auxiliary/foomp.rs ... ok -tests/actual_tests_bless/foomp_aux.rs ... ok -Building aux file tests/actual_tests_bless/auxiliary/nested.rs ... ok -tests/actual_tests_bless/nested_aux.rs ... ok -tests/actual_tests_bless/no_main.rs ... FAILED -tests/actual_tests_bless/no_main_manual.rs ... FAILED -tests/actual_tests_bless/no_test.rs ... FAILED -tests/actual_tests_bless/non_top_level_configs.rs ... FAILED -tests/actual_tests_bless/normalization_override.rs ... ok -tests/actual_tests_bless/pass.rs ... ok -tests/actual_tests_bless/pass_with_annotation.rs ... FAILED -tests/actual_tests_bless/revised_revision.rs ... FAILED -tests/actual_tests_bless/revisioned_executable.rs ... ok -tests/actual_tests_bless/revisioned_executable.rs (revision `run`) ... ok -tests/actual_tests_bless/revisioned_executable.rs (revision `panic`) ... ok -tests/actual_tests_bless/revisioned_executable.rs (revision `run.run`) ... ok -tests/actual_tests_bless/revisioned_executable.rs (revision `panic.run`) ... FAILED -tests/actual_tests_bless/revisioned_executable_panic.rs ... ok -tests/actual_tests_bless/revisioned_executable_panic.rs (revision `run`) ... ok -tests/actual_tests_bless/revisioned_executable_panic.rs (revision `panic`) ... ok -tests/actual_tests_bless/revisioned_executable_panic.rs (revision `run.run`) ... FAILED -tests/actual_tests_bless/revisioned_executable_panic.rs (revision `panic.run`) ... ok -tests/actual_tests_bless/revisions.rs ... ok -tests/actual_tests_bless/revisions.rs (revision `foo`) ... ok -tests/actual_tests_bless/revisions.rs (revision `bar`) ... ok -tests/actual_tests_bless/revisions_bad.rs ... ok -tests/actual_tests_bless/revisions_bad.rs (revision `foo`) ... ok -tests/actual_tests_bless/revisions_bad.rs (revision `bar`) ... FAILED -tests/actual_tests_bless/revisions_filter.rs ... ok -tests/actual_tests_bless/revisions_filter.rs (revision `foo`) ... ignored (in-test comment) -tests/actual_tests_bless/revisions_filter.rs (revision `bar`) ... ignored (in-test comment) -tests/actual_tests_bless/revisions_filter2.rs ... ok -tests/actual_tests_bless/revisions_filter2.rs (revision `foo`) ... ignored (in-test comment) -tests/actual_tests_bless/revisions_filter2.rs (revision `bar`) ... ok -tests/actual_tests_bless/revisions_multiple_per_annotation.rs ... ok -tests/actual_tests_bless/revisions_multiple_per_annotation.rs (revision `foo`) ... ok -tests/actual_tests_bless/revisions_multiple_per_annotation.rs (revision `bar`) ... ok -tests/actual_tests_bless/revisions_same_everywhere.rs ... ok -tests/actual_tests_bless/revisions_same_everywhere.rs (revision `foo`) ... ok -tests/actual_tests_bless/revisions_same_everywhere.rs (revision `bar`) ... ok -tests/actual_tests_bless/run_panic.rs ... ok -tests/actual_tests_bless/run_panic.rs (revision `run`) ... ok -tests/actual_tests_bless/rustfix-fail-revisions.rs ... ok -tests/actual_tests_bless/rustfix-fail-revisions.rs (revision `a`) ... ok -tests/actual_tests_bless/rustfix-fail-revisions.rs (revision `b`) ... ok -tests/actual_tests_bless/rustfix-fail-revisions.a.fixed ... FAILED -tests/actual_tests_bless/rustfix-fail-revisions.b.fixed ... FAILED -tests/actual_tests_bless/rustfix-fail.rs ... ok -tests/actual_tests_bless/rustfix-fail.fixed ... FAILED -tests/actual_tests_bless/unicode.rs ... FAILED -tests/actual_tests_bless/unknown_revision.rs ... FAILED -tests/actual_tests_bless/unknown_revision2.rs ... FAILED -tests/actual_tests_bless/wrong_diagnostic_code.rs ... FAILED - -FAILED TEST: tests/actual_tests_bless/abort.rs (revision `run`) -command: "$CMD" - -error: test got signal: 6 (SIGABRT), but expected 0 - = note: the test was expected to run successfully - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/aux_build_not_found.rs -command: canonicalizing path `tests/actual_tests_bless/auxiliary/aasdflkjasdlfjasdlfkjasdf` - -full stderr: -No such file or directory -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/aux_proc_macro_misuse.rs -command: parse comments - -error: proc macros are now auto-detected, you can remove the `:proc-macro` after the file name - --> tests/actual_tests_bless/aux_proc_macro_misuse.rs:1:32 - | -1 | //@aux-build:the_proc_macro.rs:proc-macro - | ^^^^^^^^^^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/aux_proc_macro_no_main.rs -command: "rustc" "--error-format=json" "--crate-type=lib" "--out-dir" "$TMP "tests/actual_tests_bless/aux_proc_macro_no_main.rs" "--extern" "the_proc_macro=$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests_bless/auxiliary/libthe_proc_macro.so" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests_bless/auxiliary" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" - -error: there was 1 unmatched diagnostic - --> tests/actual_tests_bless/aux_proc_macro_no_main.rs:7:8 - | -7 | thing!(cake); - | ^^^^ Error: expected one of `!` or `::`, found `` - | - -error: expected error patterns, but found none - -full stderr: -error: expected one of `!` or `::`, found `` - --> tests/actual_tests_bless/aux_proc_macro_no_main.rs:7:8 - | -7 | thing!(cake); - | ^^^^ expected one of `!` or `::` - -error: aborting due to 1 previous error - - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/compile_flags_quotes.rs -command: parse comments - -error: `compile-flag` is not a command known to `ui_test`, did you mean `compile-flags`? - --> tests/actual_tests_bless/compile_flags_quotes.rs:1:4 - | -1 | //@compile-flag: cake - | ^^^^^^^^^^^^ - | - -error: `-Z "cheese is good` contains an unclosed quotation mark - --> tests/actual_tests_bless/compile_flags_quotes.rs:3:19 - | -3 | //@compile-flags: -Z "cheese is good - | ^^^^^^^^^^^^^^^^^^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/compiletest-rs-command.rs -command: parse comments - -error: a compiletest-rs style comment was detected. -Please use text that could not also be interpreted as a command, -and prefix all actual commands with `//@` - --> tests/actual_tests_bless/compiletest-rs-command.rs:1:3 - | -1 | //aux-build:foomp.rs - | ^^^^^^^^^^^^^^^^^^ - | - -error: a compiletest-rs style comment was detected. -Please use text that could not also be interpreted as a command, -and prefix all actual commands with `//@` - --> tests/actual_tests_bless/compiletest-rs-command.rs:2:4 - | -2 | // aux-build:asf.rs - | ^^^^^^^^^^^^^^^^ - | - -error: comment looks suspiciously like a test suite command: `@aux-build:asldkfjasldfj.rs` -All `//@` test suite commands must be at the start of the line. -The `//` must be directly followed by `@` or `~`. - --> tests/actual_tests_bless/compiletest-rs-command.rs:4:4 - | -4 | // @aux-build:asldkfjasldfj.rs - | ^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/failing_executable.rs (revision `run`) -command: "$CMD" - -error: test got exit status: 101, but expected 0 - --> tests/actual_tests_bless/failing_executable.rs:4:5 - | -4 | assert_eq!(5, 6); - | ^^^^^^^^^^^^^^^^^ assertion `left == right` failed - | - -full stderr: -thread 'main' panicked at tests/actual_tests_bless/failing_executable.rs: -assertion `left == right` failed - left: 5 - right: 6 -note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/no_main.rs -command: "rustc" "--error-format=json" "--crate-type=lib" "--out-dir" "$TMP "tests/actual_tests_bless/no_main.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" - -error: test got exit status: 0, but expected 1 - = note: compilation succeeded, but was expected to fail - -error: expected error patterns, but found none - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/no_main_manual.rs -command: "rustc" "--error-format=json" "--crate-type=lib" "--out-dir" "$TMP "tests/actual_tests_bless/no_main_manual.rs" "--crate-type=bin" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" - -error: there was 1 unmatched diagnostic that occurred outside the testfile and had no pattern - Error: cannot mix `bin` crate type with others - -error: there was 1 unmatched diagnostic - --> tests/actual_tests_bless/no_main_manual.rs:3:16 - | -3 | pub fn foo() {} - | ^ Error[E0601]: `main` function not found in crate `no_main_manual` - | - -error: expected error patterns, but found none - -full stderr: -error: cannot mix `bin` crate type with others - -error[E0601]: `main` function not found in crate `no_main_manual` - --> tests/actual_tests_bless/no_main_manual.rs:3:16 - | -3 | pub fn foo() {} - | ^ consider adding a `main` function to `tests/actual_tests_bless/no_main_manual.rs` - -error: aborting due to 2 previous errors - -For more information about this error, try `rustc --explain E0601`. - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/no_test.rs -command: "rustc" "--error-format=json" "--test" "--out-dir" "$TMP "tests/actual_tests_bless/no_test.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" - -error: test got exit status: 0, but expected 1 - = note: compilation succeeded, but was expected to fail - -error: expected error patterns, but found none - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/non_top_level_configs.rs -command: parse comments - -error: comment looks suspiciously like a test suite command: `@check-pass` -All `//@` test suite commands must be at the start of the line. -The `//` must be directly followed by `@` or `~`. - --> tests/actual_tests_bless/non_top_level_configs.rs:1:5 - | -1 | ////@check-pass - | ^ - | - -error: comment looks suspiciously like a test suite command: `@ignore-target-cheesecake` -All `//@` test suite commands must be at the start of the line. -The `//` must be directly followed by `@` or `~`. - --> tests/actual_tests_bless/non_top_level_configs.rs:4:7 - | -4 | //@ignore-target-cheesecake - | ^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/pass_with_annotation.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/pass_with_annotation.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" - -error: `the cake is a lie` not found in diagnostics on line 3 - --> tests/actual_tests_bless/pass_with_annotation.rs:3:12 - | -3 | //~ ERROR: the cake is a lie - | ^^^^^^^^^^^^^^^^^ expected because of this pattern - | - -error: error pattern found in pass test - --> tests/actual_tests_bless/pass_with_annotation.rs:3:12 - | -3 | //~ ERROR: the cake is a lie - | ^^^^^^^^^^^^^^^^^ expected because of this annotation - | - ::: tests/actual_tests_bless/pass_with_annotation.rs:1:4 - | -1 | //@check-pass - | ^^^^^^^^^^ expected because of this mode change - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/revised_revision.rs -command: parse comments - -error: revisions cannot be declared under a revision - --> tests/actual_tests_bless/revised_revision.rs:2:5 - | -2 | //@[foo] revisions: foo bar - | ^^^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/revisioned_executable.rs (revision `panic.run`) -command: "$CMD" - -error: test got exit status: 0, but expected 101 - = note: the test was expected to panic - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/revisioned_executable_panic.rs (revision `run.run`) -command: "$CMD" - -error: test got exit status: 101, but expected 0 - --> tests/actual_tests_bless/revisioned_executable_panic.rs - | -6 | panic!() - | ^^^^^^^^ explicit panic - | - -full stderr: -thread 'main' panicked at tests/actual_tests_bless/revisioned_executable_panic.rs: -explicit panic -note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/revisions_bad.rs (revision `bar`) -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/revisions_bad.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" "--cfg=bar" "-Cextra-filename=bar" - -error: ``main` function not found in crate `revisions_bad`` not found in diagnostics outside the testfile - --> tests/actual_tests_bless/revisions_bad.rs:4:31 - | -4 | //@[bar] error-in-other-file: `main` function not found in crate `revisions_bad` - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected because of this pattern - | - -error: there was 1 unmatched diagnostic - --> tests/actual_tests_bless/revisions_bad.rs:10:2 - | -10 | } - | ^ Error[E0601]: `main` function not found in crate `revisions_bad` - | - -full stderr: -error[E0601]: `main` function not found in crate `revisions_bad` - --> tests/actual_tests_bless/revisions_bad.rs:10:2 - | -10 | } - | ^ consider adding a `main` function to `tests/actual_tests_bless/revisions_bad.rs` - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0601`. - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/rustfix-fail-revisions.a.fixed -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/rustfix-fail-revisions.a.fixed" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" "--crate-name" "__rustfix_fail_revisions_1" - -error: test got exit status: 1, but expected 0 - --> tests/actual_tests_bless/rustfix-fail-revisions.a.fixed:2:9 - | -2 | #![deny(warnings)] - | ^^^^^^^^ after rustfix is applied, all errors should be gone, but weren't - | - -full stderr: -error: path statement drops value - --> tests/actual_tests_bless/rustfix-fail-revisions.a.fixed:11:5 - | -11 | x; - | ^^ help: use `drop` to clarify the intent: `drop(x);` - | -note: the lint level is defined here - --> tests/actual_tests_bless/rustfix-fail-revisions.a.fixed:2:9 - | -2 | #![deny(warnings)] - | ^^^^^^^^ - = note: `#[deny(path_statements)]` implied by `#[deny(warnings)]` - -error: aborting due to 1 previous error - - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/rustfix-fail-revisions.b.fixed -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/rustfix-fail-revisions.b.fixed" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" "--crate-name" "__rustfix_fail_revisions_1" - -error: test got exit status: 1, but expected 0 - --> tests/actual_tests_bless/rustfix-fail-revisions.b.fixed:2:9 - | -2 | #![deny(warnings)] - | ^^^^^^^^ after rustfix is applied, all errors should be gone, but weren't - | - -full stderr: -error: path statement drops value - --> tests/actual_tests_bless/rustfix-fail-revisions.b.fixed:11:5 - | -11 | x; - | ^^ help: use `drop` to clarify the intent: `drop(x);` - | -note: the lint level is defined here - --> tests/actual_tests_bless/rustfix-fail-revisions.b.fixed:2:9 - | -2 | #![deny(warnings)] - | ^^^^^^^^ - = note: `#[deny(path_statements)]` implied by `#[deny(warnings)]` - -error: aborting due to 1 previous error - - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/rustfix-fail.fixed -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/rustfix-fail.fixed" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" "--crate-name" "__rustfix_fail_1" - -error: test got exit status: 1, but expected 0 - --> tests/actual_tests_bless/rustfix-fail.fixed:1:9 - | -1 | #![deny(warnings)] - | ^^^^^^^^ after rustfix is applied, all errors should be gone, but weren't - | - -full stderr: -error: path statement drops value - --> tests/actual_tests_bless/rustfix-fail.fixed:10:5 - | -10 | x; - | ^^ help: use `drop` to clarify the intent: `drop(x);` - | -note: the lint level is defined here - --> tests/actual_tests_bless/rustfix-fail.fixed:1:9 - | -1 | #![deny(warnings)] - | ^^^^^^^^ - = note: `#[deny(path_statements)]` implied by `#[deny(warnings)]` - -error: aborting due to 1 previous error - - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/unicode.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/unicode.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" - -error: test got exit status: 0, but expected 1 - = note: compilation succeeded, but was expected to fail - -error: expected error patterns, but found none - -full stderr: -warning: unused variable: `Ě电脑` - --> tests/actual_tests_bless/unicode.rs:7:9 - | -7 | let Ě电脑 = 1; - | ^^^^^ help: if this is intentional, prefix it with an underscore: `_Ě电脑` - | - = note: `#[warn(unused_variables)]` on by default - -warning: variable `Ě电脑` should have a snake case name - --> tests/actual_tests_bless/unicode.rs:7:9 - | -7 | let Ě电脑 = 1; - | ^^^^^ help: convert the identifier to snake case: `ě电脑` - | - = note: `#[warn(non_snake_case)]` on by default - -warning: 2 warnings emitted - - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/unknown_revision.rs -command: parse comments - -error: there are no revisions in this test - --> tests/actual_tests_bless/unknown_revision.rs:3:9 - | -3 | //~[cake, lie] ERROR: kawoom - | ^^^^^^^^^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/unknown_revision2.rs -command: parse comments - -error: the revision `cake` is not known - --> tests/actual_tests_bless/unknown_revision2.rs:5:9 - | -5 | //~[cake, lie] ERROR: kawoom - | ^^^^^^^^^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests_bless/wrong_diagnostic_code.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/wrong_diagnostic_code.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" - -error: diagnostic code `should_be_dead_code` not found on line 3 - --> tests/actual_tests_bless/wrong_diagnostic_code.rs:4:10 - | -4 | //~^ should_be_dead_code - | ^^^^^^^^^^^^^^^^^^^ expected because of this pattern - | - -error: there was 1 unmatched diagnostic - --> tests/actual_tests_bless/wrong_diagnostic_code.rs:3:4 - | -3 | fn foo() -> i32 { - | ^^^ Error[dead_code]: function `foo` is never used - | - -full stderr: -error: unreachable expression - --> tests/actual_tests_bless/wrong_diagnostic_code.rs:6:5 - | -5 | panic!(); - | -------- any code following this expression is unreachable -6 | 0 - | ^ unreachable expression - | -note: the lint level is defined here - --> tests/actual_tests_bless/wrong_diagnostic_code.rs:1:20 - | -1 | #![deny(dead_code, unreachable_code)] - | ^^^^^^^^^^^^^^^^ - -error: function `foo` is never used - --> tests/actual_tests_bless/wrong_diagnostic_code.rs:3:4 - | -3 | fn foo() -> i32 { - | ^^^ - | -note: the lint level is defined here - --> tests/actual_tests_bless/wrong_diagnostic_code.rs:1:9 - | -1 | #![deny(dead_code, unreachable_code)] - | ^^^^^^^^^ - -error: aborting due to 2 previous errors - - -full stdout: - - -FAILURES: - tests/actual_tests_bless/abort.rs (revision run) - tests/actual_tests_bless/aux_build_not_found.rs - tests/actual_tests_bless/aux_proc_macro_misuse.rs - tests/actual_tests_bless/aux_proc_macro_no_main.rs - tests/actual_tests_bless/compile_flags_quotes.rs - tests/actual_tests_bless/compiletest-rs-command.rs - tests/actual_tests_bless/failing_executable.rs (revision run) - tests/actual_tests_bless/no_main.rs - tests/actual_tests_bless/no_main_manual.rs - tests/actual_tests_bless/no_test.rs - tests/actual_tests_bless/non_top_level_configs.rs - tests/actual_tests_bless/pass_with_annotation.rs - tests/actual_tests_bless/revised_revision.rs - tests/actual_tests_bless/revisioned_executable.rs (revision panic.run) - tests/actual_tests_bless/revisioned_executable_panic.rs (revision run.run) - tests/actual_tests_bless/revisions_bad.rs (revision bar) - tests/actual_tests_bless/rustfix-fail-revisions.a.fixed - tests/actual_tests_bless/rustfix-fail-revisions.b.fixed - tests/actual_tests_bless/rustfix-fail.fixed - tests/actual_tests_bless/unicode.rs - tests/actual_tests_bless/unknown_revision.rs - tests/actual_tests_bless/unknown_revision2.rs - tests/actual_tests_bless/wrong_diagnostic_code.rs - -test result: FAIL. 23 failed; 26 passed; 3 ignored - -Building dependencies ... ok -tests/actual_tests_bless_yolo/revisions_bad.rs ... ok -tests/actual_tests_bless_yolo/revisions_bad.rs (revision `foo`) ... ok -tests/actual_tests_bless_yolo/revisions_bad.rs (revision `bar`) ... ok -tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs ... ok -tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.fixed ... ok -tests/actual_tests_bless_yolo/rustfix-multiple-fail.rs ... ok -tests/actual_tests_bless_yolo/rustfix-multiple-fail.1.fixed ... ok -tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed ... FAILED -tests/actual_tests_bless_yolo/rustfix-multiple-fail.3.fixed ... ok - -FAILED TEST: tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" "--crate-name" "__rustfix_multiple_fail_2" - -error: test got exit status: 1, but expected 0 - --> tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed:1:8 - | -1 | pub fn f(_: &i32) -> &i32 { - | ^ after rustfix is applied, all errors should be gone, but weren't - | - -full stderr: -error[E0308]: mismatched types - --> tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed:7:7 - | -7 | f(1); - | - ^ expected `&i32`, found integer - | | - | arguments to this function are incorrect - | -note: function defined here - --> tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed:1:8 - | -1 | pub fn f(_: &i32) -> &i32 { - | ^ ------- -help: consider borrowing here - | -7 | f(&1); - | + - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. - -full stdout: - - -FAILURES: - tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed - -test result: FAIL. 1 failed; 7 passed - -tests/actual_tests/bad_pattern.rs ... FAILED -tests/actual_tests/bad_pattern_multiple.rs ... FAILED -tests/actual_tests/executable.rs ... FAILED -tests/actual_tests/executable_compile_err.rs ... FAILED -tests/actual_tests/exit_code_fail.rs ... FAILED -tests/actual_tests/filters.rs ... FAILED -tests/actual_tests/foomp.rs ... FAILED -tests/actual_tests/foomp2.rs ... FAILED -tests/actual_tests/ice_annotations.rs ... FAILED -tests/actual_tests/inline_chain.rs ... FAILED -tests/actual_tests/joined_wrong_order.rs ... FAILED -tests/actual_tests/lone_joined_pattern.rs ... FAILED -tests/actual_tests/pattern_too_many_arrow.rs ... FAILED -tests/actual_tests/pattern_too_many_arrow_above.rs ... FAILED -tests/actual_tests/rustc_ice.rs ... FAILED -tests/actual_tests/touching_above_below.rs ... FAILED -tests/actual_tests/touching_above_below_chain.rs ... FAILED - -FAILED TEST: tests/actual_tests/bad_pattern.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/bad_pattern.rs" "--edition" "2021" - -error: actual output differed from expected -Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/bad_pattern.stderr` to the actual output ---- tests/actual_tests/bad_pattern.stderr -+++ --error[E0308]: mismatched types -+error[E0432]: unresolved import `basic_fail` -- --> tests/actual_tests/bad_pattern.rs:4:9 -+ --> tests/actual_tests/bad_pattern.rs:1:5 - | --4 | add("42", 3); -- | --- ^^^^ expected `usize`, found `&str` -- | | -- | arguments to this function are incorrect -- | --note: function defined here -- --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC -- | --1 | pub fn add(left: usize, right: usize) -> usize { -- | ^^^ -+1 | use basic_fail::add; -+ | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` - --error: aborting due to previous error -+error: aborting due to 1 previous error - --For more information about this error, try `rustc --explain E0308`. -+For more information about this error, try `rustc --explain E0432`. - -Full unnormalized output: -error[E0432]: unresolved import `basic_fail` - --> tests/actual_tests/bad_pattern.rs:1:5 - | -1 | use basic_fail::add; - | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0432`. - - -error: `miesmätsched types` not found in diagnostics on line 4 - --> tests/actual_tests/bad_pattern.rs:5:17 - | -5 | //~^ ERROR: miesmätsched types - | ^^^^^^^^^^^^^^^^^^ expected because of this pattern - | - -error: there was 1 unmatched diagnostic - --> tests/actual_tests/bad_pattern.rs:1:5 - | -1 | use basic_fail::add; - | ^^^^^^^^^^ Error[E0432]: unresolved import `basic_fail` - | - - -FAILED TEST: tests/actual_tests/bad_pattern_multiple.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/bad_pattern_multiple.rs" "--edition" "2021" - -error: actual output differed from expected -Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/bad_pattern_multiple.stderr` to the actual output ---- tests/actual_tests/bad_pattern_multiple.stderr -+++ --error[E0308]: mismatched types -+error[E0432]: unresolved import `basic_fail` -- --> tests/actual_tests/bad_pattern_multiple.rs:4:9 -+ --> tests/actual_tests/bad_pattern_multiple.rs:1:5 - | --4 | add("42", 3); -- | --- ^^^^ expected `usize`, found `&str` -- | | -- | arguments to this function are incorrect -- | --note: function defined here -- --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC -- | --1 | pub fn add(left: usize, right: usize) -> usize { -- | ^^^ -+1 | use basic_fail::add; -+ | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` - --error[E0308]: mismatched types -- --> tests/actual_tests/bad_pattern_multiple.rs:6:9 -- | --6 | add("42", 3); -- | --- ^^^^ expected `usize`, found `&str` -- | | -- | arguments to this function are incorrect -- | --note: function defined here -- --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC -- | --1 | pub fn add(left: usize, right: usize) -> usize { -- | ^^^ -+error: aborting due to 1 previous error - -- error: aborting due to 2 previous errors -- --For more information about this error, try `rustc --explain E0308`. -+For more information about this error, try `rustc --explain E0432`. - -Full unnormalized output: -error[E0432]: unresolved import `basic_fail` - --> tests/actual_tests/bad_pattern_multiple.rs:1:5 - | -1 | use basic_fail::add; - | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0432`. - - -error: `miesmätsched types` not found in diagnostics on line 4 - --> tests/actual_tests/bad_pattern_multiple.rs:5:17 - | -5 | //~^ ERROR: miesmätsched types - | ^^^^^^^^^^^^^^^^^^ expected because of this pattern - | - -error: `miesmätsched types` not found in diagnostics on line 6 - --> tests/actual_tests/bad_pattern_multiple.rs:7:17 - | -7 | //~^ ERROR: miesmätsched types - | ^^^^^^^^^^^^^^^^^^ expected because of this pattern - | - -error: there was 1 unmatched diagnostic - --> tests/actual_tests/bad_pattern_multiple.rs:1:5 - | -1 | use basic_fail::add; - | ^^^^^^^^^^ Error[E0432]: unresolved import `basic_fail` - | - - -FAILED TEST: tests/actual_tests/executable.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/executable.rs" "--edition" "2021" - -error: test got exit status: 1, but expected 0 - --> tests/actual_tests/executable.rs:3:4 - | -3 | //@run - | ^^^ compilation failed, but was expected to succeed - | - -error: no output was expected -Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/executable.stderr` to the actual output -+++ -error[E0432]: unresolved import `basic_fail` - --> tests/actual_tests/executable.rs:1:5 - | -1 | use basic_fail::add; - | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0432`. - - - -FAILED TEST: tests/actual_tests/executable_compile_err.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/executable_compile_err.rs" "--edition" "2021" - -error: test got exit status: 1, but expected 0 - --> tests/actual_tests/executable_compile_err.rs:1:4 - | -1 | //@run - | ^^^ compilation failed, but was expected to succeed - | - -error: no output was expected -Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/executable_compile_err.stderr` to the actual output -+++ -error: this file contains an unclosed delimiter - --> tests/actual_tests/executable_compile_err.rs:4:2 - | -3 | fn main() { - | - unclosed delimiter -4 | - | ^ - -error: aborting due to 1 previous error - - - - -FAILED TEST: tests/actual_tests/exit_code_fail.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/exit_code_fail.rs" "--edition" "2021" - -error: test got exit status: 0, but expected 1 - = note: compilation succeeded, but was expected to fail - -error: expected error patterns, but found none - - -FAILED TEST: tests/actual_tests/filters.rs -command: parse comments - -error: `x86_64` is not a valid condition, expected `on-host`, /[0-9]+bit/, /host-.*/, or /target-.*/ - --> tests/actual_tests/filters.rs:1:9 - | -1 | //@only-x86_64 - | ^^^^^^ - | - - -FAILED TEST: tests/actual_tests/foomp.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/foomp.rs" "--edition" "2021" - -error: actual output differed from expected -Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/foomp.stderr` to the actual output ---- tests/actual_tests/foomp.stderr -+++ --error[E0308]: mismatched types -+error[E0432]: unresolved import `basic_fail` -- --> tests/actual_tests/foomp.rs:4:9 -+ --> tests/actual_tests/foomp.rs:1:5 - | --4 | add("42", 3); -- | --- ^^^^ expected `usize`, found `&str` -- | --note: function defined here -- --> $DIR/tests/integrations/basic/src/lib.rs:LL:CC -- | --1 | pub fn add(left: usize, right: usize) -> usize { -- | ^^^ some expected text that isn't in the actual message -+1 | use basic_fail::add; -+ | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` - --error: aborting doo to previous error -+error: aborting due to 1 previous error - --For more information about this error, try `rustc --explain E0308`. -+For more information about this error, try `rustc --explain E0432`. - -Full unnormalized output: -error[E0432]: unresolved import `basic_fail` - --> tests/actual_tests/foomp.rs:1:5 - | -1 | use basic_fail::add; - | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0432`. - - -error: `mismatched types` not found in diagnostics on line 4 - --> tests/actual_tests/foomp.rs:5:17 - | -5 | //~^ ERROR: mismatched types - | ^^^^^^^^^^^^^^^^ expected because of this pattern - | - -error: there was 1 unmatched diagnostic - --> tests/actual_tests/foomp.rs:1:5 - | -1 | use basic_fail::add; - | ^^^^^^^^^^ Error[E0432]: unresolved import `basic_fail` - | - - -FAILED TEST: tests/actual_tests/foomp2.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/foomp2.rs" "--edition" "2021" - -error: actual output differed from expected -Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/foomp2.stderr` to the actual output ---- tests/actual_tests/foomp2.stderr -+++ --error[E0308]: mismatched types -+error[E0432]: unresolved import `basic_fail` -- --> tests/actual_tests/foomp2.rs:4:9 -+ --> tests/actual_tests/foomp2.rs:1:5 - | --4 | add("42", 3); -- | --- ^^^^ expected `usize`, found `&str` -- | | -- | arguments to this function are incorrect -- | --note: function defined here -- --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC -- | --1 | pub fn add(left: usize, right: usize) -> usize { -- | ^^^ -+1 | use basic_fail::add; -+ | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` - --error: aborting due to previous error -+error: aborting due to 1 previous error - --For more information about this error, try `rustc --explain E0308`. -+For more information about this error, try `rustc --explain E0432`. - -Full unnormalized output: -error[E0432]: unresolved import `basic_fail` - --> tests/actual_tests/foomp2.rs:1:5 - | -1 | use basic_fail::add; - | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0432`. - - -error: `mismatched types` not found in diagnostics on line 4 - --> tests/actual_tests/foomp2.rs:5:17 - | -5 | //~^ ERROR: mismatched types - | ^^^^^^^^^^^^^^^^ expected because of this pattern - | - -error: there was 1 unmatched diagnostic - --> tests/actual_tests/foomp2.rs:1:5 - | -1 | use basic_fail::add; - | ^^^^^^^^^^ Error[E0432]: unresolved import `basic_fail` - | - - -FAILED TEST: tests/actual_tests/ice_annotations.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/ice_annotations.rs" "-Ztreat-err-as-bug" "--edition" "2021" - -error: test got exit status: 101, but expected 1 - = note: the compiler panicked - -error: no output was expected -Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/ice_annotations.stderr` to the actual output -+++ -error: internal compiler error[E0432]: unresolved import `basic_fail` - --> tests/actual_tests/ice_annotations.rs:5:5 - | -5 | use basic_fail::add; - | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` - -thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs: -aborting due to `-Z treat-err-as-bug=1` -note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace - -error: the compiler unexpectedly panicked. this is a bug. - -note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md - -note: please make sure that you have updated to the latest nightly - - - -note: compiler flags: -Z treat-err-as-bug - -query stack during panic: -#0 [resolver_for_lowering_raw] getting the resolver for lowering -end of query stack - - -error: `mismatched types` not found in diagnostics on line 8 - --> tests/actual_tests/ice_annotations.rs:9:15 - | -9 | //~^ ICE: mismatched types - | ^^^^^^^^^^^^^^^^ expected because of this pattern - | - -error: there was 1 unmatched diagnostic - --> tests/actual_tests/ice_annotations.rs:5:5 - | -5 | use basic_fail::add; - | ^^^^^^^^^^ Ice: unresolved import `basic_fail` - | - - -FAILED TEST: tests/actual_tests/inline_chain.rs -command: parse comments - -error: `//~|` comment not attached to anchoring matcher - --> tests/actual_tests/inline_chain.rs:5:26 - | -5 | //~| unused_variables - | ^ - | - - -FAILED TEST: tests/actual_tests/joined_wrong_order.rs -command: parse comments - -error: `//~|` comment not attached to anchoring matcher - --> tests/actual_tests/joined_wrong_order.rs:5:8 - | -5 | //~| unused_mut - | ^ - | - - -FAILED TEST: tests/actual_tests/lone_joined_pattern.rs -command: parse comments - -error: `//~|` comment not attached to anchoring matcher - --> tests/actual_tests/lone_joined_pattern.rs:2:8 - | -2 | //~| ERROR: mismatched types - | ^ - | - -error: `//~|` comment not attached to anchoring matcher - --> tests/actual_tests/lone_joined_pattern.rs:4:8 - | -4 | //~| ERROR: mismatched types - | ^ - | - - -FAILED TEST: tests/actual_tests/pattern_too_many_arrow.rs -command: parse comments - -error: //~^ pattern is trying to refer to 7 lines above, but there are only 2 lines above - --> tests/actual_tests/pattern_too_many_arrow.rs:3:8 - | -3 | //~^^^^^^^ ERROR: mismatched types - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - - -FAILED TEST: tests/actual_tests/pattern_too_many_arrow_above.rs -command: parse comments - -error: //~v pattern is trying to refer to line 8, but the file only has 6 lines - --> tests/actual_tests/pattern_too_many_arrow_above.rs:2:22 - | -2 | //~vvvvvv ERROR: mismatched types - | ^^^^^^^^^^^^^^^^ - | - - -FAILED TEST: tests/actual_tests/rustc_ice.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustc_ice.rs" "-Ztreat-err-as-bug" "--edition" "2021" - -error: test got exit status: 101, but expected 1 - = note: the compiler panicked - -error: actual output differed from expected -Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/rustc_ice.stderr` to the actual output ---- tests/actual_tests/rustc_ice.stderr -+++ --error: internal compiler error[E0308]: mismatched types -+error: internal compiler error[E0432]: unresolved import `basic_fail` -- --> tests/actual_tests/rustc_ice.rs:8:9 -+ --> tests/actual_tests/rustc_ice.rs:5:5 - | --8 | add("42", 3); -- | --- ^^^^ expected `usize`, found `&str` -- | | -- | arguments to this function are incorrect -- | --note: function defined here -- --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC -- | --1 | pub fn add(left: usize, right: usize) -> usize { -- | ^^^ -+5 | use basic_fail::add; -+ | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` - - thread 'rustc' panicked - -Full unnormalized output: -error: internal compiler error[E0432]: unresolved import `basic_fail` - --> tests/actual_tests/rustc_ice.rs:5:5 - | -5 | use basic_fail::add; - | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` - -thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs: -aborting due to `-Z treat-err-as-bug=1` -note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace - -error: the compiler unexpectedly panicked. this is a bug. - -note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md - -note: please make sure that you have updated to the latest nightly - - - -note: compiler flags: -Z treat-err-as-bug - -query stack during panic: -#0 [resolver_for_lowering_raw] getting the resolver for lowering -end of query stack - - -error: `mismatched types` not found in diagnostics on line 8 - --> tests/actual_tests/rustc_ice.rs:9:17 - | -9 | //~^ ERROR: mismatched types - | ^^^^^^^^^^^^^^^^ expected because of this pattern - | - -error: there was 1 unmatched diagnostic - --> tests/actual_tests/rustc_ice.rs:5:5 - | -5 | use basic_fail::add; - | ^^^^^^^^^^ Ice: unresolved import `basic_fail` - | - - -FAILED TEST: tests/actual_tests/touching_above_below.rs -command: parse comments - -error: `//~v` comment immediately following a `//~^` comment chain - --> tests/actual_tests/touching_above_below.rs:4:8 - | -4 | //~v ERROR: mismatched types - | ^^^^^^^^^^^^^^^^^^^^^^^^^ - | - - -FAILED TEST: tests/actual_tests/touching_above_below_chain.rs -command: parse comments - -error: `//~v` comment immediately following a `//~^` comment chain - --> tests/actual_tests/touching_above_below_chain.rs:5:8 - | -5 | //~v ERROR: unused variable - | ^^^^^^^^^^^^^^^^^^^^^^^^ - | - -FAILURES: - tests/actual_tests/bad_pattern.rs - tests/actual_tests/bad_pattern_multiple.rs - tests/actual_tests/executable.rs - tests/actual_tests/executable_compile_err.rs - tests/actual_tests/exit_code_fail.rs - tests/actual_tests/filters.rs - tests/actual_tests/foomp.rs - tests/actual_tests/foomp2.rs - tests/actual_tests/ice_annotations.rs - tests/actual_tests/inline_chain.rs - tests/actual_tests/joined_wrong_order.rs - tests/actual_tests/lone_joined_pattern.rs - tests/actual_tests/pattern_too_many_arrow.rs - tests/actual_tests/pattern_too_many_arrow_above.rs - tests/actual_tests/rustc_ice.rs - tests/actual_tests/touching_above_below.rs - tests/actual_tests/touching_above_below_chain.rs - -test result: FAIL. 17 failed - -tests/actual_tests/bad_pattern.rs ... FAILED -tests/actual_tests/bad_pattern_multiple.rs ... FAILED -tests/actual_tests/executable.rs ... FAILED -tests/actual_tests/executable_compile_err.rs ... FAILED -tests/actual_tests/exit_code_fail.rs ... FAILED -tests/actual_tests/filters.rs ... FAILED -tests/actual_tests/foomp.rs ... FAILED -tests/actual_tests/foomp2.rs ... FAILED -tests/actual_tests/ice_annotations.rs ... FAILED -tests/actual_tests/inline_chain.rs ... FAILED -tests/actual_tests/joined_wrong_order.rs ... FAILED -tests/actual_tests/lone_joined_pattern.rs ... FAILED -tests/actual_tests/pattern_too_many_arrow.rs ... FAILED -tests/actual_tests/pattern_too_many_arrow_above.rs ... FAILED -tests/actual_tests/rustc_ice.rs ... FAILED -tests/actual_tests/touching_above_below.rs ... FAILED -tests/actual_tests/touching_above_below_chain.rs ... FAILED - -FAILED TEST: tests/actual_tests/bad_pattern.rs -command: "$CMD" "tests/actual_tests/bad_pattern.rs" "--edition" "2021" - -full stderr: -No such file or directory -full stdout: -could not spawn `"invalid_foobarlaksdfalsdfj"` as a process - - -FAILED TEST: tests/actual_tests/bad_pattern_multiple.rs -command: "$CMD" "tests/actual_tests/bad_pattern_multiple.rs" "--edition" "2021" - -full stderr: -No such file or directory -full stdout: -could not spawn `"invalid_foobarlaksdfalsdfj"` as a process - - -FAILED TEST: tests/actual_tests/executable.rs -command: "$CMD" "tests/actual_tests/executable.rs" "--edition" "2021" - -full stderr: -No such file or directory -full stdout: -could not spawn `"invalid_foobarlaksdfalsdfj"` as a process - - -FAILED TEST: tests/actual_tests/executable_compile_err.rs -command: "$CMD" "tests/actual_tests/executable_compile_err.rs" "--edition" "2021" - -full stderr: -No such file or directory -full stdout: -could not spawn `"invalid_foobarlaksdfalsdfj"` as a process - - -FAILED TEST: tests/actual_tests/exit_code_fail.rs -command: "$CMD" "tests/actual_tests/exit_code_fail.rs" "--edition" "2021" - -full stderr: -No such file or directory -full stdout: -could not spawn `"invalid_foobarlaksdfalsdfj"` as a process - - -FAILED TEST: tests/actual_tests/filters.rs -command: parse comments - -error: `x86_64` is not a valid condition, expected `on-host`, /[0-9]+bit/, /host-.*/, or /target-.*/ - --> tests/actual_tests/filters.rs:1:9 - | -1 | //@only-x86_64 - | ^^^^^^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests/foomp.rs -command: "$CMD" "tests/actual_tests/foomp.rs" "--edition" "2021" - -full stderr: -No such file or directory -full stdout: -could not spawn `"invalid_foobarlaksdfalsdfj"` as a process - - -FAILED TEST: tests/actual_tests/foomp2.rs -command: "$CMD" "tests/actual_tests/foomp2.rs" "--edition" "2021" - -full stderr: -No such file or directory -full stdout: -could not spawn `"invalid_foobarlaksdfalsdfj"` as a process - - -FAILED TEST: tests/actual_tests/ice_annotations.rs -command: "$CMD" "tests/actual_tests/ice_annotations.rs" "-Ztreat-err-as-bug" "--edition" "2021" - -full stderr: -No such file or directory -full stdout: -could not spawn `"invalid_foobarlaksdfalsdfj"` as a process - - -FAILED TEST: tests/actual_tests/inline_chain.rs -command: parse comments - -error: `//~|` comment not attached to anchoring matcher - --> tests/actual_tests/inline_chain.rs:5:26 - | -5 | //~| unused_variables - | ^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests/joined_wrong_order.rs -command: parse comments - -error: `//~|` comment not attached to anchoring matcher - --> tests/actual_tests/joined_wrong_order.rs:5:8 - | -5 | //~| unused_mut - | ^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests/lone_joined_pattern.rs -command: parse comments - -error: `//~|` comment not attached to anchoring matcher - --> tests/actual_tests/lone_joined_pattern.rs:2:8 - | -2 | //~| ERROR: mismatched types - | ^ - | - -error: `//~|` comment not attached to anchoring matcher - --> tests/actual_tests/lone_joined_pattern.rs:4:8 - | -4 | //~| ERROR: mismatched types - | ^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests/pattern_too_many_arrow.rs -command: parse comments - -error: //~^ pattern is trying to refer to 7 lines above, but there are only 2 lines above - --> tests/actual_tests/pattern_too_many_arrow.rs:3:8 - | -3 | //~^^^^^^^ ERROR: mismatched types - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests/pattern_too_many_arrow_above.rs -command: parse comments - -error: //~v pattern is trying to refer to line 8, but the file only has 6 lines - --> tests/actual_tests/pattern_too_many_arrow_above.rs:2:22 - | -2 | //~vvvvvv ERROR: mismatched types - | ^^^^^^^^^^^^^^^^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests/rustc_ice.rs -command: "$CMD" "tests/actual_tests/rustc_ice.rs" "-Ztreat-err-as-bug" "--edition" "2021" - -full stderr: -No such file or directory -full stdout: -could not spawn `"invalid_foobarlaksdfalsdfj"` as a process - - -FAILED TEST: tests/actual_tests/touching_above_below.rs -command: parse comments - -error: `//~v` comment immediately following a `//~^` comment chain - --> tests/actual_tests/touching_above_below.rs:4:8 - | -4 | //~v ERROR: mismatched types - | ^^^^^^^^^^^^^^^^^^^^^^^^^ - | - -full stderr: - -full stdout: - - - -FAILED TEST: tests/actual_tests/touching_above_below_chain.rs -command: parse comments - -error: `//~v` comment immediately following a `//~^` comment chain - --> tests/actual_tests/touching_above_below_chain.rs:5:8 - | -5 | //~v ERROR: unused variable - | ^^^^^^^^^^^^^^^^^^^^^^^^ - | - -full stderr: - -full stdout: - - -FAILURES: - tests/actual_tests/bad_pattern.rs - tests/actual_tests/bad_pattern_multiple.rs - tests/actual_tests/executable.rs - tests/actual_tests/executable_compile_err.rs - tests/actual_tests/exit_code_fail.rs - tests/actual_tests/filters.rs - tests/actual_tests/foomp.rs - tests/actual_tests/foomp2.rs - tests/actual_tests/ice_annotations.rs - tests/actual_tests/inline_chain.rs - tests/actual_tests/joined_wrong_order.rs - tests/actual_tests/lone_joined_pattern.rs - tests/actual_tests/pattern_too_many_arrow.rs - tests/actual_tests/pattern_too_many_arrow_above.rs - tests/actual_tests/rustc_ice.rs - tests/actual_tests/touching_above_below.rs - tests/actual_tests/touching_above_below_chain.rs - -test result: FAIL. 17 failed - - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished - diff --git a/tests/integrations/basic-fail/Cargo.toml b/tests/integrations/basic-fail/Cargo.toml deleted file mode 100644 index 70590753..00000000 --- a/tests/integrations/basic-fail/Cargo.toml +++ /dev/null @@ -1,36 +0,0 @@ -[package] -name = "basic_fail" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dev-dependencies] -ui_test = { path = "../../.." } -tempfile = "3.3.0" - -[[test]] -name = "ui_tests" -harness = false - -[[test]] -name = "json" -harness = false - -[[test]] -name = "ui_tests_invalid_program" -harness = false - -[[test]] -name = "ui_tests_invalid_program2" -harness = false - -[[test]] -name = "ui_tests_diff_only" -harness = false - -[[test]] -name = "ui_tests_bless" -harness = false - -#@normalize-stdout-test: "(command: canonicalizing path `tests/actual_tests_bless/auxiliary/aasdflkjasdlfjasdlfkjasdf`\n\nfull stderr:\n).*" -> "${1}No such file or directory" diff --git a/tests/integrations/basic-fail/src/lib.rs b/tests/integrations/basic-fail/src/lib.rs deleted file mode 100644 index 211bfff7..00000000 --- a/tests/integrations/basic-fail/src/lib.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub fn add(left: usize, right: usize) -> usize { - left + right -} diff --git a/tests/integrations/basic-fail/tests/actual_tests/bad_pattern.rs b/tests/integrations/basic-fail/tests/actual_tests/bad_pattern.rs deleted file mode 100644 index 34d2e201..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/bad_pattern.rs +++ /dev/null @@ -1,6 +0,0 @@ -use basic_fail::add; - -fn main() { - add("42", 3); - //~^ ERROR: miesmätsched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests/bad_pattern.stderr b/tests/integrations/basic-fail/tests/actual_tests/bad_pattern.stderr deleted file mode 100644 index 6bafa7c4..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/bad_pattern.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests/bad_pattern.rs:4:9 - | -4 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.rs b/tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.rs deleted file mode 100644 index c74528f5..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.rs +++ /dev/null @@ -1,8 +0,0 @@ -use basic_fail::add; - -fn main() { - add("42", 3); - //~^ ERROR: miesmätsched types - add("42", 3); - //~^ ERROR: miesmätsched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.stderr b/tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.stderr deleted file mode 100644 index 260eefb6..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.stderr +++ /dev/null @@ -1,31 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests/bad_pattern_multiple.rs:4:9 - | -4 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error[E0308]: mismatched types - --> tests/actual_tests/bad_pattern_multiple.rs:6:9 - | -6 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - - error: aborting due to 2 previous errors - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests/executable.rs b/tests/integrations/basic-fail/tests/actual_tests/executable.rs deleted file mode 100644 index 00a6a191..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/executable.rs +++ /dev/null @@ -1,7 +0,0 @@ -use basic_fail::add; - -//@run - -fn main() { - println!("{}", add(20, 22)); -} diff --git a/tests/integrations/basic-fail/tests/actual_tests/executable.run.stdout b/tests/integrations/basic-fail/tests/actual_tests/executable.run.stdout deleted file mode 100644 index b5489e5e..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/executable.run.stdout +++ /dev/null @@ -1 +0,0 @@ -69 diff --git a/tests/integrations/basic-fail/tests/actual_tests/executable_compile_err.rs b/tests/integrations/basic-fail/tests/actual_tests/executable_compile_err.rs deleted file mode 100644 index 9dc8393c..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/executable_compile_err.rs +++ /dev/null @@ -1,4 +0,0 @@ -//@run - -fn main() { - diff --git a/tests/integrations/basic-fail/tests/actual_tests/exit_code_fail.rs b/tests/integrations/basic-fail/tests/actual_tests/exit_code_fail.rs deleted file mode 100644 index f328e4d9..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/exit_code_fail.rs +++ /dev/null @@ -1 +0,0 @@ -fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests/filters.rs b/tests/integrations/basic-fail/tests/actual_tests/filters.rs deleted file mode 100644 index 18f18b16..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/filters.rs +++ /dev/null @@ -1,3 +0,0 @@ -//@only-x86_64 - -fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests/foomp.rs b/tests/integrations/basic-fail/tests/actual_tests/foomp.rs deleted file mode 100644 index 9d1a43d2..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/foomp.rs +++ /dev/null @@ -1,6 +0,0 @@ -use basic_fail::add; - -fn main() { - add("42", 3); - //~^ ERROR: mismatched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests/foomp.stderr b/tests/integrations/basic-fail/tests/actual_tests/foomp.stderr deleted file mode 100644 index bb5f5b2f..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/foomp.stderr +++ /dev/null @@ -1,15 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests/foomp.rs:4:9 - | -4 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | -note: function defined here - --> $DIR/tests/integrations/basic/src/lib.rs:1:8 - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ some expected text that isn't in the actual message - -error: aborting doo to previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests/foomp2.fixed b/tests/integrations/basic-fail/tests/actual_tests/foomp2.fixed deleted file mode 100644 index 1ab44b66..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/foomp2.fixed +++ /dev/null @@ -1,2 +0,0 @@ -this is just a test file showing that -stray .fixed files are detected and blessed away diff --git a/tests/integrations/basic-fail/tests/actual_tests/foomp2.rs b/tests/integrations/basic-fail/tests/actual_tests/foomp2.rs deleted file mode 100644 index 9d1a43d2..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/foomp2.rs +++ /dev/null @@ -1,6 +0,0 @@ -use basic_fail::add; - -fn main() { - add("42", 3); - //~^ ERROR: mismatched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests/foomp2.stderr b/tests/integrations/basic-fail/tests/actual_tests/foomp2.stderr deleted file mode 100644 index c6895212..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/foomp2.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests/foomp2.rs:4:9 - | -4 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests/ice_annotations.rs b/tests/integrations/basic-fail/tests/actual_tests/ice_annotations.rs deleted file mode 100644 index 4ea10071..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/ice_annotations.rs +++ /dev/null @@ -1,10 +0,0 @@ -//@compile-flags: -Ztreat-err-as-bug -//@rustc-env: RUSTC_BOOTSTRAP=1 -//@rustc-env: RUSTC_ICE=0 -//@normalize-stderr-test: "(?s)(thread 'rustc' panicked).*end of query stack" -> "$1" -use basic_fail::add; - -fn main() { - add("42", 3); - //~^ ICE: mismatched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests/inline_chain.rs b/tests/integrations/basic-fail/tests/actual_tests/inline_chain.rs deleted file mode 100644 index e24173e7..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/inline_chain.rs +++ /dev/null @@ -1,6 +0,0 @@ -#![deny(unused_mut, unused_variables)] - -fn main() { - let mut x = 0u32; //~ unused_mut - //~| unused_variables -} diff --git a/tests/integrations/basic-fail/tests/actual_tests/joined_wrong_order.rs b/tests/integrations/basic-fail/tests/actual_tests/joined_wrong_order.rs deleted file mode 100644 index 9afef5dd..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/joined_wrong_order.rs +++ /dev/null @@ -1,7 +0,0 @@ -#![deny(unused_mut, unused_variables)] - -fn main() { - //~vv unused_variables - //~| unused_mut - let mut x = 0u32; -} diff --git a/tests/integrations/basic-fail/tests/actual_tests/lone_joined_pattern.rs b/tests/integrations/basic-fail/tests/actual_tests/lone_joined_pattern.rs deleted file mode 100644 index 55784cd3..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/lone_joined_pattern.rs +++ /dev/null @@ -1,7 +0,0 @@ -fn main() { - //~| ERROR: mismatched types - use_unit(1_u32); - //~| ERROR: mismatched types -} - -fn use_unit(_: ()) {} diff --git a/tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow.rs b/tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow.rs deleted file mode 100644 index 308ff798..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow.rs +++ /dev/null @@ -1,6 +0,0 @@ -fn main() { - use_unit(1_u32); - //~^^^^^^^ ERROR: mismatched types -} - -fn use_unit(_: ()) {} diff --git a/tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow_above.rs b/tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow_above.rs deleted file mode 100644 index 29a5ac0a..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow_above.rs +++ /dev/null @@ -1,6 +0,0 @@ -fn main() { - //~vvvvvv ERROR: mismatched types - use_unit(1_u32); -} - -fn use_unit(_: ()) {} diff --git a/tests/integrations/basic-fail/tests/actual_tests/rustc_ice.rs b/tests/integrations/basic-fail/tests/actual_tests/rustc_ice.rs deleted file mode 100644 index e87ddae0..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/rustc_ice.rs +++ /dev/null @@ -1,10 +0,0 @@ -//@compile-flags: -Ztreat-err-as-bug -//@rustc-env: RUSTC_BOOTSTRAP=1 -//@rustc-env: RUSTC_ICE=0 -//@normalize-stderr-test: "(?s)(thread 'rustc' panicked).*end of query stack" -> "$1" -use basic_fail::add; - -fn main() { - add("42", 3); - //~^ ERROR: mismatched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests/rustc_ice.stderr b/tests/integrations/basic-fail/tests/actual_tests/rustc_ice.stderr deleted file mode 100644 index e8dbb87a..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/rustc_ice.stderr +++ /dev/null @@ -1,15 +0,0 @@ -error: internal compiler error[E0308]: mismatched types - --> tests/actual_tests/rustc_ice.rs:8:9 - | -8 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -thread 'rustc' panicked diff --git a/tests/integrations/basic-fail/tests/actual_tests/touching_above_below.rs b/tests/integrations/basic-fail/tests/actual_tests/touching_above_below.rs deleted file mode 100644 index 8c1208a9..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/touching_above_below.rs +++ /dev/null @@ -1,8 +0,0 @@ -fn main() { - use_unit(1_u32); - //~^ ERROR: mismatched types - //~v ERROR: mismatched types - use_unit(1_u32); -} - -fn use_unit(_: ()) {} diff --git a/tests/integrations/basic-fail/tests/actual_tests/touching_above_below_chain.rs b/tests/integrations/basic-fail/tests/actual_tests/touching_above_below_chain.rs deleted file mode 100644 index 477c00d7..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests/touching_above_below_chain.rs +++ /dev/null @@ -1,9 +0,0 @@ -fn main() { - use_unit(1_u32); - //~^ ERROR: mismatched types - //~| ERROR: variable does not need to be mutable - //~v ERROR: unused variable - let mut x = 0u32; -} - -fn use_unit(_: ()) {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/abort.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/abort.rs deleted file mode 100644 index 8b200a11..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/abort.rs +++ /dev/null @@ -1,5 +0,0 @@ -//@run - -fn main() { - std::process::abort(); -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/aux_build_not_found.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/aux_build_not_found.rs deleted file mode 100644 index 25ce3478..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/aux_build_not_found.rs +++ /dev/null @@ -1,3 +0,0 @@ -//@aux-build:aasdflkjasdlfjasdlfkjasdf - -fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_misuse.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_misuse.rs deleted file mode 100644 index f3f0c3e9..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_misuse.rs +++ /dev/null @@ -1,8 +0,0 @@ -//@aux-build:the_proc_macro.rs:proc-macro - -use the_proc_macro::thing; - -fn main() { - thing!(cake); - //~^ ERROR: cannot find value `cake` in this scope -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.rs deleted file mode 100644 index 0806f482..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.rs +++ /dev/null @@ -1,7 +0,0 @@ -//@aux-build:the_proc_macro.rs -//! Test that our automatic --crate-type detection (changing this crate to `lib`) -//! does not change the aux build to `lib` - -use the_proc_macro::thing; - -thing!(cake); diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.stderr deleted file mode 100644 index 23f8688a..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected one of `!` or `::`, found `` - --> tests/actual_tests_bless/aux_proc_macro_no_main.rs:7:8 - | -7 | thing!(cake); - | ^^^^ expected one of `!` or `::` - -error: aborting due to 1 previous error - diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/foomp.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/foomp.rs deleted file mode 100644 index 4717fe7c..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/foomp.rs +++ /dev/null @@ -1 +0,0 @@ -pub fn add(_: u8, _: u8) {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/nested.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/nested.rs deleted file mode 100644 index dad6ebcc..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/nested.rs +++ /dev/null @@ -1,5 +0,0 @@ -//@aux-build:foomp.rs - -pub fn bar() { - foomp::add(1, 2); -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/the_proc_macro.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/the_proc_macro.rs deleted file mode 100644 index 9eb2efe7..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/the_proc_macro.rs +++ /dev/null @@ -1,10 +0,0 @@ -#![crate_type = "proc-macro"] - -extern crate proc_macro; - -use proc_macro::TokenStream; - -#[proc_macro] -pub fn thing(input: TokenStream) -> TokenStream { - input -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/compile_flags_quotes.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/compile_flags_quotes.rs deleted file mode 100644 index 699afbbf..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/compile_flags_quotes.rs +++ /dev/null @@ -1,3 +0,0 @@ -//@compile-flag: cake -//@compile-flags: -Z "cake is a lie" -//@compile-flags: -Z "cheese is good diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/compiletest-rs-command.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/compiletest-rs-command.rs deleted file mode 100644 index 6421eaaf..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/compiletest-rs-command.rs +++ /dev/null @@ -1,6 +0,0 @@ -//aux-build:foomp.rs -// aux-build:asf.rs -// aux-build:asasdflk.rs -// @aux-build:asldkfjasldfj.rs -// @aux-build:asldkjf.rs -fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.rs deleted file mode 100644 index e9ca7af1..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.rs +++ /dev/null @@ -1,9 +0,0 @@ -//@edition: 2018 -//@check-pass - -fn main() { - match 42 { - 0...1 => {} - _ => {} - } -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.stderr deleted file mode 100644 index 4b533a94..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.stderr +++ /dev/null @@ -1,12 +0,0 @@ -warning: `...` range patterns are deprecated - --> tests/actual_tests_bless/edition_override.rs:6:10 - | -6 | 0...1 => {} - | ^^^ help: use `..=` for an inclusive range - | - = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021! - = note: for more information, see - = note: `#[warn(ellipsis_inclusive_range_patterns)]` on by default - -warning: 1 warning emitted - diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.rs deleted file mode 100644 index d3cafbdf..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.rs +++ /dev/null @@ -1,5 +0,0 @@ -//@run - -fn main() { - assert_eq!(5, 6); -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.run.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.run.stderr deleted file mode 100644 index b6f31ef3..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.run.stderr +++ /dev/null @@ -1,5 +0,0 @@ -thread 'main' panicked at tests/actual_tests_bless/failing_executable.rs:4:5: -assertion `left == right` failed - left: 5 - right: 6 -note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.rs deleted file mode 100644 index a3ee84a9..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.rs +++ /dev/null @@ -1,8 +0,0 @@ -//@aux-build:foomp.rs - -use foomp::add; - -fn main() { - add("42", 3); - //~^ ERROR: mismatched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.stderr deleted file mode 100644 index edc20dbe..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests_bless/foomp_aux.rs:6:9 - | -6 | add("42", 3); - | --- ^^^^ expected `u8`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/foomp.rs:1:8 - | -1 | pub fn add(_: u8, _: u8) {} - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/nested_aux.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/nested_aux.rs deleted file mode 100644 index fd533438..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/nested_aux.rs +++ /dev/null @@ -1,8 +0,0 @@ -//@aux-build:nested.rs -//@check-pass - -use nested::bar; - -fn main() { - bar(); -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/no_main.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/no_main.rs deleted file mode 100644 index b76b4321..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/no_main.rs +++ /dev/null @@ -1 +0,0 @@ -pub fn foo() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.rs deleted file mode 100644 index 894b5cb9..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.rs +++ /dev/null @@ -1,3 +0,0 @@ -//@compile-flags: --crate-type=bin - -pub fn foo() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.stderr deleted file mode 100644 index 4ed5c842..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.stderr +++ /dev/null @@ -1,11 +0,0 @@ -error: cannot mix `bin` crate type with others - -error[E0601]: `main` function not found in crate `no_main_manual` - --> tests/actual_tests_bless/no_main_manual.rs:3:16 - | -3 | pub fn foo() {} - | ^ consider adding a `main` function to `tests/actual_tests_bless/no_main_manual.rs` - -error: aborting due to 2 previous errors - -For more information about this error, try `rustc --explain E0601`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/no_test.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/no_test.rs deleted file mode 100644 index 7e1d5163..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/no_test.rs +++ /dev/null @@ -1,2 +0,0 @@ -#[test] -fn foo() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/non_top_level_configs.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/non_top_level_configs.rs deleted file mode 100644 index 1021c219..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/non_top_level_configs.rs +++ /dev/null @@ -1,5 +0,0 @@ -////@check-pass - -fn main() { - //@ignore-target-cheesecake -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.rs deleted file mode 100644 index f8db9550..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.rs +++ /dev/null @@ -1,7 +0,0 @@ -//@normalize-stderr-test: "NORMALIZATION_OVERRIDE" -> "SUCCESS" - -// Test that the above normalization will be run after the default normalization set in ui_tests_bless.rs - -fn main() { - asdf //~ ERROR: cannot find -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.stderr deleted file mode 100644 index ea524eb8..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0425]: cannot find value `asdf` in this scope - --> tests/actual_tests_bless/SUCCESS.rs:6:5 - | -6 | asdf - | ^^^^ not found in this scope - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0425`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/pass.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/pass.rs deleted file mode 100644 index 85129e81..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/pass.rs +++ /dev/null @@ -1,3 +0,0 @@ -//@check-pass - -fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/pass_with_annotation.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/pass_with_annotation.rs deleted file mode 100644 index f09929aa..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/pass_with_annotation.rs +++ /dev/null @@ -1,4 +0,0 @@ -//@check-pass - -//~ ERROR: the cake is a lie -fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revised_revision.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revised_revision.rs deleted file mode 100644 index e1deb110..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revised_revision.rs +++ /dev/null @@ -1,13 +0,0 @@ -use basic_fail::add; -//@[foo] revisions: foo bar - -#[cfg(foo)] -fn main() { - add("42", 3); //~[foo] ERROR: mismatched types -} - -#[cfg(bar)] -fn main() { - add("42", 3); - //~[bar]^ ERROR: mismatched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable.rs deleted file mode 100644 index 489b7010..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable.rs +++ /dev/null @@ -1,5 +0,0 @@ -//@revisions: run panic -//@[run]run -//@[panic]run:101 - -fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.panic.run.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.panic.run.stderr deleted file mode 100644 index b76abb5f..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.panic.run.stderr +++ /dev/null @@ -1,3 +0,0 @@ -thread 'main' panicked at tests/actual_tests_bless/revisioned_executable_panic.rs:6:5: -explicit panic -note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.rs deleted file mode 100644 index 4152ec4a..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.rs +++ /dev/null @@ -1,7 +0,0 @@ -//@revisions: run panic -//@[run]run -//@[panic]run:101 - -fn main() { - panic!() -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.run.run.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.run.run.stderr deleted file mode 100644 index b76abb5f..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.run.run.stderr +++ /dev/null @@ -1,3 +0,0 @@ -thread 'main' panicked at tests/actual_tests_bless/revisioned_executable_panic.rs:6:5: -explicit panic -note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.bar.stderr deleted file mode 100644 index 40809709..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.bar.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests_bless/revisions.rs:11:9 - | -11 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.foo.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.foo.stderr deleted file mode 100644 index da590f39..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.foo.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests_bless/revisions.rs:6:9 - | -6 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.rs deleted file mode 100644 index cd346128..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.rs +++ /dev/null @@ -1,13 +0,0 @@ -use basic_fail::add; -//@ revisions: foo bar - -#[cfg(foo)] -fn main() { - add("42", 3); //~[foo] ERROR: mismatched types -} - -#[cfg(bar)] -fn main() { - add("42", 3); - //~[bar]^ ERROR: mismatched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.bar.stderr deleted file mode 100644 index d8d1eef6..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.bar.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0601]: `main` function not found in crate `revisions_bad` - --> tests/actual_tests_bless/revisions_bad.rs:10:2 - | -10 | } - | ^ consider adding a `main` function to `tests/actual_tests_bless/revisions_bad.rs` - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0601`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.foo.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.foo.stderr deleted file mode 100644 index 2011cf55..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.foo.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests_bless/revisions_bad.rs:8:9 - | -8 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.rs deleted file mode 100644 index 1986e0fc..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.rs +++ /dev/null @@ -1,10 +0,0 @@ -#[cfg(foo)] -use basic_fail::add; -//@ revisions: foo bar -//@[bar] error-in-other-file: `main` function not found in crate `revisions_bad` - -#[cfg(foo)] -fn main() { - add("42", 3); - //~[foo]^ ERROR: mismatched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter.rs deleted file mode 100644 index a8ee7906..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter.rs +++ /dev/null @@ -1,14 +0,0 @@ -use basic_fail::add; -//@ignore-on-host -//@ revisions: foo bar - -#[cfg(foo)] -fn main() { - add("42", 3); -} - -#[cfg(bar)] -fn main() { - add("42", 3); - //~[bar]^ ERROR: mismatched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.bar.stderr deleted file mode 100644 index 9d79a396..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.bar.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests_bless/revisions_filter2.rs:12:9 - | -12 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.rs deleted file mode 100644 index 2037461d..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.rs +++ /dev/null @@ -1,14 +0,0 @@ -use basic_fail::add; -//@[foo] ignore-on-host -//@ revisions: foo bar - -#[cfg(foo)] -fn main() { - add("42", 3); -} - -#[cfg(bar)] -fn main() { - add("42", 3); - //~[bar]^ ERROR: mismatched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.bar.stderr deleted file mode 100644 index 29461bf8..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.bar.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests_bless/revisions_multiple_per_annotation.rs:5:9 - | -5 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.foo.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.foo.stderr deleted file mode 100644 index 29461bf8..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.foo.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests_bless/revisions_multiple_per_annotation.rs:5:9 - | -5 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.rs deleted file mode 100644 index 24a248c9..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.rs +++ /dev/null @@ -1,7 +0,0 @@ -use basic_fail::add; -//@ revisions: foo bar - -fn main() { - add("42", 3); - //~[bar, foo]^ ERROR: mismatched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.bar.stderr deleted file mode 100644 index 6513fbef..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.bar.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests_bless/revisions_same_everywhere.rs:5:9 - | -5 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.foo.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.foo.stderr deleted file mode 100644 index 6513fbef..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.foo.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests_bless/revisions_same_everywhere.rs:5:9 - | -5 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.rs deleted file mode 100644 index 1d4b672c..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.rs +++ /dev/null @@ -1,7 +0,0 @@ -use basic_fail::add; -//@ revisions: foo bar - -fn main() { - add("42", 3); - //~^ ERROR: mismatched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.rs deleted file mode 100644 index 48b17cf1..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.rs +++ /dev/null @@ -1,5 +0,0 @@ -//@run: 101 - -fn main() { - panic!(); -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.run.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.run.stderr deleted file mode 100644 index b91585fc..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.run.stderr +++ /dev/null @@ -1,3 +0,0 @@ -thread 'main' panicked at tests/actual_tests_bless/run_panic.rs:4:5: -explicit panic -note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.fixed b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.fixed deleted file mode 100644 index 3631cb66..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.fixed +++ /dev/null @@ -1,12 +0,0 @@ -//@revisions: a b -#![deny(warnings)] - -fn main() { - let x = match 0 { - 0 => String::new(), - //~^ ERROR: expected `,` - _ => return, - }; - - x; -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.stderr deleted file mode 100644 index f5788fa4..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected `,` following `match` arm - --> tests/actual_tests_bless/rustfix-fail-revisions.rs:6:27 - | -6 | 0 => String::new() - | ^ help: missing a comma here to end this `match` arm: `,` - -error: aborting due to 1 previous error - diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.fixed b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.fixed deleted file mode 100644 index 3631cb66..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.fixed +++ /dev/null @@ -1,12 +0,0 @@ -//@revisions: a b -#![deny(warnings)] - -fn main() { - let x = match 0 { - 0 => String::new(), - //~^ ERROR: expected `,` - _ => return, - }; - - x; -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.stderr deleted file mode 100644 index f5788fa4..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected `,` following `match` arm - --> tests/actual_tests_bless/rustfix-fail-revisions.rs:6:27 - | -6 | 0 => String::new() - | ^ help: missing a comma here to end this `match` arm: `,` - -error: aborting due to 1 previous error - diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.rs deleted file mode 100644 index 035ba4fa..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.rs +++ /dev/null @@ -1,12 +0,0 @@ -//@revisions: a b -#![deny(warnings)] - -fn main() { - let x = match 0 { - 0 => String::new() - //~^ ERROR: expected `,` - _ => return, - }; - - x; -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.fixed b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.fixed deleted file mode 100644 index 3255796f..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.fixed +++ /dev/null @@ -1,11 +0,0 @@ -#![deny(warnings)] - -fn main() { - let x = match 0 { - 0 => String::new(), - //~^ ERROR: expected `,` - _ => return, - }; - - x; -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.rs deleted file mode 100644 index 9c40631f..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.rs +++ /dev/null @@ -1,11 +0,0 @@ -#![deny(warnings)] - -fn main() { - let x = match 0 { - 0 => String::new() - //~^ ERROR: expected `,` - _ => return, - }; - - x; -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.stderr deleted file mode 100644 index 6187df41..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected `,` following `match` arm - --> tests/actual_tests_bless/rustfix-fail.rs:5:27 - | -5 | 0 => String::new() - | ^ help: missing a comma here to end this `match` arm: `,` - -error: aborting due to 1 previous error - diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/unicode.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/unicode.rs deleted file mode 100644 index d9e54ab5..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/unicode.rs +++ /dev/null @@ -1,8 +0,0 @@ -#![deny(confusable_idents)] - -// Test that a missing annotation causing a -// ui_test diagnostic will not ICE due to byte vs char offsets. - -fn main() { - let Ě电脑 = 1; -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/unicode.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/unicode.stderr deleted file mode 100644 index b92bcd9e..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/unicode.stderr +++ /dev/null @@ -1,18 +0,0 @@ -warning: unused variable: `Ě电脑` - --> tests/actual_tests_bless/unicode.rs:7:9 - | -7 | let Ě电脑 = 1; - | ^^^^^ help: if this is intentional, prefix it with an underscore: `_Ě电脑` - | - = note: `#[warn(unused_variables)]` on by default - -warning: variable `Ě电脑` should have a snake case name - --> tests/actual_tests_bless/unicode.rs:7:9 - | -7 | let Ě电脑 = 1; - | ^^^^^ help: convert the identifier to snake case: `ě电脑` - | - = note: `#[warn(non_snake_case)]` on by default - -warning: 2 warnings emitted - diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision.rs deleted file mode 100644 index 3b28694f..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision.rs +++ /dev/null @@ -1,4 +0,0 @@ -fn main() { - assert_eq!(5, 6); - //~[cake, lie] ERROR: kawoom -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision2.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision2.rs deleted file mode 100644 index 3f1fd3a8..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision2.rs +++ /dev/null @@ -1,6 +0,0 @@ -//@ revisions: cheese lie - -fn main() { - assert_eq!(5, 6); - //~[cake, lie] ERROR: kawoom -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.rs deleted file mode 100644 index 81958d46..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.rs +++ /dev/null @@ -1,9 +0,0 @@ -#![deny(dead_code, unreachable_code)] - -fn foo() -> i32 { - //~^ should_be_dead_code - panic!(); - 0 //~ unreachable_code -} - -fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.stderr deleted file mode 100644 index 4e5a9065..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.stderr +++ /dev/null @@ -1,28 +0,0 @@ -error: unreachable expression - --> tests/actual_tests_bless/wrong_diagnostic_code.rs:6:5 - | -5 | panic!(); - | -------- any code following this expression is unreachable -6 | 0 - | ^ unreachable expression - | -note: the lint level is defined here - --> tests/actual_tests_bless/wrong_diagnostic_code.rs:1:20 - | -1 | #![deny(dead_code, unreachable_code)] - | ^^^^^^^^^^^^^^^^ - -error: function `foo` is never used - --> tests/actual_tests_bless/wrong_diagnostic_code.rs:3:4 - | -3 | fn foo() -> i32 { - | ^^^ - | -note: the lint level is defined here - --> tests/actual_tests_bless/wrong_diagnostic_code.rs:1:9 - | -1 | #![deny(dead_code, unreachable_code)] - | ^^^^^^^^^ - -error: aborting due to 2 previous errors - diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.bar.stderr deleted file mode 100644 index 1e61b080..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.bar.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0601]: `main` function not found in crate `revisions_bad` - --> tests/actual_tests_bless_yolo/revisions_bad.rs:9:2 - | -9 | } - | ^ consider adding a `main` function to `tests/actual_tests_bless_yolo/revisions_bad.rs` - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0601`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.foo.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.foo.stderr deleted file mode 100644 index 6a662007..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.foo.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests_bless_yolo/revisions_bad.rs:7:9 - | -7 | add("42", 3); - | --- ^^^^ expected `usize`, found `&str` - | | - | arguments to this function are incorrect - | -note: function defined here - --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 - | -1 | pub fn add(left: usize, right: usize) -> usize { - | ^^^ - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.rs b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.rs deleted file mode 100644 index 1d159832..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.rs +++ /dev/null @@ -1,10 +0,0 @@ -#[cfg(foo)] -use basic_fail::add; -//@ revisions: foo bar - -#[cfg(foo)] -fn main() { - add("42", 3); - //~[foo]^ ERROR: mismatched types -} -//~[bar]^ ERROR: `main` function not found in crate `revisions_bad` diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.fixed b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.fixed deleted file mode 100644 index 35070685..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.fixed +++ /dev/null @@ -1,6 +0,0 @@ -#![deny(warnings)] - -fn main() { - let _x: String = 42.to_string(); - //~^ ERROR: mismatched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs deleted file mode 100644 index 253998ff..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs +++ /dev/null @@ -1,6 +0,0 @@ -#![deny(warnings)] - -fn main() { - let _x: String = 42; - //~^ ERROR: mismatched types -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.stderr deleted file mode 100644 index 928b8c28..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.stderr +++ /dev/null @@ -1,12 +0,0 @@ -error[E0308]: mismatched types - --> tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs:4:22 - | -4 | let _x: String = 42; - | ------ ^^- help: try using a conversion method: `.to_string()` - | | | - | | expected `String`, found integer - | expected due to this - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.1.fixed b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.1.fixed deleted file mode 100644 index 5732438e..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.1.fixed +++ /dev/null @@ -1,8 +0,0 @@ -pub fn f(_: i32) -> &'static i32 { - //~^ ERROR: missing lifetime - unimplemented!() -} - -fn main() { - f(1); -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed deleted file mode 100644 index 8f6b996e..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed +++ /dev/null @@ -1,8 +0,0 @@ -pub fn f(_: &i32) -> &i32 { - //~^ ERROR: missing lifetime - unimplemented!() -} - -fn main() { - f(1); -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.3.fixed b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.3.fixed deleted file mode 100644 index 6c351ae3..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.3.fixed +++ /dev/null @@ -1,8 +0,0 @@ -pub fn f(_: i32) -> i32 { - //~^ ERROR: missing lifetime - unimplemented!() -} - -fn main() { - f(1); -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.rs b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.rs deleted file mode 100644 index c855e8eb..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.rs +++ /dev/null @@ -1,8 +0,0 @@ -pub fn f(_: i32) -> &i32 { - //~^ ERROR: missing lifetime - unimplemented!() -} - -fn main() { - f(1); -} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.stderr deleted file mode 100644 index 6ad1823a..00000000 --- a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.stderr +++ /dev/null @@ -1,24 +0,0 @@ -error[E0106]: missing lifetime specifier - --> tests/actual_tests_bless_yolo/rustfix-multiple-fail.rs:1:21 - | -1 | pub fn f(_: i32) -> &i32 { - | ^ expected named lifetime parameter - | - = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from -help: consider using the `'static` lifetime, but this is uncommon unless you're returning a borrowed value from a `const` or a `static` - | -1 | pub fn f(_: i32) -> &'static i32 { - | +++++++ -help: instead, you are more likely to want to change the argument to be borrowed... - | -1 | pub fn f(_: &i32) -> &i32 { - | + -help: ...or alternatively, you might want to return an owned value - | -1 - pub fn f(_: i32) -> &i32 { -1 + pub fn f(_: i32) -> i32 { - | - -error: aborting due to 1 previous error - -For more information about this error, try `rustc --explain E0106`. diff --git a/tests/integrations/basic-fail/tests/json.rs b/tests/integrations/basic-fail/tests/json.rs deleted file mode 100644 index 763617c6..00000000 --- a/tests/integrations/basic-fail/tests/json.rs +++ /dev/null @@ -1,34 +0,0 @@ -use ui_test::{dependencies::DependencyBuilder, *}; - -fn main() -> ui_test::color_eyre::Result<()> { - let path = "../../../target"; - let mut config = Config { - // Never bless integrations-fail tests, we want to see stderr mismatches - output_conflict_handling: ui_test::error_on_output_conflict, - bless_command: Some("DO NOT BLESS. These are meant to fail".to_string()), - ..Config::rustc("tests/actual_tests") - }; - - config - .comment_defaults - .base() - .set_custom("dependencies", DependencyBuilder::default()); - - // hide binaries generated for successfully passing tests - let tmp_dir = tempfile::tempdir_in(path)?; - let tmp_dir = tmp_dir.path(); - config.out_dir = tmp_dir.into(); - config.path_stderr_filter(tmp_dir, "$TMP"); - - config.stderr_filter("in ([0-9]m )?[0-9\\.]+s", ""); - config.stdout_filter("in ([0-9]m )?[0-9\\.]+s", ""); - config.stderr_filter(r"[^ ]*/\.?cargo/registry/.*/", "$$CARGO_REGISTRY"); - config.path_stderr_filter(&std::path::Path::new(path), "$DIR"); - - run_tests_generic( - vec![config], - default_file_filter, - default_per_file_config, - status_emitter::JSON::new(), - ) -} diff --git a/tests/integrations/basic-fail/tests/ui_tests.rs b/tests/integrations/basic-fail/tests/ui_tests.rs deleted file mode 100644 index 2432f749..00000000 --- a/tests/integrations/basic-fail/tests/ui_tests.rs +++ /dev/null @@ -1,35 +0,0 @@ -use ui_test::{dependencies::DependencyBuilder, *}; - -fn main() -> ui_test::color_eyre::Result<()> { - let path = "../../../target"; - let mut config = Config { - // Never bless integrations-fail tests, we want to see stderr mismatches - output_conflict_handling: ui_test::error_on_output_conflict, - bless_command: Some("DO NOT BLESS. These are meant to fail".to_string()), - ..Config::rustc("tests/actual_tests") - }; - - config - .comment_defaults - .base() - .set_custom("dependencies", DependencyBuilder::default()); - - // hide binaries generated for successfully passing tests - let tmp_dir = tempfile::tempdir_in(path)?; - let tmp_dir = tmp_dir.path(); - config.out_dir = tmp_dir.into(); - config.path_stderr_filter(tmp_dir, "$TMP"); - - config.stderr_filter("in ([0-9]m )?[0-9\\.]+s", ""); - config.stdout_filter("in ([0-9]m )?[0-9\\.]+s", ""); - config.stderr_filter(r"[^ ]*/\.?cargo/registry/.*/", "$$CARGO_REGISTRY"); - config.path_stderr_filter(&std::path::Path::new(path), "$DIR"); - - run_tests_generic( - vec![config], - default_file_filter, - default_per_file_config, - // Avoid github actions, as these would end up showing up in `Cargo.stderr` - status_emitter::Text::verbose(), - ) -} diff --git a/tests/integrations/basic-fail/tests/ui_tests_bless.rs b/tests/integrations/basic-fail/tests/ui_tests_bless.rs deleted file mode 100644 index 2fb5e96f..00000000 --- a/tests/integrations/basic-fail/tests/ui_tests_bless.rs +++ /dev/null @@ -1,62 +0,0 @@ -use ui_test::{ - custom_flags::rustfix::RustfixMode, dependencies::DependencyBuilder, spanned::Spanned, *, -}; - -fn main() -> ui_test::color_eyre::Result<()> { - for rustfix in [RustfixMode::MachineApplicable, RustfixMode::Everything] { - let path = "../../../target"; - - let root_dir = match rustfix { - RustfixMode::Everything => "tests/actual_tests_bless_yolo", - RustfixMode::MachineApplicable { .. } => "tests/actual_tests_bless", - _ => unreachable!(), - }; - - let mut config = Config { - output_conflict_handling: if std::env::var_os("BLESS").is_some() { - ui_test::bless_output_files - } else { - ui_test::error_on_output_conflict - }, - bless_command: Some("cargo test".to_string()), - ..Config::rustc(root_dir) - }; - config.comment_defaults.base().exit_status = match rustfix { - RustfixMode::Everything => None.into(), - RustfixMode::MachineApplicable { .. } => Spanned::dummy(1).into(), - _ => unreachable!(), - }; - config - .comment_defaults - .base() - .set_custom("rustfix", rustfix); - - config - .comment_defaults - .base() - .set_custom("dependencies", DependencyBuilder::default()); - - // hide binaries generated for successfully passing tests - let tmp_dir = tempfile::tempdir_in(path)?; - let tmp_dir = tmp_dir.path(); - config.out_dir = tmp_dir.into(); - config.path_stderr_filter(tmp_dir, "$TMP"); - - config.stderr_filter("in ([0-9]m )?[0-9\\.]+s", ""); - config.stdout_filter("in ([0-9]m )?[0-9\\.]+s", ""); - config.stderr_filter(r"[^ ]*/\.?cargo/registry/.*/", "$$CARGO_REGISTRY"); - config.path_stderr_filter(&std::path::Path::new(path), "$DIR"); - - // This is part of a test: we want to make sure the base filters are run first - config.stderr_filter("normalization_override", "NORMALIZATION_OVERRIDE"); - - let _ = run_tests_generic( - vec![config], - default_file_filter, - default_per_file_config, - // Avoid github actions, as these would end up showing up in `Cargo.stderr` - status_emitter::Text::verbose(), - ); - } - Ok(()) -} diff --git a/tests/integrations/basic-fail/tests/ui_tests_diff_only.rs b/tests/integrations/basic-fail/tests/ui_tests_diff_only.rs deleted file mode 100644 index 022eb3f2..00000000 --- a/tests/integrations/basic-fail/tests/ui_tests_diff_only.rs +++ /dev/null @@ -1,18 +0,0 @@ -use ui_test::*; - -fn main() -> ui_test::color_eyre::Result<()> { - let config = Config { - // Never bless integrations-fail tests, we want to see stderr mismatches - output_conflict_handling: ui_test::error_on_output_conflict, - bless_command: Some("DO NOT BLESS. These are meant to fail".to_string()), - ..Config::rustc("tests/actual_tests") - }; - - run_tests_generic( - vec![config], - default_file_filter, - default_per_file_config, - // Avoid github actions, as these would end up showing up in `Cargo.stderr` - status_emitter::Text::diff(), - ) -} diff --git a/tests/integrations/basic-fail/tests/ui_tests_invalid_program.rs b/tests/integrations/basic-fail/tests/ui_tests_invalid_program.rs deleted file mode 100644 index d0aac471..00000000 --- a/tests/integrations/basic-fail/tests/ui_tests_invalid_program.rs +++ /dev/null @@ -1,19 +0,0 @@ -use ui_test::*; - -fn main() -> ui_test::color_eyre::Result<()> { - let config = Config { - program: CommandBuilder::cmd("invalid_foobarlaksdfalsdfj"), - // Never bless integrations-fail tests, we want to see stderr mismatches - output_conflict_handling: ui_test::error_on_output_conflict, - bless_command: Some("DO NOT BLESS. These are meant to fail".to_string()), - ..Config::rustc("tests/actual_tests") - }; - - run_tests_generic( - vec![config], - default_file_filter, - default_per_file_config, - // Avoid github actions, as these would end up showing up in `Cargo.stderr` - status_emitter::Text::verbose(), - ) -} diff --git a/tests/integrations/basic-fail/tests/ui_tests_invalid_program2.rs b/tests/integrations/basic-fail/tests/ui_tests_invalid_program2.rs deleted file mode 100644 index e3d072e0..00000000 --- a/tests/integrations/basic-fail/tests/ui_tests_invalid_program2.rs +++ /dev/null @@ -1,20 +0,0 @@ -use ui_test::*; - -fn main() -> ui_test::color_eyre::Result<()> { - let config = Config { - program: CommandBuilder::cmd("invalid_foobarlaksdfalsdfj"), - // Never bless integrations-fail tests, we want to see stderr mismatches - output_conflict_handling: ui_test::error_on_output_conflict, - bless_command: Some("DO NOT BLESS. These are meant to fail".to_string()), - host: Some("foo".into()), - ..Config::rustc("tests/actual_tests") - }; - - run_tests_generic( - vec![config], - default_file_filter, - default_per_file_config, - // Avoid github actions, as these would end up showing up in `Cargo.stderr` - status_emitter::Text::verbose(), - ) -} diff --git a/tests/integrations/cargo-run/Cargo.lock b/tests/integrations/cargo-run/Cargo.lock deleted file mode 100644 index cacf869f..00000000 --- a/tests/integrations/cargo-run/Cargo.lock +++ /dev/null @@ -1,848 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "annotate-snippets" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5a59f105fb9635e9eebdc1e29d53e764fa5795b9cf899a638a53e61567ef61" -dependencies = [ - "anstyle", - "unicode-width", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anyhow" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "basic_bin" -version = "0.1.0" -dependencies = [ - "tempfile", - "ui_test", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bstr" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" -dependencies = [ - "memchr", - "regex-automata 0.4.3", - "serde", -] - -[[package]] -name = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "color-eyre" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" -dependencies = [ - "backtrace", - "color-spantrace", - "eyre", - "indenter", - "once_cell", - "owo-colors 3.5.0", - "tracing-error", -] - -[[package]] -name = "color-spantrace" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" -dependencies = [ - "once_cell", - "owo-colors 3.5.0", - "tracing-core", - "tracing-error", -] - -[[package]] -name = "colored" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "comma" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" - -[[package]] -name = "console" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.45.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "eyre" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "indicatif" -version = "0.17.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "itoa" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "levenshtein" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" - -[[package]] -name = "libc" -version = "0.2.156" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "owo-colors" -version = "4.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" - -[[package]] -name = "pin-project-lite" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" - -[[package]] -name = "portable-atomic" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc55135a600d700580e406b4de0d59cb9ad25e344a3a091a97ded2622ec4ec6" - -[[package]] -name = "prettydiff" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac17546d82912e64874e3d5b40681ce32eac4e5834344f51efcf689ff1550a65" -dependencies = [ - "owo-colors 4.2.3", -] - -[[package]] -name = "proc-macro2" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" -dependencies = [ - "regex-automata 0.3.2", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" -dependencies = [ - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" - -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustfix" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4" -dependencies = [ - "serde", - "serde_json", - "thiserror", - "tracing", -] - -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "ryu" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "spanned" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8e76fd7aeee255ddaa885b9de506484b21cbd458ae9d04d1b24851e82ee58a" -dependencies = [ - "anyhow", - "bstr", - "color-eyre", -] - -[[package]] -name = "syn" -version = "2.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" -dependencies = [ - "autocfg", - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" -dependencies = [ - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core", -] - -[[package]] -name = "ui_test" -version = "0.30.3" -dependencies = [ - "annotate-snippets", - "anyhow", - "bstr", - "cargo-platform", - "cargo_metadata", - "color-eyre", - "colored", - "comma", - "crossbeam-channel", - "indicatif", - "levenshtein", - "prettydiff", - "regex", - "rustc_version", - "rustfix", - "serde", - "serde_json", - "spanned", -] - -[[package]] -name = "unicode-ident" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.1", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/tests/integrations/cargo-run/Cargo.stdout b/tests/integrations/cargo-run/Cargo.stdout deleted file mode 100644 index d8030038..00000000 --- a/tests/integrations/cargo-run/Cargo.stdout +++ /dev/null @@ -1,12 +0,0 @@ - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished - -tests/actual_tests/empty_no_stdin.rs ... ok -tests/actual_tests/matching_stdin.rs ... ok -tests/actual_tests/mismatching_stdin.rs ... ok -tests/actual_tests/no_stdin.rs ... ok - -test result: ok. 4 passed - diff --git a/tests/integrations/cargo-run/Cargo.toml b/tests/integrations/cargo-run/Cargo.toml deleted file mode 100644 index 7474d9c4..00000000 --- a/tests/integrations/cargo-run/Cargo.toml +++ /dev/null @@ -1,14 +0,0 @@ -[package] -name = "basic_bin" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dev-dependencies] -ui_test = { path = "../../.."} -tempfile = "3.3.0" - -[[test]] -name = "ui_tests" -harness = false diff --git a/tests/integrations/cargo-run/src/main.rs b/tests/integrations/cargo-run/src/main.rs deleted file mode 100644 index 7d4a5aa2..00000000 --- a/tests/integrations/cargo-run/src/main.rs +++ /dev/null @@ -1,13 +0,0 @@ -fn main() { - let arg = std::env::args().nth(1).unwrap(); - let input = std::fs::read_to_string(arg).unwrap(); - let mut b = std::io::stdin().lines(); - for (line, a ) in input.lines().enumerate() { - let b = b.next().expect(&format!(".stdin file is missing line {}", line + 1)).unwrap(); - assert_eq!(a, b); - } - for b in b { - panic!("{}", b.unwrap()); - } - panic!("done"); -} diff --git a/tests/integrations/cargo-run/tests/actual_tests/empty_no_stdin.rs b/tests/integrations/cargo-run/tests/actual_tests/empty_no_stdin.rs deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/integrations/cargo-run/tests/actual_tests/empty_no_stdin.stderr b/tests/integrations/cargo-run/tests/actual_tests/empty_no_stdin.stderr deleted file mode 100644 index 692519fe..00000000 --- a/tests/integrations/cargo-run/tests/actual_tests/empty_no_stdin.stderr +++ /dev/null @@ -1,3 +0,0 @@ -thread 'main' panicked at src/main.rs:12:5: -done -note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.rs b/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.rs deleted file mode 100644 index 5f5521fa..00000000 --- a/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.rs +++ /dev/null @@ -1,2 +0,0 @@ -abc -def diff --git a/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stderr b/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stderr deleted file mode 100644 index 692519fe..00000000 --- a/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stderr +++ /dev/null @@ -1,3 +0,0 @@ -thread 'main' panicked at src/main.rs:12:5: -done -note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stdin b/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stdin deleted file mode 100644 index 5f5521fa..00000000 --- a/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stdin +++ /dev/null @@ -1,2 +0,0 @@ -abc -def diff --git a/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.rs b/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.rs deleted file mode 100644 index 0bf4a5ab..00000000 --- a/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.rs +++ /dev/null @@ -1,2 +0,0 @@ -cake -lie diff --git a/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stderr b/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stderr deleted file mode 100644 index 3e8e2627..00000000 --- a/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stderr +++ /dev/null @@ -1,5 +0,0 @@ -thread 'main' panicked at src/main.rs:7:9: -assertion `left == right` failed - left: "cake" - right: "asdfasdf" -note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stdin b/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stdin deleted file mode 100644 index f13588b9..00000000 --- a/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stdin +++ /dev/null @@ -1 +0,0 @@ -asdfasdf diff --git a/tests/integrations/cargo-run/tests/actual_tests/no_stdin.rs b/tests/integrations/cargo-run/tests/actual_tests/no_stdin.rs deleted file mode 100644 index cba17e97..00000000 --- a/tests/integrations/cargo-run/tests/actual_tests/no_stdin.rs +++ /dev/null @@ -1,2 +0,0 @@ -asdf -uiop diff --git a/tests/integrations/cargo-run/tests/actual_tests/no_stdin.stderr b/tests/integrations/cargo-run/tests/actual_tests/no_stdin.stderr deleted file mode 100644 index a6617e31..00000000 --- a/tests/integrations/cargo-run/tests/actual_tests/no_stdin.stderr +++ /dev/null @@ -1,3 +0,0 @@ -thread 'main' panicked at src/main.rs:6:26: -.stdin file is missing line 1 -note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/cargo-run/tests/ui_tests.rs b/tests/integrations/cargo-run/tests/ui_tests.rs deleted file mode 100644 index 4efd0ec2..00000000 --- a/tests/integrations/cargo-run/tests/ui_tests.rs +++ /dev/null @@ -1,26 +0,0 @@ -use ui_test::{spanned::Spanned, *}; - -fn main() -> ui_test::color_eyre::Result<()> { - let mut config = Config { - output_conflict_handling: if std::env::var_os("BLESS").is_some() { - ui_test::bless_output_files - } else { - ui_test::error_on_output_conflict - }, - bless_command: Some("cargo test".to_string()), - ..Config::cargo("tests/actual_tests") - }; - config.comment_defaults.base().exit_status = Spanned::dummy(101).into(); - config.comment_defaults.base().require_annotations = Spanned::dummy(false).into(); - - config.program.args = vec!["run".into(), "--quiet".into()]; - config.program.input_file_flag = Some("--".into()); - - run_tests_generic( - vec![config], - default_file_filter, - |_config, _content| {}, - // Avoid github actions, as these would end up showing up in `Cargo.stderr` - status_emitter::Text::verbose(), - ) -} diff --git a/tests/integrations/dep-fail/Cargo.lock b/tests/integrations/dep-fail/Cargo.lock deleted file mode 100644 index 1233a4f4..00000000 --- a/tests/integrations/dep-fail/Cargo.lock +++ /dev/null @@ -1,675 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "annotate-snippets" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5a59f105fb9635e9eebdc1e29d53e764fa5795b9cf899a638a53e61567ef61" -dependencies = [ - "anstyle", - "unicode-width", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anyhow" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" - -[[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cc" -version = "1.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "color-eyre" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" -dependencies = [ - "backtrace", - "color-spantrace", - "eyre", - "indenter", - "once_cell", - "owo-colors 3.5.0", - "tracing-error", -] - -[[package]] -name = "color-spantrace" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" -dependencies = [ - "once_cell", - "owo-colors 3.5.0", - "tracing-core", - "tracing-error", -] - -[[package]] -name = "colored" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "comma" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" - -[[package]] -name = "compile_test" -version = "0.1.0" -dependencies = [ - "ui_test", -] - -[[package]] -name = "console" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "indicatif" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "levenshtein" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" - -[[package]] -name = "libc" -version = "0.2.156" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "owo-colors" -version = "4.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - -[[package]] -name = "prettydiff" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac17546d82912e64874e3d5b40681ce32eac4e5834344f51efcf689ff1550a65" -dependencies = [ - "owo-colors 4.2.3", -] - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustfix" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4" -dependencies = [ - "serde", - "serde_json", - "thiserror", - "tracing", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "semver" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "spanned" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4b0c055fde758f086eb4a6e73410247df8a3837fd606d2caeeaf72aa566d" -dependencies = [ - "anyhow", - "bstr", - "color-eyre", -] - -[[package]] -name = "syn" -version = "2.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" -dependencies = [ - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core", -] - -[[package]] -name = "ui_test" -version = "0.30.3" -dependencies = [ - "annotate-snippets", - "anyhow", - "bstr", - "cargo-platform", - "cargo_metadata", - "color-eyre", - "colored", - "comma", - "crossbeam-channel", - "indicatif", - "levenshtein", - "prettydiff", - "regex", - "rustc_version", - "rustfix", - "serde", - "serde_json", - "spanned", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/tests/integrations/dep-fail/Cargo.stderr b/tests/integrations/dep-fail/Cargo.stderr deleted file mode 100644 index a9e6fbb3..00000000 --- a/tests/integrations/dep-fail/Cargo.stderr +++ /dev/null @@ -1,10 +0,0 @@ -Error: tests failed - -Location: - $DIR/src/lib.rs:LL:CC -error: test failed, to rerun pass `--test ui` - -Caused by: - process didn't exit successfully: `$DIR/target/ui/1/tests/integrations/dep-fail/debug/deps/ui-HASH` (exit status: 1) -error: 1 target failed: - `--test ui` diff --git a/tests/integrations/dep-fail/Cargo.stdout b/tests/integrations/dep-fail/Cargo.stdout deleted file mode 100644 index 370874ff..00000000 --- a/tests/integrations/dep-fail/Cargo.stdout +++ /dev/null @@ -1,40 +0,0 @@ - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished - -Building dependencies ... FAILED -tests/ui/basic_test.rs ... FAILED - -FAILED TEST: tests/ui/basic_test.rs -command: "$CMD" "build" "--color=never" "--quiet" "--jobs" "1" "--target-dir" "$DIR/tests/integrations/dep-fail/target/ui/0" "--manifest-path" "tested_crate/Cargo.toml" "--message-format=json" - -full stderr: -error: could not compile `tested_crate` (lib) due to 2 previous errors - -full stdout: -$DIR/tests/integrations/dep-fail/tested_crate/src/lib.rs -error: this file contains an unclosed delimiter - --> src/lib.rs:LL:CC - | -1 | pub trait A { - | - ^ - | | - | unclosed delimiter - -$DIR/tests/integrations/dep-fail/tested_crate/src/lib.rs -error: aborting due to 1 previous error - -BuildFinished { success: false } - - -FAILURES: - tests/ui/basic_test.rs - -test result: FAIL. 1 failed - - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished - diff --git a/tests/integrations/dep-fail/Cargo.toml b/tests/integrations/dep-fail/Cargo.toml deleted file mode 100644 index 9272ca44..00000000 --- a/tests/integrations/dep-fail/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "compile_test" -version = "0.1.0" -edition = "2021" - -[dev-dependencies] -ui_test = { path = "../../.." } - -[[test]] -name = "ui" -harness = false diff --git a/tests/integrations/dep-fail/src/lib.rs b/tests/integrations/dep-fail/src/lib.rs deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/integrations/dep-fail/tested_crate/Cargo.lock b/tests/integrations/dep-fail/tested_crate/Cargo.lock deleted file mode 100644 index 7cedfe5b..00000000 --- a/tests/integrations/dep-fail/tested_crate/Cargo.lock +++ /dev/null @@ -1,7 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "tested_crate" -version = "0.1.0-dev" diff --git a/tests/integrations/dep-fail/tested_crate/Cargo.toml b/tests/integrations/dep-fail/tested_crate/Cargo.toml deleted file mode 100644 index e9d328ee..00000000 --- a/tests/integrations/dep-fail/tested_crate/Cargo.toml +++ /dev/null @@ -1,8 +0,0 @@ -[package] -name = "tested_crate" -version = "0.1.0-dev" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] \ No newline at end of file diff --git a/tests/integrations/dep-fail/tested_crate/src/lib.rs b/tests/integrations/dep-fail/tested_crate/src/lib.rs deleted file mode 100644 index a929c6be..00000000 --- a/tests/integrations/dep-fail/tested_crate/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -pub trait A { diff --git a/tests/integrations/dep-fail/tests/ui.rs b/tests/integrations/dep-fail/tests/ui.rs deleted file mode 100644 index 447a963a..00000000 --- a/tests/integrations/dep-fail/tests/ui.rs +++ /dev/null @@ -1,29 +0,0 @@ -use ui_test::{ - default_file_filter, default_per_file_config, dependencies::DependencyBuilder, - run_tests_generic, status_emitter::Text, Args, Config, -}; - -fn main() -> ui_test::Result<()> { - let mut config = Config { - output_conflict_handling: ui_test::ignore_output_conflict, - ..Config::rustc("tests/ui") - }; - config.comment_defaults.base().set_custom( - "dependencies", - DependencyBuilder { - crate_manifest_path: "tested_crate/Cargo.toml".into(), - ..DependencyBuilder::default() - }, - ); - - let args = Args::test()?; - - config.with_args(&args); - - run_tests_generic( - [config].into(), - default_file_filter, - default_per_file_config, - Text::verbose(), - ) -} diff --git a/tests/integrations/dep-fail/tests/ui/basic_test.rs b/tests/integrations/dep-fail/tests/ui/basic_test.rs deleted file mode 100644 index cbfb3e82..00000000 --- a/tests/integrations/dep-fail/tests/ui/basic_test.rs +++ /dev/null @@ -1 +0,0 @@ -use tested_crate::A; diff --git a/tests/integrations/ui_test_dep_bug/Cargo.lock b/tests/integrations/ui_test_dep_bug/Cargo.lock deleted file mode 100644 index 88012f8d..00000000 --- a/tests/integrations/ui_test_dep_bug/Cargo.lock +++ /dev/null @@ -1,680 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "annotate-snippets" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5a59f105fb9635e9eebdc1e29d53e764fa5795b9cf899a638a53e61567ef61" -dependencies = [ - "anstyle", - "unicode-width", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anyhow" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" - -[[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cc" -version = "1.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "color-eyre" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" -dependencies = [ - "backtrace", - "color-spantrace", - "eyre", - "indenter", - "once_cell", - "owo-colors 3.5.0", - "tracing-error", -] - -[[package]] -name = "color-spantrace" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" -dependencies = [ - "once_cell", - "owo-colors 3.5.0", - "tracing-core", - "tracing-error", -] - -[[package]] -name = "colored" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "comma" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" - -[[package]] -name = "compile_test" -version = "0.1.0" -dependencies = [ - "tested_crate", - "ui_test", -] - -[[package]] -name = "console" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "indicatif" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "levenshtein" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" - -[[package]] -name = "libc" -version = "0.2.156" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "owo-colors" -version = "4.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - -[[package]] -name = "prettydiff" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac17546d82912e64874e3d5b40681ce32eac4e5834344f51efcf689ff1550a65" -dependencies = [ - "owo-colors 4.2.3", -] - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustfix" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4" -dependencies = [ - "serde", - "serde_json", - "thiserror", - "tracing", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "semver" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "spanned" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4b0c055fde758f086eb4a6e73410247df8a3837fd606d2caeeaf72aa566d" -dependencies = [ - "anyhow", - "bstr", - "color-eyre", -] - -[[package]] -name = "syn" -version = "2.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tested_crate" -version = "0.1.0-dev" - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" -dependencies = [ - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core", -] - -[[package]] -name = "ui_test" -version = "0.30.3" -dependencies = [ - "annotate-snippets", - "anyhow", - "bstr", - "cargo-platform", - "cargo_metadata", - "color-eyre", - "colored", - "comma", - "crossbeam-channel", - "indicatif", - "levenshtein", - "prettydiff", - "regex", - "rustc_version", - "rustfix", - "serde", - "serde_json", - "spanned", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/tests/integrations/ui_test_dep_bug/Cargo.stdout b/tests/integrations/ui_test_dep_bug/Cargo.stdout deleted file mode 100644 index 990abfae..00000000 --- a/tests/integrations/ui_test_dep_bug/Cargo.stdout +++ /dev/null @@ -1,15 +0,0 @@ - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished - -Building dependencies ... ok -tests/ui/basic_test.rs ... ok - -test result: ok. 1 passed - - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished - diff --git a/tests/integrations/ui_test_dep_bug/Cargo.toml b/tests/integrations/ui_test_dep_bug/Cargo.toml deleted file mode 100644 index 44ed7a8b..00000000 --- a/tests/integrations/ui_test_dep_bug/Cargo.toml +++ /dev/null @@ -1,20 +0,0 @@ -[package] -name = "compile_test" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -# This fails -tested_crate = { path = "tested_crate" } - -# This works -#tested_crate = { path = "../tested_crate", version = "0.1.0-dev" } - -[dev-dependencies] -ui_test = { path = "../../.." } - -[[test]] -name = "ui" -harness = false diff --git a/tests/integrations/ui_test_dep_bug/src/lib.rs b/tests/integrations/ui_test_dep_bug/src/lib.rs deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/integrations/ui_test_dep_bug/tested_crate/Cargo.toml b/tests/integrations/ui_test_dep_bug/tested_crate/Cargo.toml deleted file mode 100644 index e9d328ee..00000000 --- a/tests/integrations/ui_test_dep_bug/tested_crate/Cargo.toml +++ /dev/null @@ -1,8 +0,0 @@ -[package] -name = "tested_crate" -version = "0.1.0-dev" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] \ No newline at end of file diff --git a/tests/integrations/ui_test_dep_bug/tested_crate/src/lib.rs b/tests/integrations/ui_test_dep_bug/tested_crate/src/lib.rs deleted file mode 100644 index ecb62fe4..00000000 --- a/tests/integrations/ui_test_dep_bug/tested_crate/src/lib.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub trait A {} -pub trait B: A {} diff --git a/tests/integrations/ui_test_dep_bug/tests/ui.rs b/tests/integrations/ui_test_dep_bug/tests/ui.rs deleted file mode 100644 index 8a304e53..00000000 --- a/tests/integrations/ui_test_dep_bug/tests/ui.rs +++ /dev/null @@ -1,26 +0,0 @@ -use ui_test::{ - default_file_filter, default_per_file_config, dependencies::DependencyBuilder, - run_tests_generic, status_emitter::Text, Args, Config, -}; - -fn main() -> ui_test::Result<()> { - let mut config = Config { - output_conflict_handling: ui_test::ignore_output_conflict, - ..Config::rustc("tests/ui") - }; - config - .comment_defaults - .base() - .set_custom("dependencies", DependencyBuilder::default()); - - let args = Args::test()?; - - config.with_args(&args); - - run_tests_generic( - [config].into(), - default_file_filter, - default_per_file_config, - Text::verbose(), - ) -} diff --git a/tests/integrations/ui_test_dep_bug/tests/ui/basic_test.rs b/tests/integrations/ui_test_dep_bug/tests/ui/basic_test.rs deleted file mode 100644 index 63ffaa88..00000000 --- a/tests/integrations/ui_test_dep_bug/tests/ui/basic_test.rs +++ /dev/null @@ -1,6 +0,0 @@ -use tested_crate::B; - -struct DoesntImplementA; - -impl B for DoesntImplementA {} -//~^ E0277 \ No newline at end of file From b31ba8c9de54a423907ad8565bc2d8892289bf2b Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Sat, 22 Nov 2025 06:29:22 -0500 Subject: [PATCH 2/4] WIP --- src/config.rs | 16 +++ src/custom_flags/rustfix.rs | 20 ++++ src/per_test_config.rs | 3 + tests/integrations/basic/Cargo.stderr | 113 ++++++++++++++++++ tests/integrations/basic/Cargo.stdout | 107 ++++++++++++++++- .../actual_tests/rustfix-mode_disabled.fixed | 0 .../actual_tests/rustfix-mode_disabled.rs | 10 ++ .../actual_tests/rustfix-mode_disabled.stderr | 16 +++ .../rustfix-mode_everything.fixed | 0 .../actual_tests/rustfix-mode_everything.rs | 10 ++ .../rustfix-mode_everything.stderr | 16 +++ .../actual_tests/rustfix-mode_invalid.fixed | 0 .../actual_tests/rustfix-mode_invalid.rs | 10 ++ .../actual_tests/rustfix-mode_invalid.stderr | 16 +++ .../rustfix-mode_machine-applicable.fixed | 0 .../rustfix-mode_machine-applicable.rs | 10 ++ .../rustfix-mode_machine-applicable.stderr | 16 +++ 17 files changed, 361 insertions(+), 2 deletions(-) create mode 100644 tests/integrations/basic/Cargo.stderr create mode 100644 tests/integrations/basic/tests/actual_tests/rustfix-mode_disabled.fixed create mode 100644 tests/integrations/basic/tests/actual_tests/rustfix-mode_disabled.rs create mode 100644 tests/integrations/basic/tests/actual_tests/rustfix-mode_disabled.stderr create mode 100644 tests/integrations/basic/tests/actual_tests/rustfix-mode_everything.fixed create mode 100644 tests/integrations/basic/tests/actual_tests/rustfix-mode_everything.rs create mode 100644 tests/integrations/basic/tests/actual_tests/rustfix-mode_everything.stderr create mode 100644 tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.fixed create mode 100644 tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.rs create mode 100644 tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.stderr create mode 100644 tests/integrations/basic/tests/actual_tests/rustfix-mode_machine-applicable.fixed create mode 100644 tests/integrations/basic/tests/actual_tests/rustfix-mode_machine-applicable.rs create mode 100644 tests/integrations/basic/tests/actual_tests/rustfix-mode_machine-applicable.stderr diff --git a/src/config.rs b/src/config.rs index 73e78f33..e12f303d 100644 --- a/src/config.rs +++ b/src/config.rs @@ -196,10 +196,26 @@ impl Config { config .custom_comments .insert("no-rustfix", |parser, _args, span| { + dbg!(&span); // args are ignored (can be used as comment) parser.set_custom_once("no-rustfix", (), span); }); + config + .custom_comments + .insert("rustfix-mode", |parser, args, span| { + dbg!(&span); + eprintln!("{}", std::backtrace::Backtrace::force_capture()); + match args.content.parse::() { + Ok(mode) => { + parser.set_custom_once("rustfix-mode", mode, span); + } + Err(error) => { + parser.error(args.span(), error.to_string()); + } + } + }); + config .custom_comments .insert("edition", |parser, args, _span| { diff --git a/src/custom_flags/rustfix.rs b/src/custom_flags/rustfix.rs index 5d72b495..d50e9e37 100644 --- a/src/custom_flags/rustfix.rs +++ b/src/custom_flags/rustfix.rs @@ -8,12 +8,14 @@ use crate::{ per_test_config::{Comments, Revisioned, TestConfig}, Error, Errored, TestOk, }; +use anyhow::bail; use rustfix::{CodeFix, Filter, Suggestion}; use spanned::{Span, Spanned}; use std::{ collections::HashSet, path::{Path, PathBuf}, process::Output, + str::FromStr, sync::Arc, }; @@ -47,6 +49,7 @@ impl Flag for RustfixMode { output: &Output, build_manager: &BuildManager, ) -> Result<(), Errored> { + dbg!(*self); let global_rustfix = match config.exit_status()? { Some(Spanned { content: 101 | 0, .. @@ -56,6 +59,7 @@ impl Flag for RustfixMode { let output = output.clone(); let no_run_rustfix = config.find_one_custom("no-rustfix")?; let fixes = if no_run_rustfix.is_none() && global_rustfix.enabled() { + dbg!(global_rustfix); fix(&output.stderr, config.status.path(), global_rustfix).map_err(|err| Errored { command: format!("rustfix {}", display(config.status.path())), errors: vec![Error::Rustfix(err)], @@ -99,11 +103,25 @@ impl Flag for RustfixMode { } } +impl FromStr for RustfixMode { + type Err = anyhow::Error; + fn from_str(s: &str) -> Result { + match s { + "disabled" => Ok(RustfixMode::Disabled), + "everything" => Ok(RustfixMode::Everything), + "machine-applicable" => Ok(RustfixMode::MachineApplicable), + _ => bail!("unknown `RustfixMode`: {s}"), + } + } +} + fn fix(stderr: &[u8], path: &Path, mode: RustfixMode) -> anyhow::Result> { + dbg!(path); let suggestions = std::str::from_utf8(stderr) .unwrap() .lines() .filter_map(|line| { + // dbg!(line); if !line.starts_with('{') { return None; } @@ -121,6 +139,8 @@ fn fix(stderr: &[u8], path: &Path, mode: RustfixMode) -> anyhow::Result>(); + // dbg!(mode); + // dbg!(&suggestions); if suggestions.is_empty() { return Ok(Vec::new()); } diff --git a/src/per_test_config.rs b/src/per_test_config.rs index e67f6ea3..1b9e29a7 100644 --- a/src/per_test_config.rs +++ b/src/per_test_config.rs @@ -371,6 +371,7 @@ impl TestConfig { } pub(crate) fn run_test(&mut self, build_manager: &Arc) -> TestResult { + dbg!(); self.patch_out_dir(); let mut cmd = self.build_command(build_manager)?; @@ -384,7 +385,9 @@ impl TestConfig { let output = self.check_test_result(&cmd, output)?; for rev in self.comments() { + dbg!(); // rev); for custom in rev.custom.values() { + dbg!(&custom.content); for flag in &custom.content { flag.post_test_action(self, &output, build_manager)?; } diff --git a/tests/integrations/basic/Cargo.stderr b/tests/integrations/basic/Cargo.stderr new file mode 100644 index 00000000..19b7ff27 --- /dev/null +++ b/tests/integrations/basic/Cargo.stderr @@ -0,0 +1,113 @@ +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/aux_derive.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/aux_proc_macro.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/error_above.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/foomp-rustfix.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/foomp.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/joined_above.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/joined_below.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/joined_mixed.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/mac_span.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/match_diagnostic_code.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/rustfix-multiple.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/windows_paths.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/subdir/aux_proc_macro.rs" +Error: tests failed + +Location: + $DIR/src/lib.rs:LL:CC +error: test failed, to rerun pass `--test json` + +Caused by: + process didn't exit successfully: `$DIR/target/ui/0/tests/integrations/basic/debug/deps/json-HASH` (exit status: 1) +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/aux_derive.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/aux_proc_macro.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/error_above.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/foomp-rustfix.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/foomp.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/joined_above.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/joined_below.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/joined_mixed.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/mac_span.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/match_diagnostic_code.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/rustfix-multiple.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/windows_paths.rs" +[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything +[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/subdir/aux_proc_macro.rs" +Error: tests failed + +Location: + $DIR/src/lib.rs:LL:CC +error: test failed, to rerun pass `--test ui_tests` + +Caused by: + process didn't exit successfully: `$DIR/target/ui/0/tests/integrations/basic/debug/deps/ui_tests-HASH` (exit status: 1) +error: 2 targets failed: + `--test json` + `--test ui_tests` diff --git a/tests/integrations/basic/Cargo.stdout b/tests/integrations/basic/Cargo.stdout index b9513e5e..5ff9209b 100644 --- a/tests/integrations/basic/Cargo.stdout +++ b/tests/integrations/basic/Cargo.stdout @@ -19,6 +19,9 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini { "type": "test", "event": "started", "name": "tests/actual_tests/mac_span.rs () - tests/actual_tests/mac_span.rs" } { "type": "test", "event": "started", "name": "tests/actual_tests/match_diagnostic_code.rs () - tests/actual_tests/match_diagnostic_code.rs" } { "type": "test", "event": "started", "name": "tests/actual_tests/no_rustfix.rs () - tests/actual_tests/no_rustfix.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/rustfix-mode-disabled.rs () - tests/actual_tests/rustfix-mode-disabled.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/rustfix-mode-everything.rs () - tests/actual_tests/rustfix-mode-everything.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/rustfix-mode-machine-applicable.rs () - tests/actual_tests/rustfix-mode-machine-applicable.rs" } { "type": "test", "event": "started", "name": "tests/actual_tests/rustfix-multiple.rs () - tests/actual_tests/rustfix-multiple.rs" } { "type": "test", "event": "started", "name": "tests/actual_tests/stdin.rs () - tests/actual_tests/stdin.rs" } { "type": "test", "event": "started", "name": "tests/actual_tests/unicode.rs () - tests/actual_tests/unicode.rs" } @@ -53,6 +56,9 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini { "type": "test", "event": "ok", "name": "tests/actual_tests/match_diagnostic_code.rs () - tests/actual_tests/match_diagnostic_code.rs" } { "type": "test", "event": "ok", "name": "tests/actual_tests/match_diagnostic_code.rs () - tests/actual_tests/match_diagnostic_code.fixed" } { "type": "test", "event": "ok", "name": "tests/actual_tests/no_rustfix.rs () - tests/actual_tests/no_rustfix.rs" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode-disabled.rs () - tests/actual_tests/rustfix-mode-disabled.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustfix-mode-disabled.rs\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta\" \"--extern\" \"serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustfix-mode-disabled.rs:4:12\n |\n4 | pub static x: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `X`\n |\n = note: `#[warn(non_upper_case_globals)]` on by default\n\nwarning: static variable `y` should have an upper case name\n --> tests/actual_tests/rustfix-mode-disabled.rs:7:16\n |\n7 | pub static y: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `Y`\n\nwarning: 2 warnings emitted\n\n> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode-everything.rs () - tests/actual_tests/rustfix-mode-everything.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustfix-mode-everything.rs\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta\" \"--extern\" \"serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustfix-mode-everything.rs:4:12\n |\n4 | pub static x: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `X`\n |\n = note: `#[warn(non_upper_case_globals)]` on by default\n\nwarning: static variable `y` should have an upper case name\n --> tests/actual_tests/rustfix-mode-everything.rs:7:16\n |\n7 | pub static y: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `Y`\n\nwarning: 2 warnings emitted\n\n> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode-machine-applicable.rs () - tests/actual_tests/rustfix-mode-machine-applicable.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustfix-mode-machine-applicable.rs\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta\" \"--extern\" \"serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustfix-mode-machine-applicable.rs:4:12\n |\n4 | pub static x: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `X`\n |\n = note: `#[warn(non_upper_case_globals)]` on by default\n\nwarning: static variable `y` should have an upper case name\n --> tests/actual_tests/rustfix-mode-machine-applicable.rs:7:16\n |\n7 | pub static y: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `Y`\n\nwarning: 2 warnings emitted\n\n> stderr: <>" } { "type": "test", "event": "ok", "name": "tests/actual_tests/rustfix-multiple.rs () - tests/actual_tests/rustfix-multiple.rs" } { "type": "test", "event": "ok", "name": "tests/actual_tests/rustfix-multiple.rs () - tests/actual_tests/rustfix-multiple.1.fixed" } { "type": "test", "event": "ok", "name": "tests/actual_tests/rustfix-multiple.rs () - tests/actual_tests/rustfix-multiple.2.fixed" } @@ -61,7 +67,7 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini { "type": "test", "event": "ok", "name": "tests/actual_tests/unicode.rs () - tests/actual_tests/unicode.rs" } { "type": "test", "event": "ok", "name": "tests/actual_tests/windows_paths.rs () - tests/actual_tests/windows_paths.rs" } { "type": "test", "event": "ok", "name": "tests/actual_tests/subdir/aux_proc_macro.rs () - tests/actual_tests/subdir/aux_proc_macro.rs" } -{ "type": "suite", "event": "ok", "passed": 33, "failed": 0, "ignored": 0, "measured": 0, "filtered_out": 0 } +{ "type": "suite", "event": "failed", "passed": 33, "failed": 3, "ignored": 0, "measured": 0, "filtered_out": 0 } running 3 tests ... @@ -96,6 +102,9 @@ tests/actual_tests/mac_span.fixed ... ok tests/actual_tests/match_diagnostic_code.rs ... ok tests/actual_tests/match_diagnostic_code.fixed ... ok tests/actual_tests/no_rustfix.rs ... ok +tests/actual_tests/rustfix-mode-disabled.rs ... FAILED +tests/actual_tests/rustfix-mode-everything.rs ... FAILED +tests/actual_tests/rustfix-mode-machine-applicable.rs ... FAILED tests/actual_tests/rustfix-multiple.rs ... ok tests/actual_tests/rustfix-multiple.1.fixed ... ok tests/actual_tests/rustfix-multiple.2.fixed ... ok @@ -105,7 +114,101 @@ tests/actual_tests/unicode.rs ... ok tests/actual_tests/windows_paths.rs ... ok tests/actual_tests/subdir/aux_proc_macro.rs ... ok -test result: ok. 33 passed +FAILED TEST: tests/actual_tests/rustfix-mode-disabled.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustfix-mode-disabled.rs" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta" "--extern" "serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/0/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: test got exit status: 0, but expected 1 + = note: compilation succeeded, but was expected to fail + +error: expected error patterns, but found none + +full stderr: +warning: static variable `x` should have an upper case name + --> tests/actual_tests/rustfix-mode-disabled.rs:4:12 + | +4 | pub static x: u32 = 0; + | ^ help: convert the identifier to upper case (notice the capitalization): `X` + | + = note: `#[warn(non_upper_case_globals)]` on by default + +warning: static variable `y` should have an upper case name + --> tests/actual_tests/rustfix-mode-disabled.rs:7:16 + | +7 | pub static y: u32 = 0; + | ^ help: convert the identifier to upper case (notice the capitalization): `Y` + +warning: 2 warnings emitted + + +full stdout: + + + +FAILED TEST: tests/actual_tests/rustfix-mode-everything.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustfix-mode-everything.rs" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta" "--extern" "serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/0/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: test got exit status: 0, but expected 1 + = note: compilation succeeded, but was expected to fail + +error: expected error patterns, but found none + +full stderr: +warning: static variable `x` should have an upper case name + --> tests/actual_tests/rustfix-mode-everything.rs:4:12 + | +4 | pub static x: u32 = 0; + | ^ help: convert the identifier to upper case (notice the capitalization): `X` + | + = note: `#[warn(non_upper_case_globals)]` on by default + +warning: static variable `y` should have an upper case name + --> tests/actual_tests/rustfix-mode-everything.rs:7:16 + | +7 | pub static y: u32 = 0; + | ^ help: convert the identifier to upper case (notice the capitalization): `Y` + +warning: 2 warnings emitted + + +full stdout: + + + +FAILED TEST: tests/actual_tests/rustfix-mode-machine-applicable.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustfix-mode-machine-applicable.rs" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta" "--extern" "serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/0/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: test got exit status: 0, but expected 1 + = note: compilation succeeded, but was expected to fail + +error: expected error patterns, but found none + +full stderr: +warning: static variable `x` should have an upper case name + --> tests/actual_tests/rustfix-mode-machine-applicable.rs:4:12 + | +4 | pub static x: u32 = 0; + | ^ help: convert the identifier to upper case (notice the capitalization): `X` + | + = note: `#[warn(non_upper_case_globals)]` on by default + +warning: static variable `y` should have an upper case name + --> tests/actual_tests/rustfix-mode-machine-applicable.rs:7:16 + | +7 | pub static y: u32 = 0; + | ^ help: convert the identifier to upper case (notice the capitalization): `Y` + +warning: 2 warnings emitted + + +full stdout: + + +FAILURES: + tests/actual_tests/rustfix-mode-disabled.rs + tests/actual_tests/rustfix-mode-everything.rs + tests/actual_tests/rustfix-mode-machine-applicable.rs + +test result: FAIL. 3 failed; 33 passed running 0 tests diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_disabled.fixed b/tests/integrations/basic/tests/actual_tests/rustfix-mode_disabled.fixed new file mode 100644 index 00000000..e69de29b diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_disabled.rs b/tests/integrations/basic/tests/actual_tests/rustfix-mode_disabled.rs new file mode 100644 index 00000000..e86a897b --- /dev/null +++ b/tests/integrations/basic/tests/actual_tests/rustfix-mode_disabled.rs @@ -0,0 +1,10 @@ +//@rustfix-mode: disabled +#![allow(dead_code)] + +pub static x: u32 = 0; + +mod internal { + pub static y: u32 = 0; +} + +fn main() {} diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_disabled.stderr b/tests/integrations/basic/tests/actual_tests/rustfix-mode_disabled.stderr new file mode 100644 index 00000000..032fe020 --- /dev/null +++ b/tests/integrations/basic/tests/actual_tests/rustfix-mode_disabled.stderr @@ -0,0 +1,16 @@ +warning: static variable `x` should have an upper case name + --> tests/actual_tests/rustfix-mode_disabled.rs:4:12 + | +4 | pub static x: u32 = 0; + | ^ help: convert the identifier to upper case (notice the capitalization): `X` + | + = note: `#[warn(non_upper_case_globals)]` on by default + +warning: static variable `y` should have an upper case name + --> tests/actual_tests/rustfix-mode_disabled.rs:7:16 + | +7 | pub static y: u32 = 0; + | ^ help: convert the identifier to upper case (notice the capitalization): `Y` + +warning: 2 warnings emitted + diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_everything.fixed b/tests/integrations/basic/tests/actual_tests/rustfix-mode_everything.fixed new file mode 100644 index 00000000..e69de29b diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_everything.rs b/tests/integrations/basic/tests/actual_tests/rustfix-mode_everything.rs new file mode 100644 index 00000000..36c1b6d0 --- /dev/null +++ b/tests/integrations/basic/tests/actual_tests/rustfix-mode_everything.rs @@ -0,0 +1,10 @@ +//@rustfix-mode: everything +#![allow(dead_code)] + +pub static x: u32 = 0; + +mod internal { + pub static y: u32 = 0; +} + +fn main() {} diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_everything.stderr b/tests/integrations/basic/tests/actual_tests/rustfix-mode_everything.stderr new file mode 100644 index 00000000..16d80f18 --- /dev/null +++ b/tests/integrations/basic/tests/actual_tests/rustfix-mode_everything.stderr @@ -0,0 +1,16 @@ +warning: static variable `x` should have an upper case name + --> tests/actual_tests/rustfix-mode_everything.rs:4:12 + | +4 | pub static x: u32 = 0; + | ^ help: convert the identifier to upper case (notice the capitalization): `X` + | + = note: `#[warn(non_upper_case_globals)]` on by default + +warning: static variable `y` should have an upper case name + --> tests/actual_tests/rustfix-mode_everything.rs:7:16 + | +7 | pub static y: u32 = 0; + | ^ help: convert the identifier to upper case (notice the capitalization): `Y` + +warning: 2 warnings emitted + diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.fixed b/tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.fixed new file mode 100644 index 00000000..e69de29b diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.rs b/tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.rs new file mode 100644 index 00000000..241e5b3d --- /dev/null +++ b/tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.rs @@ -0,0 +1,10 @@ +//@rustfix-mode: invalid +#![allow(dead_code)] + +pub static x: u32 = 0; + +mod internal { + pub static y: u32 = 0; +} + +fn main() {} diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.stderr b/tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.stderr new file mode 100644 index 00000000..623ebc65 --- /dev/null +++ b/tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.stderr @@ -0,0 +1,16 @@ +warning: static variable `x` should have an upper case name + --> tests/actual_tests/rustfix-mode-disabled.rs:4:12 + | +4 | pub static x: u32 = 0; + | ^ help: convert the identifier to upper case (notice the capitalization): `X` + | + = note: `#[warn(non_upper_case_globals)]` on by default + +warning: static variable `y` should have an upper case name + --> tests/actual_tests/rustfix-mode-disabled.rs:7:16 + | +7 | pub static y: u32 = 0; + | ^ help: convert the identifier to upper case (notice the capitalization): `Y` + +warning: 2 warnings emitted + diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_machine-applicable.fixed b/tests/integrations/basic/tests/actual_tests/rustfix-mode_machine-applicable.fixed new file mode 100644 index 00000000..e69de29b diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_machine-applicable.rs b/tests/integrations/basic/tests/actual_tests/rustfix-mode_machine-applicable.rs new file mode 100644 index 00000000..984b8e61 --- /dev/null +++ b/tests/integrations/basic/tests/actual_tests/rustfix-mode_machine-applicable.rs @@ -0,0 +1,10 @@ +//@rustfix-mode: machine-applicable +#![allow(dead_code)] + +pub static x: u32 = 0; + +mod internal { + pub static y: u32 = 0; +} + +fn main() {} diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_machine-applicable.stderr b/tests/integrations/basic/tests/actual_tests/rustfix-mode_machine-applicable.stderr new file mode 100644 index 00000000..4a618d94 --- /dev/null +++ b/tests/integrations/basic/tests/actual_tests/rustfix-mode_machine-applicable.stderr @@ -0,0 +1,16 @@ +warning: static variable `x` should have an upper case name + --> tests/actual_tests/rustfix-mode_machine-applicable.rs:4:12 + | +4 | pub static x: u32 = 0; + | ^ help: convert the identifier to upper case (notice the capitalization): `X` + | + = note: `#[warn(non_upper_case_globals)]` on by default + +warning: static variable `y` should have an upper case name + --> tests/actual_tests/rustfix-mode_machine-applicable.rs:7:16 + | +7 | pub static y: u32 = 0; + | ^ help: convert the identifier to upper case (notice the capitalization): `Y` + +warning: 2 warnings emitted + From 638d5a2d298c5486de9fb71ca19eb88a4768cd87 Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Fri, 28 Nov 2025 19:55:53 -0500 Subject: [PATCH 3/4] Update branch --- src/config.rs | 9 +- src/custom_flags.rs | 2 +- .../{rustfix.rs => rustfix_mode.rs} | 6 - src/per_test_config.rs | 3 - tests/integrations/basic-bin/Cargo.lock | 848 ++++++ tests/integrations/basic-bin/Cargo.stdout | 10 + tests/integrations/basic-bin/Cargo.toml | 14 + tests/integrations/basic-bin/src/main.rs | 1 + .../basic-bin/tests/actual_tests/foomp.rs | 8 + .../basic-bin/tests/actual_tests/foomp.stderr | 9 + .../integrations/basic-bin/tests/ui_tests.rs | 38 + tests/integrations/basic-fail-mode/Cargo.lock | 848 ++++++ .../integrations/basic-fail-mode/Cargo.stdout | 20 + tests/integrations/basic-fail-mode/Cargo.toml | 18 + tests/integrations/basic-fail-mode/src/lib.rs | 3 + .../tests/actual_tests/foomp.rs | 6 + .../tests/actual_tests/foomp.stderr | 17 + .../basic-fail-mode/tests/run_file.rs | 71 + .../tests/run_file/run_file.rs | 1 + .../tests/run_file/run_file_with_deps.rs | 5 + .../basic-fail-mode/tests/ui_tests.rs | 30 + tests/integrations/basic-fail/Cargo.lock | 848 ++++++ tests/integrations/basic-fail/Cargo.stderr | 48 + tests/integrations/basic-fail/Cargo.stdout | 2279 +++++++++++++++++ tests/integrations/basic-fail/Cargo.toml | 36 + tests/integrations/basic-fail/src/lib.rs | 3 + .../tests/actual_tests/bad_pattern.rs | 6 + .../tests/actual_tests/bad_pattern.stderr | 17 + .../actual_tests/bad_pattern_multiple.rs | 8 + .../actual_tests/bad_pattern_multiple.stderr | 31 + .../tests/actual_tests/executable.rs | 7 + .../tests/actual_tests/executable.run.stdout | 1 + .../actual_tests/executable_compile_err.rs | 4 + .../tests/actual_tests/exit_code_fail.rs | 1 + .../basic-fail/tests/actual_tests/filters.rs | 3 + .../basic-fail/tests/actual_tests/foomp.rs | 6 + .../tests/actual_tests/foomp.stderr | 15 + .../tests/actual_tests/foomp2.fixed | 2 + .../basic-fail/tests/actual_tests/foomp2.rs | 6 + .../tests/actual_tests/foomp2.stderr | 17 + .../tests/actual_tests/ice_annotations.rs | 10 + .../tests/actual_tests/inline_chain.rs | 6 + .../tests/actual_tests/joined_wrong_order.rs | 7 + .../tests/actual_tests/lone_joined_pattern.rs | 7 + .../actual_tests/pattern_too_many_arrow.rs | 6 + .../pattern_too_many_arrow_above.rs | 6 + .../tests/actual_tests/rustc_ice.rs | 10 + .../tests/actual_tests/rustc_ice.stderr | 15 + .../actual_tests/touching_above_below.rs | 8 + .../touching_above_below_chain.rs | 9 + .../tests/actual_tests_bless/abort.rs | 5 + .../actual_tests_bless/aux_build_not_found.rs | 3 + .../aux_proc_macro_misuse.rs | 8 + .../aux_proc_macro_no_main.rs | 7 + .../aux_proc_macro_no_main.stderr | 8 + .../actual_tests_bless/auxiliary/foomp.rs | 1 + .../actual_tests_bless/auxiliary/nested.rs | 5 + .../auxiliary/the_proc_macro.rs | 10 + .../compile_flags_quotes.rs | 3 + .../compiletest-rs-command.rs | 6 + .../actual_tests_bless/edition_override.rs | 9 + .../edition_override.stderr | 12 + .../actual_tests_bless/failing_executable.rs | 5 + .../failing_executable.run.stderr | 5 + .../tests/actual_tests_bless/foomp_aux.rs | 8 + .../tests/actual_tests_bless/foomp_aux.stderr | 17 + .../tests/actual_tests_bless/nested_aux.rs | 8 + .../tests/actual_tests_bless/no_main.rs | 1 + .../actual_tests_bless/no_main_manual.rs | 3 + .../actual_tests_bless/no_main_manual.stderr | 11 + .../tests/actual_tests_bless/no_test.rs | 2 + .../non_top_level_configs.rs | 5 + .../normalization_override.rs | 7 + .../normalization_override.stderr | 9 + .../tests/actual_tests_bless/pass.rs | 3 + .../pass_with_annotation.rs | 4 + .../actual_tests_bless/revised_revision.rs | 13 + .../revisioned_executable.rs | 5 + ...visioned_executable_panic.panic.run.stderr | 3 + .../revisioned_executable_panic.rs | 7 + ...revisioned_executable_panic.run.run.stderr | 3 + .../actual_tests_bless/revisions.bar.stderr | 17 + .../actual_tests_bless/revisions.foo.stderr | 17 + .../tests/actual_tests_bless/revisions.rs | 13 + .../revisions_bad.bar.stderr | 9 + .../revisions_bad.foo.stderr | 17 + .../tests/actual_tests_bless/revisions_bad.rs | 10 + .../actual_tests_bless/revisions_filter.rs | 14 + .../revisions_filter2.bar.stderr | 17 + .../actual_tests_bless/revisions_filter2.rs | 14 + ...visions_multiple_per_annotation.bar.stderr | 17 + ...visions_multiple_per_annotation.foo.stderr | 17 + .../revisions_multiple_per_annotation.rs | 7 + .../revisions_same_everywhere.bar.stderr | 17 + .../revisions_same_everywhere.foo.stderr | 17 + .../revisions_same_everywhere.rs | 7 + .../tests/actual_tests_bless/run_panic.rs | 5 + .../actual_tests_bless/run_panic.run.stderr | 3 + .../rustfix-fail-revisions.a.fixed | 12 + .../rustfix-fail-revisions.a.stderr | 8 + .../rustfix-fail-revisions.b.fixed | 12 + .../rustfix-fail-revisions.b.stderr | 8 + .../rustfix-fail-revisions.rs | 12 + .../actual_tests_bless/rustfix-fail.fixed | 11 + .../tests/actual_tests_bless/rustfix-fail.rs | 11 + .../actual_tests_bless/rustfix-fail.stderr | 8 + .../tests/actual_tests_bless/unicode.rs | 8 + .../tests/actual_tests_bless/unicode.stderr | 18 + .../actual_tests_bless/unknown_revision.rs | 4 + .../actual_tests_bless/unknown_revision2.rs | 6 + .../wrong_diagnostic_code.rs | 9 + .../wrong_diagnostic_code.stderr | 28 + .../revisions_bad.bar.stderr | 9 + .../revisions_bad.foo.stderr | 17 + .../actual_tests_bless_yolo/revisions_bad.rs | 10 + .../rustfix-maybe-incorrect.fixed | 6 + .../rustfix-maybe-incorrect.rs | 6 + .../rustfix-maybe-incorrect.stderr | 12 + .../rustfix-multiple-fail.1.fixed | 8 + .../rustfix-multiple-fail.2.fixed | 8 + .../rustfix-multiple-fail.3.fixed | 8 + .../rustfix-multiple-fail.rs | 8 + .../rustfix-multiple-fail.stderr | 24 + tests/integrations/basic-fail/tests/json.rs | 34 + .../integrations/basic-fail/tests/ui_tests.rs | 35 + .../basic-fail/tests/ui_tests_bless.rs | 62 + .../basic-fail/tests/ui_tests_diff_only.rs | 18 + .../tests/ui_tests_invalid_program.rs | 19 + .../tests/ui_tests_invalid_program2.rs | 20 + tests/integrations/basic/Cargo.stderr | 94 - tests/integrations/basic/Cargo.stdout | 72 +- .../actual_tests/rustfix-mode_disabled.fixed | 10 + .../rustfix-mode_everything.fixed | 10 + .../actual_tests/rustfix-mode_invalid.fixed | 10 + .../actual_tests/rustfix-mode_invalid.stderr | 16 - .../rustfix-mode_machine-applicable.fixed | 10 + tests/integrations/basic/tests/json.rs | 4 +- tests/integrations/basic/tests/ui_tests.rs | 4 +- tests/integrations/cargo-run/Cargo.lock | 848 ++++++ tests/integrations/cargo-run/Cargo.stdout | 12 + tests/integrations/cargo-run/Cargo.toml | 14 + tests/integrations/cargo-run/src/main.rs | 13 + .../tests/actual_tests/empty_no_stdin.rs | 0 .../tests/actual_tests/empty_no_stdin.stderr | 3 + .../tests/actual_tests/matching_stdin.rs | 2 + .../tests/actual_tests/matching_stdin.stderr | 3 + .../tests/actual_tests/matching_stdin.stdin | 2 + .../tests/actual_tests/mismatching_stdin.rs | 2 + .../actual_tests/mismatching_stdin.stderr | 5 + .../actual_tests/mismatching_stdin.stdin | 1 + .../cargo-run/tests/actual_tests/no_stdin.rs | 2 + .../tests/actual_tests/no_stdin.stderr | 3 + .../integrations/cargo-run/tests/ui_tests.rs | 26 + tests/integrations/dep-fail/Cargo.lock | 675 +++++ tests/integrations/dep-fail/Cargo.stderr | 10 + tests/integrations/dep-fail/Cargo.stdout | 40 + tests/integrations/dep-fail/Cargo.toml | 11 + tests/integrations/dep-fail/src/lib.rs | 0 .../dep-fail/tested_crate/Cargo.lock | 7 + .../dep-fail/tested_crate/Cargo.toml | 8 + .../dep-fail/tested_crate/src/lib.rs | 1 + tests/integrations/dep-fail/tests/ui.rs | 29 + .../dep-fail/tests/ui/basic_test.rs | 1 + tests/integrations/ui_test_dep_bug/Cargo.lock | 680 +++++ .../integrations/ui_test_dep_bug/Cargo.stdout | 15 + tests/integrations/ui_test_dep_bug/Cargo.toml | 20 + tests/integrations/ui_test_dep_bug/src/lib.rs | 0 .../ui_test_dep_bug/tested_crate/Cargo.toml | 8 + .../ui_test_dep_bug/tested_crate/src/lib.rs | 2 + .../integrations/ui_test_dep_bug/tests/ui.rs | 26 + .../ui_test_dep_bug/tests/ui/basic_test.rs | 6 + 171 files changed, 8811 insertions(+), 156 deletions(-) rename src/custom_flags/{rustfix.rs => rustfix_mode.rs} (98%) create mode 100644 tests/integrations/basic-bin/Cargo.lock create mode 100644 tests/integrations/basic-bin/Cargo.stdout create mode 100644 tests/integrations/basic-bin/Cargo.toml create mode 100644 tests/integrations/basic-bin/src/main.rs create mode 100644 tests/integrations/basic-bin/tests/actual_tests/foomp.rs create mode 100644 tests/integrations/basic-bin/tests/actual_tests/foomp.stderr create mode 100644 tests/integrations/basic-bin/tests/ui_tests.rs create mode 100644 tests/integrations/basic-fail-mode/Cargo.lock create mode 100644 tests/integrations/basic-fail-mode/Cargo.stdout create mode 100644 tests/integrations/basic-fail-mode/Cargo.toml create mode 100644 tests/integrations/basic-fail-mode/src/lib.rs create mode 100644 tests/integrations/basic-fail-mode/tests/actual_tests/foomp.rs create mode 100644 tests/integrations/basic-fail-mode/tests/actual_tests/foomp.stderr create mode 100644 tests/integrations/basic-fail-mode/tests/run_file.rs create mode 100644 tests/integrations/basic-fail-mode/tests/run_file/run_file.rs create mode 100644 tests/integrations/basic-fail-mode/tests/run_file/run_file_with_deps.rs create mode 100644 tests/integrations/basic-fail-mode/tests/ui_tests.rs create mode 100644 tests/integrations/basic-fail/Cargo.lock create mode 100644 tests/integrations/basic-fail/Cargo.stderr create mode 100644 tests/integrations/basic-fail/Cargo.stdout create mode 100644 tests/integrations/basic-fail/Cargo.toml create mode 100644 tests/integrations/basic-fail/src/lib.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/bad_pattern.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/bad_pattern.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests/executable.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/executable.run.stdout create mode 100644 tests/integrations/basic-fail/tests/actual_tests/executable_compile_err.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/exit_code_fail.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/filters.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/foomp.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/foomp.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests/foomp2.fixed create mode 100644 tests/integrations/basic-fail/tests/actual_tests/foomp2.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/foomp2.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests/ice_annotations.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/inline_chain.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/joined_wrong_order.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/lone_joined_pattern.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow_above.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/rustc_ice.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/rustc_ice.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests/touching_above_below.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests/touching_above_below_chain.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/abort.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/aux_build_not_found.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_misuse.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/foomp.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/nested.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/the_proc_macro.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/compile_flags_quotes.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/compiletest-rs-command.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.run.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/nested_aux.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/no_main.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/no_test.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/non_top_level_configs.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/pass.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/pass_with_annotation.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revised_revision.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.panic.run.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.run.run.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions.bar.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions.foo.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.bar.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.foo.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.bar.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.bar.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.foo.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.bar.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.foo.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.run.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.fixed create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.fixed create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.fixed create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/unicode.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/unicode.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision2.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.bar.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.foo.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.fixed create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.stderr create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.1.fixed create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.3.fixed create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.rs create mode 100644 tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.stderr create mode 100644 tests/integrations/basic-fail/tests/json.rs create mode 100644 tests/integrations/basic-fail/tests/ui_tests.rs create mode 100644 tests/integrations/basic-fail/tests/ui_tests_bless.rs create mode 100644 tests/integrations/basic-fail/tests/ui_tests_diff_only.rs create mode 100644 tests/integrations/basic-fail/tests/ui_tests_invalid_program.rs create mode 100644 tests/integrations/basic-fail/tests/ui_tests_invalid_program2.rs delete mode 100644 tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.stderr create mode 100644 tests/integrations/cargo-run/Cargo.lock create mode 100644 tests/integrations/cargo-run/Cargo.stdout create mode 100644 tests/integrations/cargo-run/Cargo.toml create mode 100644 tests/integrations/cargo-run/src/main.rs create mode 100644 tests/integrations/cargo-run/tests/actual_tests/empty_no_stdin.rs create mode 100644 tests/integrations/cargo-run/tests/actual_tests/empty_no_stdin.stderr create mode 100644 tests/integrations/cargo-run/tests/actual_tests/matching_stdin.rs create mode 100644 tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stderr create mode 100644 tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stdin create mode 100644 tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.rs create mode 100644 tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stderr create mode 100644 tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stdin create mode 100644 tests/integrations/cargo-run/tests/actual_tests/no_stdin.rs create mode 100644 tests/integrations/cargo-run/tests/actual_tests/no_stdin.stderr create mode 100644 tests/integrations/cargo-run/tests/ui_tests.rs create mode 100644 tests/integrations/dep-fail/Cargo.lock create mode 100644 tests/integrations/dep-fail/Cargo.stderr create mode 100644 tests/integrations/dep-fail/Cargo.stdout create mode 100644 tests/integrations/dep-fail/Cargo.toml create mode 100644 tests/integrations/dep-fail/src/lib.rs create mode 100644 tests/integrations/dep-fail/tested_crate/Cargo.lock create mode 100644 tests/integrations/dep-fail/tested_crate/Cargo.toml create mode 100644 tests/integrations/dep-fail/tested_crate/src/lib.rs create mode 100644 tests/integrations/dep-fail/tests/ui.rs create mode 100644 tests/integrations/dep-fail/tests/ui/basic_test.rs create mode 100644 tests/integrations/ui_test_dep_bug/Cargo.lock create mode 100644 tests/integrations/ui_test_dep_bug/Cargo.stdout create mode 100644 tests/integrations/ui_test_dep_bug/Cargo.toml create mode 100644 tests/integrations/ui_test_dep_bug/src/lib.rs create mode 100644 tests/integrations/ui_test_dep_bug/tested_crate/Cargo.toml create mode 100644 tests/integrations/ui_test_dep_bug/tested_crate/src/lib.rs create mode 100644 tests/integrations/ui_test_dep_bug/tests/ui.rs create mode 100644 tests/integrations/ui_test_dep_bug/tests/ui/basic_test.rs diff --git a/src/config.rs b/src/config.rs index e12f303d..67598f99 100644 --- a/src/config.rs +++ b/src/config.rs @@ -2,7 +2,7 @@ use crate::{ aux_builds::AuxBuilder, custom_flags::edition::Edition, custom_flags::revision_args::RustcRevisionArgs, custom_flags::run::Run, - custom_flags::rustfix::RustfixMode, custom_flags::Flag, filter::Match, + custom_flags::rustfix_mode::RustfixMode, custom_flags::Flag, filter::Match, }; use crate::{ diagnostics::{self, Diagnostics}, @@ -155,7 +155,7 @@ impl Config { .add_custom("edition", Edition("2021".into())); comment_defaults .base() - .add_custom("rustfix", RustfixMode::MachineApplicable); + .add_custom("rustfix-mode", RustfixMode::MachineApplicable); let filters = vec![ (Match::PathBackslash, b"/".to_vec()), #[cfg(windows)] @@ -196,16 +196,13 @@ impl Config { config .custom_comments .insert("no-rustfix", |parser, _args, span| { - dbg!(&span); // args are ignored (can be used as comment) - parser.set_custom_once("no-rustfix", (), span); + parser.set_custom_once("rustfix-mode", RustfixMode::Disabled, span); }); config .custom_comments .insert("rustfix-mode", |parser, args, span| { - dbg!(&span); - eprintln!("{}", std::backtrace::Backtrace::force_capture()); match args.content.parse::() { Ok(mode) => { parser.set_custom_once("rustfix-mode", mode, span); diff --git a/src/custom_flags.rs b/src/custom_flags.rs index 51a3ce74..39e8e368 100644 --- a/src/custom_flags.rs +++ b/src/custom_flags.rs @@ -14,7 +14,7 @@ pub mod edition; pub mod revision_args; #[cfg(feature = "rustc")] pub mod run; -pub mod rustfix; +pub mod rustfix_mode; /// Tester-specific flag that gets parsed from `//@` comments. pub trait Flag: Send + Sync + UnwindSafe + RefUnwindSafe + std::fmt::Debug { diff --git a/src/custom_flags/rustfix.rs b/src/custom_flags/rustfix_mode.rs similarity index 98% rename from src/custom_flags/rustfix.rs rename to src/custom_flags/rustfix_mode.rs index d50e9e37..a819f5d0 100644 --- a/src/custom_flags/rustfix.rs +++ b/src/custom_flags/rustfix_mode.rs @@ -49,7 +49,6 @@ impl Flag for RustfixMode { output: &Output, build_manager: &BuildManager, ) -> Result<(), Errored> { - dbg!(*self); let global_rustfix = match config.exit_status()? { Some(Spanned { content: 101 | 0, .. @@ -59,7 +58,6 @@ impl Flag for RustfixMode { let output = output.clone(); let no_run_rustfix = config.find_one_custom("no-rustfix")?; let fixes = if no_run_rustfix.is_none() && global_rustfix.enabled() { - dbg!(global_rustfix); fix(&output.stderr, config.status.path(), global_rustfix).map_err(|err| Errored { command: format!("rustfix {}", display(config.status.path())), errors: vec![Error::Rustfix(err)], @@ -116,12 +114,10 @@ impl FromStr for RustfixMode { } fn fix(stderr: &[u8], path: &Path, mode: RustfixMode) -> anyhow::Result> { - dbg!(path); let suggestions = std::str::from_utf8(stderr) .unwrap() .lines() .filter_map(|line| { - // dbg!(line); if !line.starts_with('{') { return None; } @@ -139,8 +135,6 @@ fn fix(stderr: &[u8], path: &Path, mode: RustfixMode) -> anyhow::Result>(); - // dbg!(mode); - // dbg!(&suggestions); if suggestions.is_empty() { return Ok(Vec::new()); } diff --git a/src/per_test_config.rs b/src/per_test_config.rs index 1b9e29a7..e67f6ea3 100644 --- a/src/per_test_config.rs +++ b/src/per_test_config.rs @@ -371,7 +371,6 @@ impl TestConfig { } pub(crate) fn run_test(&mut self, build_manager: &Arc) -> TestResult { - dbg!(); self.patch_out_dir(); let mut cmd = self.build_command(build_manager)?; @@ -385,9 +384,7 @@ impl TestConfig { let output = self.check_test_result(&cmd, output)?; for rev in self.comments() { - dbg!(); // rev); for custom in rev.custom.values() { - dbg!(&custom.content); for flag in &custom.content { flag.post_test_action(self, &output, build_manager)?; } diff --git a/tests/integrations/basic-bin/Cargo.lock b/tests/integrations/basic-bin/Cargo.lock new file mode 100644 index 00000000..cacf869f --- /dev/null +++ b/tests/integrations/basic-bin/Cargo.lock @@ -0,0 +1,848 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "annotate-snippets" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5a59f105fb9635e9eebdc1e29d53e764fa5795b9cf899a638a53e61567ef61" +dependencies = [ + "anstyle", + "unicode-width", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anyhow" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "basic_bin" +version = "0.1.0" +dependencies = [ + "tempfile", + "ui_test", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bstr" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +dependencies = [ + "memchr", + "regex-automata 0.4.3", + "serde", +] + +[[package]] +name = "camino" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "color-eyre" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors 3.5.0", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" +dependencies = [ + "once_cell", + "owo-colors 3.5.0", + "tracing-core", + "tracing-error", +] + +[[package]] +name = "colored" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "comma" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.45.0", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "eyre" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indicatif" +version = "0.17.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "itoa" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "levenshtein" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" + +[[package]] +name = "libc" +version = "0.2.156" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "owo-colors" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" + +[[package]] +name = "pin-project-lite" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" + +[[package]] +name = "portable-atomic" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc55135a600d700580e406b4de0d59cb9ad25e344a3a091a97ded2622ec4ec6" + +[[package]] +name = "prettydiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac17546d82912e64874e3d5b40681ce32eac4e5834344f51efcf689ff1550a65" +dependencies = [ + "owo-colors 4.2.3", +] + +[[package]] +name = "proc-macro2" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "regex-automata 0.3.2", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustfix" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "rustix" +version = "0.37.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "ryu" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "spanned" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e8e76fd7aeee255ddaa885b9de506484b21cbd458ae9d04d1b24851e82ee58a" +dependencies = [ + "anyhow", + "bstr", + "color-eyre", +] + +[[package]] +name = "syn" +version = "2.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +dependencies = [ + "autocfg", + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "sharded-slab", + "thread_local", + "tracing-core", +] + +[[package]] +name = "ui_test" +version = "0.30.3" +dependencies = [ + "annotate-snippets", + "anyhow", + "bstr", + "cargo-platform", + "cargo_metadata", + "color-eyre", + "colored", + "comma", + "crossbeam-channel", + "indicatif", + "levenshtein", + "prettydiff", + "regex", + "rustc_version", + "rustfix", + "serde", + "serde_json", + "spanned", +] + +[[package]] +name = "unicode-ident" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/tests/integrations/basic-bin/Cargo.stdout b/tests/integrations/basic-bin/Cargo.stdout new file mode 100644 index 00000000..058d8047 --- /dev/null +++ b/tests/integrations/basic-bin/Cargo.stdout @@ -0,0 +1,10 @@ + +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished + +Building dependencies ... ok +tests/actual_tests/foomp.rs ... ok + +test result: ok. 1 passed + diff --git a/tests/integrations/basic-bin/Cargo.toml b/tests/integrations/basic-bin/Cargo.toml new file mode 100644 index 00000000..7474d9c4 --- /dev/null +++ b/tests/integrations/basic-bin/Cargo.toml @@ -0,0 +1,14 @@ +[package] +name = "basic_bin" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dev-dependencies] +ui_test = { path = "../../.."} +tempfile = "3.3.0" + +[[test]] +name = "ui_tests" +harness = false diff --git a/tests/integrations/basic-bin/src/main.rs b/tests/integrations/basic-bin/src/main.rs new file mode 100644 index 00000000..f328e4d9 --- /dev/null +++ b/tests/integrations/basic-bin/src/main.rs @@ -0,0 +1 @@ +fn main() {} diff --git a/tests/integrations/basic-bin/tests/actual_tests/foomp.rs b/tests/integrations/basic-bin/tests/actual_tests/foomp.rs new file mode 100644 index 00000000..3391c4d6 --- /dev/null +++ b/tests/integrations/basic-bin/tests/actual_tests/foomp.rs @@ -0,0 +1,8 @@ +//@normalize-stderr-test: "(file name should be).*" -> "$1" + +use basic_bin::add; +//~^ ERROR: unresolved import + +fn main() { + add("42", 3); +} diff --git a/tests/integrations/basic-bin/tests/actual_tests/foomp.stderr b/tests/integrations/basic-bin/tests/actual_tests/foomp.stderr new file mode 100644 index 00000000..a15fc324 --- /dev/null +++ b/tests/integrations/basic-bin/tests/actual_tests/foomp.stderr @@ -0,0 +1,9 @@ +error[E0432]: unresolved import `basic_bin` + --> tests/actual_tests/foomp.rs:3:5 + | +3 | use basic_bin::add; + | ^^^^^^^^^ use of undeclared crate or module `basic_bin` + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0432`. diff --git a/tests/integrations/basic-bin/tests/ui_tests.rs b/tests/integrations/basic-bin/tests/ui_tests.rs new file mode 100644 index 00000000..852d0d25 --- /dev/null +++ b/tests/integrations/basic-bin/tests/ui_tests.rs @@ -0,0 +1,38 @@ +use ui_test::{dependencies::DependencyBuilder, *}; + +fn main() -> ui_test::color_eyre::Result<()> { + let path = "../../../target"; + let mut config = Config { + output_conflict_handling: if std::env::var_os("BLESS").is_some() { + ui_test::bless_output_files + } else { + ui_test::error_on_output_conflict + }, + bless_command: Some("cargo test".to_string()), + ..Config::rustc("tests/actual_tests") + }; + config + .comment_defaults + .base() + .set_custom("dependencies", DependencyBuilder::default()); + config.stderr_filter("in ([0-9]m )?[0-9\\.]+s", ""); + config.stdout_filter("in ([0-9]m )?[0-9\\.]+s", ""); + config.stderr_filter(r"[^ ]*/\.?cargo/registry/.*/", "$$CARGO_REGISTRY"); + config.stderr_filter(r"\.exe", ""); + config.stderr_filter("/target/[^/]+/[0-9]+/[^/]+/debug", "/target/$$TMP/$$TRIPLE/debug"); + config.path_stderr_filter(&std::path::Path::new(path), "$DIR"); + + // hide binaries generated for successfully passing tests + let tmp_dir = tempfile::tempdir_in(path)?; + let tmp_dir = tmp_dir.path(); + config.out_dir = tmp_dir.into(); + config.path_stderr_filter(tmp_dir, "$$TMP"); + + run_tests_generic( + vec![config], + default_file_filter, + default_per_file_config, + // Avoid github actions, as these would end up showing up in `Cargo.stderr` + status_emitter::Text::verbose(), + ) +} diff --git a/tests/integrations/basic-fail-mode/Cargo.lock b/tests/integrations/basic-fail-mode/Cargo.lock new file mode 100644 index 00000000..f0bef7a7 --- /dev/null +++ b/tests/integrations/basic-fail-mode/Cargo.lock @@ -0,0 +1,848 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "annotate-snippets" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5a59f105fb9635e9eebdc1e29d53e764fa5795b9cf899a638a53e61567ef61" +dependencies = [ + "anstyle", + "unicode-width", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anyhow" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "basic_fail_mode" +version = "0.1.0" +dependencies = [ + "tempfile", + "ui_test", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bstr" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +dependencies = [ + "memchr", + "regex-automata 0.4.3", + "serde", +] + +[[package]] +name = "camino" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "color-eyre" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors 3.5.0", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" +dependencies = [ + "once_cell", + "owo-colors 3.5.0", + "tracing-core", + "tracing-error", +] + +[[package]] +name = "colored" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "comma" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.45.0", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "eyre" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indicatif" +version = "0.17.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "itoa" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "levenshtein" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" + +[[package]] +name = "libc" +version = "0.2.156" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "owo-colors" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" + +[[package]] +name = "pin-project-lite" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" + +[[package]] +name = "portable-atomic" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc55135a600d700580e406b4de0d59cb9ad25e344a3a091a97ded2622ec4ec6" + +[[package]] +name = "prettydiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac17546d82912e64874e3d5b40681ce32eac4e5834344f51efcf689ff1550a65" +dependencies = [ + "owo-colors 4.2.3", +] + +[[package]] +name = "proc-macro2" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "regex-automata 0.3.2", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustfix" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "rustix" +version = "0.37.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "ryu" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "spanned" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e8e76fd7aeee255ddaa885b9de506484b21cbd458ae9d04d1b24851e82ee58a" +dependencies = [ + "anyhow", + "bstr", + "color-eyre", +] + +[[package]] +name = "syn" +version = "2.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +dependencies = [ + "autocfg", + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "sharded-slab", + "thread_local", + "tracing-core", +] + +[[package]] +name = "ui_test" +version = "0.30.3" +dependencies = [ + "annotate-snippets", + "anyhow", + "bstr", + "cargo-platform", + "cargo_metadata", + "color-eyre", + "colored", + "comma", + "crossbeam-channel", + "indicatif", + "levenshtein", + "prettydiff", + "regex", + "rustc_version", + "rustfix", + "serde", + "serde_json", + "spanned", +] + +[[package]] +name = "unicode-ident" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/tests/integrations/basic-fail-mode/Cargo.stdout b/tests/integrations/basic-fail-mode/Cargo.stdout new file mode 100644 index 00000000..15df52b1 --- /dev/null +++ b/tests/integrations/basic-fail-mode/Cargo.stdout @@ -0,0 +1,20 @@ + +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished + + +running 3 tests +... +test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished + +Building dependencies ... ok +tests/actual_tests/foomp.rs ... ok + +test result: ok. 1 passed + + +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished + diff --git a/tests/integrations/basic-fail-mode/Cargo.toml b/tests/integrations/basic-fail-mode/Cargo.toml new file mode 100644 index 00000000..fdada374 --- /dev/null +++ b/tests/integrations/basic-fail-mode/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "basic_fail_mode" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dev-dependencies] +ui_test = { path = "../../.."} +tempfile = "3.3.0" + +[[test]] +name = "ui_tests" +harness = false + +[[test]] +name = "run_file" +harness = true diff --git a/tests/integrations/basic-fail-mode/src/lib.rs b/tests/integrations/basic-fail-mode/src/lib.rs new file mode 100644 index 00000000..211bfff7 --- /dev/null +++ b/tests/integrations/basic-fail-mode/src/lib.rs @@ -0,0 +1,3 @@ +pub fn add(left: usize, right: usize) -> usize { + left + right +} diff --git a/tests/integrations/basic-fail-mode/tests/actual_tests/foomp.rs b/tests/integrations/basic-fail-mode/tests/actual_tests/foomp.rs new file mode 100644 index 00000000..cfef747a --- /dev/null +++ b/tests/integrations/basic-fail-mode/tests/actual_tests/foomp.rs @@ -0,0 +1,6 @@ +use basic_fail_mode::add; + +fn main() { + add("42", 3); + //~^ ERROR: mismatched types +} diff --git a/tests/integrations/basic-fail-mode/tests/actual_tests/foomp.stderr b/tests/integrations/basic-fail-mode/tests/actual_tests/foomp.stderr new file mode 100644 index 00000000..e34df4f8 --- /dev/null +++ b/tests/integrations/basic-fail-mode/tests/actual_tests/foomp.stderr @@ -0,0 +1,17 @@ +error[E0308]: mismatched types + --> tests/actual_tests/foomp.rs:4:9 + | +4 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail-mode/src/lib.rs:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail-mode/tests/run_file.rs b/tests/integrations/basic-fail-mode/tests/run_file.rs new file mode 100644 index 00000000..5864b7c4 --- /dev/null +++ b/tests/integrations/basic-fail-mode/tests/run_file.rs @@ -0,0 +1,71 @@ +use std::path::{Path, PathBuf}; +use ui_test::color_eyre::{eyre::ensure, Result}; +use ui_test::dependencies::DependencyBuilder; +use ui_test::*; + +#[test] +fn run_file() -> Result<()> { + let mut config = Config::rustc(PathBuf::new()); + + let tmp_dir = tempfile::tempdir_in(env!("CARGO_TARGET_TMPDIR"))?; + let tmp_dir = tmp_dir.path(); + config.out_dir = tmp_dir.into(); + config.path_stderr_filter(tmp_dir, "$TMP"); + + let mut result = ui_test::test_command( + config, + &Path::new(file!()) + .parent() + .unwrap() + .join("run_file/run_file.rs"), + )?; + ensure!(result.output()?.status.success(), ""); + Ok(()) +} + +#[test] +fn fail_run_file() { + let mut config = Config::rustc(PathBuf::new()); + config.host = Some(String::new()); + config.program = CommandBuilder::cmd("invalid_alsdkfjalsdfjalskdfj"); + + let _ = ui_test::test_command( + config, + &Path::new(file!()) + .parent() + .unwrap() + .join("run_file/run_file.rs"), + ) + .unwrap() + .output() + .unwrap_err(); +} + +#[test] +fn run_file_no_deps() -> Result<()> { + let path = "../../../target"; + + let mut config = Config::rustc(PathBuf::new()); + + let tmp_dir = tempfile::tempdir_in(path)?; + let tmp_dir = tmp_dir.path(); + config.out_dir = tmp_dir.into(); + config.path_stderr_filter(tmp_dir, "$TMP"); + + // Don't build a binary, we only provide .rmeta dependencies for now + config.program.args.push("--emit=metadata".into()); + config + .comment_defaults + .base() + .set_custom("dependencies", DependencyBuilder::default()); + + let mut result = ui_test::test_command( + config, + &Path::new(file!()) + .parent() + .unwrap() + .join("run_file/run_file_with_deps.rs"), + )?; + ensure!(result.output()?.status.success(), ""); + Ok(()) +} diff --git a/tests/integrations/basic-fail-mode/tests/run_file/run_file.rs b/tests/integrations/basic-fail-mode/tests/run_file/run_file.rs new file mode 100644 index 00000000..f328e4d9 --- /dev/null +++ b/tests/integrations/basic-fail-mode/tests/run_file/run_file.rs @@ -0,0 +1 @@ +fn main() {} diff --git a/tests/integrations/basic-fail-mode/tests/run_file/run_file_with_deps.rs b/tests/integrations/basic-fail-mode/tests/run_file/run_file_with_deps.rs new file mode 100644 index 00000000..982b8015 --- /dev/null +++ b/tests/integrations/basic-fail-mode/tests/run_file/run_file_with_deps.rs @@ -0,0 +1,5 @@ +use basic_fail_mode::add; + +fn main() { + assert_eq!(add(1, 2), 3); +} diff --git a/tests/integrations/basic-fail-mode/tests/ui_tests.rs b/tests/integrations/basic-fail-mode/tests/ui_tests.rs new file mode 100644 index 00000000..92b14795 --- /dev/null +++ b/tests/integrations/basic-fail-mode/tests/ui_tests.rs @@ -0,0 +1,30 @@ +use ui_test::{dependencies::DependencyBuilder, *}; + +fn main() -> ui_test::color_eyre::Result<()> { + let path = "../../../target"; + let mut config = Config { + output_conflict_handling: if std::env::var_os("BLESS").is_some() { + ui_test::bless_output_files + } else { + ui_test::error_on_output_conflict + }, + bless_command: Some("cargo test".to_string()), + ..Config::rustc("tests/actual_tests") + }; + config + .comment_defaults + .base() + .set_custom("dependencies", DependencyBuilder::default()); + config.stderr_filter("in ([0-9]m )?[0-9\\.]+s", ""); + config.stdout_filter("in ([0-9]m )?[0-9\\.]+s", ""); + config.stderr_filter(r"[^ ]*/\.?cargo/registry/.*/", "$$CARGO_REGISTRY"); + config.path_stderr_filter(&std::path::Path::new(path), "$DIR"); + + run_tests_generic( + vec![config], + default_file_filter, + default_per_file_config, + // Avoid github actions, as these would end up showing up in `Cargo.stderr` + status_emitter::Text::verbose(), + ) +} diff --git a/tests/integrations/basic-fail/Cargo.lock b/tests/integrations/basic-fail/Cargo.lock new file mode 100644 index 00000000..a55f949a --- /dev/null +++ b/tests/integrations/basic-fail/Cargo.lock @@ -0,0 +1,848 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "annotate-snippets" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5a59f105fb9635e9eebdc1e29d53e764fa5795b9cf899a638a53e61567ef61" +dependencies = [ + "anstyle", + "unicode-width", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anyhow" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "basic_fail" +version = "0.1.0" +dependencies = [ + "tempfile", + "ui_test", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bstr" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +dependencies = [ + "memchr", + "regex-automata 0.4.3", + "serde", +] + +[[package]] +name = "camino" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "color-eyre" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors 3.5.0", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" +dependencies = [ + "once_cell", + "owo-colors 3.5.0", + "tracing-core", + "tracing-error", +] + +[[package]] +name = "colored" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "comma" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.45.0", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "eyre" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indicatif" +version = "0.17.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "itoa" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "levenshtein" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" + +[[package]] +name = "libc" +version = "0.2.156" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "owo-colors" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" + +[[package]] +name = "pin-project-lite" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" + +[[package]] +name = "portable-atomic" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc55135a600d700580e406b4de0d59cb9ad25e344a3a091a97ded2622ec4ec6" + +[[package]] +name = "prettydiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac17546d82912e64874e3d5b40681ce32eac4e5834344f51efcf689ff1550a65" +dependencies = [ + "owo-colors 4.2.3", +] + +[[package]] +name = "proc-macro2" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "regex-automata 0.3.2", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustfix" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "rustix" +version = "0.37.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "ryu" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "spanned" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e8e76fd7aeee255ddaa885b9de506484b21cbd458ae9d04d1b24851e82ee58a" +dependencies = [ + "anyhow", + "bstr", + "color-eyre", +] + +[[package]] +name = "syn" +version = "2.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +dependencies = [ + "autocfg", + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "sharded-slab", + "thread_local", + "tracing-core", +] + +[[package]] +name = "ui_test" +version = "0.30.3" +dependencies = [ + "annotate-snippets", + "anyhow", + "bstr", + "cargo-platform", + "cargo_metadata", + "color-eyre", + "colored", + "comma", + "crossbeam-channel", + "indicatif", + "levenshtein", + "prettydiff", + "regex", + "rustc_version", + "rustfix", + "serde", + "serde_json", + "spanned", +] + +[[package]] +name = "unicode-ident" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/tests/integrations/basic-fail/Cargo.stderr b/tests/integrations/basic-fail/Cargo.stderr new file mode 100644 index 00000000..20a86fcc --- /dev/null +++ b/tests/integrations/basic-fail/Cargo.stderr @@ -0,0 +1,48 @@ +Error: tests failed + +Location: + $DIR/src/lib.rs:LL:CC +error: test failed, to rerun pass `--test json` + +Caused by: + process didn't exit successfully: `$DIR/target/ui/1/tests/integrations/basic-fail/debug/deps/json-HASH` (exit status: 1) +Error: tests failed + +Location: + $DIR/src/lib.rs:LL:CC +error: test failed, to rerun pass `--test ui_tests` + +Caused by: + process didn't exit successfully: `$DIR/target/ui/1/tests/integrations/basic-fail/debug/deps/ui_tests-HASH` (exit status: 1) +Error: tests failed + +Location: + $DIR/src/lib.rs:LL:CC +error: test failed, to rerun pass `--test ui_tests_diff_only` + +Caused by: + process didn't exit successfully: `$DIR/target/ui/1/tests/integrations/basic-fail/debug/deps/ui_tests_diff_only-HASH` (exit status: 1) +Error: failed to parse rustc version info: invalid_foobarlaksdfalsdfj + +Caused by: + +Location: + $DIR/src/config.rs:LL:CC +error: test failed, to rerun pass `--test ui_tests_invalid_program` + +Caused by: + process didn't exit successfully: `$DIR/target/ui/1/tests/integrations/basic-fail/debug/deps/ui_tests_invalid_program-HASH` (exit status: 1) +Error: tests failed + +Location: + $DIR/src/lib.rs:LL:CC +error: test failed, to rerun pass `--test ui_tests_invalid_program2` + +Caused by: + process didn't exit successfully: `$DIR/target/ui/1/tests/integrations/basic-fail/debug/deps/ui_tests_invalid_program2-HASH` (exit status: 1) +error: 5 targets failed: + `--test json` + `--test ui_tests` + `--test ui_tests_diff_only` + `--test ui_tests_invalid_program` + `--test ui_tests_invalid_program2` diff --git a/tests/integrations/basic-fail/Cargo.stdout b/tests/integrations/basic-fail/Cargo.stdout new file mode 100644 index 00000000..6c600128 --- /dev/null +++ b/tests/integrations/basic-fail/Cargo.stdout @@ -0,0 +1,2279 @@ + +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished + +{ "type": "suite", "event": "started" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/bad_pattern.rs () - tests/actual_tests/bad_pattern.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/bad_pattern_multiple.rs () - tests/actual_tests/bad_pattern_multiple.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/executable.rs () - tests/actual_tests/executable.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/executable_compile_err.rs () - tests/actual_tests/executable_compile_err.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/exit_code_fail.rs () - tests/actual_tests/exit_code_fail.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/filters.rs () - tests/actual_tests/filters.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/foomp.rs () - tests/actual_tests/foomp.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/foomp2.rs () - tests/actual_tests/foomp2.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/ice_annotations.rs () - tests/actual_tests/ice_annotations.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/inline_chain.rs () - tests/actual_tests/inline_chain.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/joined_wrong_order.rs () - tests/actual_tests/joined_wrong_order.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/lone_joined_pattern.rs () - tests/actual_tests/lone_joined_pattern.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/pattern_too_many_arrow.rs () - tests/actual_tests/pattern_too_many_arrow.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/pattern_too_many_arrow_above.rs () - tests/actual_tests/pattern_too_many_arrow_above.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/rustc_ice.rs () - tests/actual_tests/rustc_ice.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/touching_above_below.rs () - tests/actual_tests/touching_above_below.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/touching_above_below_chain.rs () - tests/actual_tests/touching_above_below_chain.rs" } +{ "type": "test", "event": "ok", "name": "tests/actual_tests/bad_pattern.rs (Building dependencies) - tests/actual_tests/bad_pattern.rs" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/bad_pattern.rs () - tests/actual_tests/bad_pattern.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/bad_pattern.rs\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/bad_pattern.rs:4:9\n |\n4 | add(\"42\", 3);\n | --- ^^^^ expected `usize`, found `&str`\n | |\n | arguments to this function are incorrect\n |\nnote: function defined here\n --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC\n |\n1 | pub fn add(left: usize, right: usize) -> usize {\n | ^^^\n\nerror: aborting due to 1 previous error\n\nFor more information about this error, try `rustc --explain E0308`.\n> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/bad_pattern_multiple.rs () - tests/actual_tests/bad_pattern_multiple.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/bad_pattern_multiple.rs\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/bad_pattern_multiple.rs:4:9\n |\n4 | add(\"42\", 3);\n | --- ^^^^ expected `usize`, found `&str`\n | |\n | arguments to this function are incorrect\n |\nnote: function defined here\n --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC\n |\n1 | pub fn add(left: usize, right: usize) -> usize {\n | ^^^\n\nerror[E0308]: mismatched types\n --> tests/actual_tests/bad_pattern_multiple.rs:6:9\n |\n6 | add(\"42\", 3);\n | --- ^^^^ expected `usize`, found `&str`\n | |\n | arguments to this function are incorrect\n |\nnote: function defined here\n --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC\n |\n1 | pub fn add(left: usize, right: usize) -> usize {\n | ^^^\n\nerror: aborting due to 2 previous errors\n\nFor more information about this error, try `rustc --explain E0308`.\n> stderr: <>" } +{ "type": "test", "event": "ok", "name": "tests/actual_tests/executable.rs () - tests/actual_tests/executable.rs" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/executable.rs (run) - tests/actual_tests/executable.rs", "stdout": "command: <\"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests/executable\"> stdout: <> stderr: <42\n>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/executable_compile_err.rs () - tests/actual_tests/executable_compile_err.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/executable_compile_err.rs\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/executable_compile_err.rs:4:2\n |\n3 | fn main() {\n | - unclosed delimiter\n4 |\n | ^\n\nerror: aborting due to 1 previous error\n\n> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/exit_code_fail.rs () - tests/actual_tests/exit_code_fail.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/exit_code_fail.rs\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: <> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/filters.rs () - tests/actual_tests/filters.rs", "stdout": "command: stdout: <> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/foomp.rs () - tests/actual_tests/foomp.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/foomp.rs\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/foomp.rs:4:9\n |\n4 | add(\"42\", 3);\n | --- ^^^^ expected `usize`, found `&str`\n | |\n | arguments to this function are incorrect\n |\nnote: function defined here\n --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC\n |\n1 | pub fn add(left: usize, right: usize) -> usize {\n | ^^^\n\nerror: aborting due to 1 previous error\n\nFor more information about this error, try `rustc --explain E0308`.\n> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/foomp2.rs () - tests/actual_tests/foomp2.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/foomp2.rs\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/foomp2.rs:4:9\n |\n4 | add(\"42\", 3);\n | --- ^^^^ expected `usize`, found `&str`\n | |\n | arguments to this function are incorrect\n |\nnote: function defined here\n --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC\n |\n1 | pub fn add(left: usize, right: usize) -> usize {\n | ^^^\n\nerror: aborting due to 1 previous error\n\nFor more information about this error, try `rustc --explain E0308`.\n> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/ice_annotations.rs () - tests/actual_tests/ice_annotations.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/ice_annotations.rs\" \"-Ztreat-err-as-bug\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/ice_annotations.rs:8:9\n |\n8 | add(\"42\", 3);\n | --- ^^^^ expected `usize`, found `&str`\n | |\n | arguments to this function are incorrect\n |\nnote: function defined here\n --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC\n |\n1 | pub fn add(left: usize, right: usize) -> usize {\n | ^^^\n\nthread 'rustc' panicked at compiler/rustc_errors/src/lib.rs:\naborting due to `-Z treat-err-as-bug=1`\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n\nerror: the compiler unexpectedly panicked. this is a bug.\n\nnote: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md\n\nnote: please make sure that you have updated to the latest nightly\n\n +{ "type": "test", "event": "failed", "name": "tests/actual_tests/inline_chain.rs () - tests/actual_tests/inline_chain.rs", "stdout": "command: stdout: <> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/joined_wrong_order.rs () - tests/actual_tests/joined_wrong_order.rs", "stdout": "command: stdout: <> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/lone_joined_pattern.rs () - tests/actual_tests/lone_joined_pattern.rs", "stdout": "command: stdout: <> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/pattern_too_many_arrow.rs () - tests/actual_tests/pattern_too_many_arrow.rs", "stdout": "command: stdout: <> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/pattern_too_many_arrow_above.rs () - tests/actual_tests/pattern_too_many_arrow_above.rs", "stdout": "command: stdout: <> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustc_ice.rs () - tests/actual_tests/rustc_ice.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustc_ice.rs\" \"-Ztreat-err-as-bug\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib\" \"--extern\" \"basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustc_ice.rs:8:9\n |\n8 | add(\"42\", 3);\n | --- ^^^^ expected `usize`, found `&str`\n | |\n | arguments to this function are incorrect\n |\nnote: function defined here\n --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC\n |\n1 | pub fn add(left: usize, right: usize) -> usize {\n | ^^^\n\nthread 'rustc' panicked at compiler/rustc_errors/src/lib.rs:\naborting due to `-Z treat-err-as-bug=1`\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n\nerror: the compiler unexpectedly panicked. this is a bug.\n\nnote: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md\n\nnote: please make sure that you have updated to the latest nightly\n\n +{ "type": "test", "event": "failed", "name": "tests/actual_tests/touching_above_below.rs () - tests/actual_tests/touching_above_below.rs", "stdout": "command: stdout: <> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/touching_above_below_chain.rs () - tests/actual_tests/touching_above_below_chain.rs", "stdout": "command: stdout: <> stderr: <>" } +{ "type": "suite", "event": "failed", "passed": 1, "failed": 17, "ignored": 0, "measured": 0, "filtered_out": 0 } +Building dependencies ... ok +tests/actual_tests/bad_pattern.rs ... FAILED +tests/actual_tests/bad_pattern_multiple.rs ... FAILED +tests/actual_tests/executable.rs ... ok +tests/actual_tests/executable.rs (revision `run`) ... FAILED +tests/actual_tests/executable_compile_err.rs ... FAILED +tests/actual_tests/exit_code_fail.rs ... FAILED +tests/actual_tests/filters.rs ... FAILED +tests/actual_tests/foomp.rs ... FAILED +tests/actual_tests/foomp2.rs ... FAILED +tests/actual_tests/ice_annotations.rs ... FAILED +tests/actual_tests/inline_chain.rs ... FAILED +tests/actual_tests/joined_wrong_order.rs ... FAILED +tests/actual_tests/lone_joined_pattern.rs ... FAILED +tests/actual_tests/pattern_too_many_arrow.rs ... FAILED +tests/actual_tests/pattern_too_many_arrow_above.rs ... FAILED +tests/actual_tests/rustc_ice.rs ... FAILED +tests/actual_tests/touching_above_below.rs ... FAILED +tests/actual_tests/touching_above_below_chain.rs ... FAILED + +FAILED TEST: tests/actual_tests/bad_pattern.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/bad_pattern.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: actual output differed from expected +Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/bad_pattern.stderr` to the actual output +--- tests/actual_tests/bad_pattern.stderr ++++ + error[E0308]: mismatched types + --> tests/actual_tests/bad_pattern.rs:4:9 +... 10 lines skipped ... + | ^^^ + +-error: aborting due to previous error ++error: aborting due to 1 previous error + + For more information about this error, try `rustc --explain E0308`. + +Full unnormalized output: +error[E0308]: mismatched types + --> tests/actual_tests/bad_pattern.rs:4:9 + | +4 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. + + +error: `miesmätsched types` not found in diagnostics on line 4 + --> tests/actual_tests/bad_pattern.rs:5:17 + | +5 | //~^ ERROR: miesmätsched types + | ^^^^^^^^^^^^^^^^^^ expected because of this pattern + | + +error: there was 1 unmatched diagnostic + --> tests/actual_tests/bad_pattern.rs:4:9 + | +4 | add("42", 3); + | ^^^^ Error[E0308]: mismatched types + | + +full stderr: +error[E0308]: mismatched types + --> tests/actual_tests/bad_pattern.rs:4:9 + | +4 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. + +full stdout: + + + +FAILED TEST: tests/actual_tests/bad_pattern_multiple.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/bad_pattern_multiple.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: actual output differed from expected +Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/bad_pattern_multiple.stderr` to the actual output +--- tests/actual_tests/bad_pattern_multiple.stderr ++++ + error[E0308]: mismatched types + --> tests/actual_tests/bad_pattern_multiple.rs:4:9 +... 11 lines skipped ... + + error[E0308]: mismatched types +- --> tests/actual_tests/bad_pattern_multiple.rs:6:9 ++ --> tests/actual_tests/bad_pattern_multiple.rs:6:9 + | + 6 | add("42", 3); +... 3 lines skipped ... + | + note: function defined here +- --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC ++ --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | + 1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +- error: aborting due to 2 previous errors ++error: aborting due to 2 previous errors + + For more information about this error, try `rustc --explain E0308`. + +Full unnormalized output: +error[E0308]: mismatched types + --> tests/actual_tests/bad_pattern_multiple.rs:4:9 + | +4 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error[E0308]: mismatched types + --> tests/actual_tests/bad_pattern_multiple.rs:6:9 + | +6 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 2 previous errors + +For more information about this error, try `rustc --explain E0308`. + + +error: `miesmätsched types` not found in diagnostics on line 4 + --> tests/actual_tests/bad_pattern_multiple.rs:5:17 + | +5 | //~^ ERROR: miesmätsched types + | ^^^^^^^^^^^^^^^^^^ expected because of this pattern + | + +error: `miesmätsched types` not found in diagnostics on line 6 + --> tests/actual_tests/bad_pattern_multiple.rs:7:17 + | +7 | //~^ ERROR: miesmätsched types + | ^^^^^^^^^^^^^^^^^^ expected because of this pattern + | + +error: there was 1 unmatched diagnostic + --> tests/actual_tests/bad_pattern_multiple.rs:4:9 + | +4 | add("42", 3); + | ^^^^ Error[E0308]: mismatched types + | + +error: there was 1 unmatched diagnostic + --> tests/actual_tests/bad_pattern_multiple.rs:6:9 + | +6 | add("42", 3); + | ^^^^ Error[E0308]: mismatched types + | + +full stderr: +error[E0308]: mismatched types + --> tests/actual_tests/bad_pattern_multiple.rs:4:9 + | +4 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error[E0308]: mismatched types + --> tests/actual_tests/bad_pattern_multiple.rs:6:9 + | +6 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 2 previous errors + +For more information about this error, try `rustc --explain E0308`. + +full stdout: + + + +FAILED TEST: tests/actual_tests/executable.rs (revision `run`) +command: "$CMD" + +error: actual output differed from expected +Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/executable.run.stdout` to the actual output +--- tests/actual_tests/executable.run.stdout ++++ +-69 ++42 + +Full unnormalized output: +42 + + +full stderr: + +full stdout: +42 + + + +FAILED TEST: tests/actual_tests/executable_compile_err.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/executable_compile_err.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: test got exit status: 1, but expected 0 + --> tests/actual_tests/executable_compile_err.rs:1:4 + | +1 | //@run + | ^^^ compilation failed, but was expected to succeed + | + +error: no output was expected +Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/executable_compile_err.stderr` to the actual output ++++ +error: this file contains an unclosed delimiter + --> tests/actual_tests/executable_compile_err.rs:4:2 + | +3 | fn main() { + | - unclosed delimiter +4 | + | ^ + +error: aborting due to 1 previous error + + + +full stderr: +error: this file contains an unclosed delimiter + --> tests/actual_tests/executable_compile_err.rs:4:2 + | +3 | fn main() { + | - unclosed delimiter +4 | + | ^ + +error: aborting due to 1 previous error + + +full stdout: + + + +FAILED TEST: tests/actual_tests/exit_code_fail.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/exit_code_fail.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: test got exit status: 0, but expected 1 + = note: compilation succeeded, but was expected to fail + +error: expected error patterns, but found none + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/filters.rs +command: parse comments + +error: `x86_64` is not a valid condition, expected `on-host`, /[0-9]+bit/, /host-.*/, or /target-.*/ + --> tests/actual_tests/filters.rs:1:9 + | +1 | //@only-x86_64 + | ^^^^^^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/foomp.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/foomp.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: actual output differed from expected +Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/foomp.stderr` to the actual output +--- tests/actual_tests/foomp.stderr ++++ + error[E0308]: mismatched types + --> tests/actual_tests/foomp.rs:4:9 + | + 4 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` ++ | | ++ | arguments to this function are incorrect + | + note: function defined here +- --> $DIR/tests/integrations/basic/src/lib.rs:LL:CC ++ --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | + 1 | pub fn add(left: usize, right: usize) -> usize { +- | ^^^ some expected text that isn't in the actual message ++ | ^^^ + +-error: aborting doo to previous error ++error: aborting due to 1 previous error + + For more information about this error, try `rustc --explain E0308`. + +Full unnormalized output: +error[E0308]: mismatched types + --> tests/actual_tests/foomp.rs:4:9 + | +4 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. + + +full stderr: +error[E0308]: mismatched types + --> tests/actual_tests/foomp.rs:4:9 + | +4 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. + +full stdout: + + + +FAILED TEST: tests/actual_tests/foomp2.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/foomp2.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: actual output differed from expected +Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/foomp2.stderr` to the actual output +--- tests/actual_tests/foomp2.stderr ++++ + error[E0308]: mismatched types + --> tests/actual_tests/foomp2.rs:4:9 +... 10 lines skipped ... + | ^^^ + +-error: aborting due to previous error ++error: aborting due to 1 previous error + + For more information about this error, try `rustc --explain E0308`. + +Full unnormalized output: +error[E0308]: mismatched types + --> tests/actual_tests/foomp2.rs:4:9 + | +4 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. + + +full stderr: +error[E0308]: mismatched types + --> tests/actual_tests/foomp2.rs:4:9 + | +4 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. + +full stdout: + + + +FAILED TEST: tests/actual_tests/ice_annotations.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/ice_annotations.rs" "-Ztreat-err-as-bug" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: test got exit status: 101, but expected 1 + = note: the compiler panicked + +error: no output was expected +Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/ice_annotations.stderr` to the actual output ++++ +error: internal compiler error[E0308]: mismatched types + --> tests/actual_tests/ice_annotations.rs:8:9 + | +8 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs: +aborting due to `-Z treat-err-as-bug=1` +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace + +error: the compiler unexpectedly panicked. this is a bug. + +note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md + +note: please make sure that you have updated to the latest nightly + + + +note: compiler flags: -Z treat-err-as-bug + +query stack during panic: +#0 [typeck] type-checking `main` +#1 [analysis] running analysis passes on this crate +end of query stack + + +full stderr: +error: internal compiler error[E0308]: mismatched types + --> tests/actual_tests/ice_annotations.rs:8:9 + | +8 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs: +aborting due to `-Z treat-err-as-bug=1` +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace + +error: the compiler unexpectedly panicked. this is a bug. + +note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md + +note: please make sure that you have updated to the latest nightly + + + +note: compiler flags: -Z treat-err-as-bug + +query stack during panic: +#0 [typeck] type-checking `main` +#1 [analysis] running analysis passes on this crate +end of query stack + +full stdout: + + + +FAILED TEST: tests/actual_tests/inline_chain.rs +command: parse comments + +error: `//~|` comment not attached to anchoring matcher + --> tests/actual_tests/inline_chain.rs:5:26 + | +5 | //~| unused_variables + | ^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/joined_wrong_order.rs +command: parse comments + +error: `//~|` comment not attached to anchoring matcher + --> tests/actual_tests/joined_wrong_order.rs:5:8 + | +5 | //~| unused_mut + | ^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/lone_joined_pattern.rs +command: parse comments + +error: `//~|` comment not attached to anchoring matcher + --> tests/actual_tests/lone_joined_pattern.rs:2:8 + | +2 | //~| ERROR: mismatched types + | ^ + | + +error: `//~|` comment not attached to anchoring matcher + --> tests/actual_tests/lone_joined_pattern.rs:4:8 + | +4 | //~| ERROR: mismatched types + | ^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/pattern_too_many_arrow.rs +command: parse comments + +error: //~^ pattern is trying to refer to 7 lines above, but there are only 2 lines above + --> tests/actual_tests/pattern_too_many_arrow.rs:3:8 + | +3 | //~^^^^^^^ ERROR: mismatched types + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/pattern_too_many_arrow_above.rs +command: parse comments + +error: //~v pattern is trying to refer to line 8, but the file only has 6 lines + --> tests/actual_tests/pattern_too_many_arrow_above.rs:2:22 + | +2 | //~vvvvvv ERROR: mismatched types + | ^^^^^^^^^^^^^^^^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/rustc_ice.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustc_ice.rs" "-Ztreat-err-as-bug" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: test got exit status: 101, but expected 1 + = note: the compiler panicked + +error: `mismatched types` not found in diagnostics on line 8 + --> tests/actual_tests/rustc_ice.rs:9:17 + | +9 | //~^ ERROR: mismatched types + | ^^^^^^^^^^^^^^^^ expected because of this pattern + | + +error: there was 1 unmatched diagnostic + --> tests/actual_tests/rustc_ice.rs:8:9 + | +8 | add("42", 3); + | ^^^^ Ice: mismatched types + | + +full stderr: +error: internal compiler error[E0308]: mismatched types + --> tests/actual_tests/rustc_ice.rs:8:9 + | +8 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs: +aborting due to `-Z treat-err-as-bug=1` +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace + +error: the compiler unexpectedly panicked. this is a bug. + +note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md + +note: please make sure that you have updated to the latest nightly + + + +note: compiler flags: -Z treat-err-as-bug + +query stack during panic: +#0 [typeck] type-checking `main` +#1 [analysis] running analysis passes on this crate +end of query stack + +full stdout: + + + +FAILED TEST: tests/actual_tests/touching_above_below.rs +command: parse comments + +error: `//~v` comment immediately following a `//~^` comment chain + --> tests/actual_tests/touching_above_below.rs:4:8 + | +4 | //~v ERROR: mismatched types + | ^^^^^^^^^^^^^^^^^^^^^^^^^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/touching_above_below_chain.rs +command: parse comments + +error: `//~v` comment immediately following a `//~^` comment chain + --> tests/actual_tests/touching_above_below_chain.rs:5:8 + | +5 | //~v ERROR: unused variable + | ^^^^^^^^^^^^^^^^^^^^^^^^ + | + +full stderr: + +full stdout: + + +FAILURES: + tests/actual_tests/bad_pattern.rs + tests/actual_tests/bad_pattern_multiple.rs + tests/actual_tests/executable.rs (revision run) + tests/actual_tests/executable_compile_err.rs + tests/actual_tests/exit_code_fail.rs + tests/actual_tests/filters.rs + tests/actual_tests/foomp.rs + tests/actual_tests/foomp2.rs + tests/actual_tests/ice_annotations.rs + tests/actual_tests/inline_chain.rs + tests/actual_tests/joined_wrong_order.rs + tests/actual_tests/lone_joined_pattern.rs + tests/actual_tests/pattern_too_many_arrow.rs + tests/actual_tests/pattern_too_many_arrow_above.rs + tests/actual_tests/rustc_ice.rs + tests/actual_tests/touching_above_below.rs + tests/actual_tests/touching_above_below_chain.rs + +test result: FAIL. 17 failed; 1 passed + +Building dependencies ... ok +tests/actual_tests_bless/abort.rs ... ok +tests/actual_tests_bless/abort.rs (revision `run`) ... FAILED +tests/actual_tests_bless/aux_build_not_found.rs ... FAILED +tests/actual_tests_bless/aux_proc_macro_misuse.rs ... FAILED +Building aux file tests/actual_tests_bless/auxiliary/the_proc_macro.rs ... ok +tests/actual_tests_bless/aux_proc_macro_no_main.rs ... FAILED +tests/actual_tests_bless/compile_flags_quotes.rs ... FAILED +tests/actual_tests_bless/compiletest-rs-command.rs ... FAILED +tests/actual_tests_bless/edition_override.rs ... ok +tests/actual_tests_bless/failing_executable.rs ... ok +tests/actual_tests_bless/failing_executable.rs (revision `run`) ... FAILED +Building aux file tests/actual_tests_bless/auxiliary/foomp.rs ... ok +tests/actual_tests_bless/foomp_aux.rs ... ok +Building aux file tests/actual_tests_bless/auxiliary/nested.rs ... ok +tests/actual_tests_bless/nested_aux.rs ... ok +tests/actual_tests_bless/no_main.rs ... FAILED +tests/actual_tests_bless/no_main_manual.rs ... FAILED +tests/actual_tests_bless/no_test.rs ... FAILED +tests/actual_tests_bless/non_top_level_configs.rs ... FAILED +tests/actual_tests_bless/normalization_override.rs ... ok +tests/actual_tests_bless/pass.rs ... ok +tests/actual_tests_bless/pass_with_annotation.rs ... FAILED +tests/actual_tests_bless/revised_revision.rs ... FAILED +tests/actual_tests_bless/revisioned_executable.rs ... ok +tests/actual_tests_bless/revisioned_executable.rs (revision `run`) ... ok +tests/actual_tests_bless/revisioned_executable.rs (revision `panic`) ... ok +tests/actual_tests_bless/revisioned_executable.rs (revision `run.run`) ... ok +tests/actual_tests_bless/revisioned_executable.rs (revision `panic.run`) ... FAILED +tests/actual_tests_bless/revisioned_executable_panic.rs ... ok +tests/actual_tests_bless/revisioned_executable_panic.rs (revision `run`) ... ok +tests/actual_tests_bless/revisioned_executable_panic.rs (revision `panic`) ... ok +tests/actual_tests_bless/revisioned_executable_panic.rs (revision `run.run`) ... FAILED +tests/actual_tests_bless/revisioned_executable_panic.rs (revision `panic.run`) ... ok +tests/actual_tests_bless/revisions.rs ... ok +tests/actual_tests_bless/revisions.rs (revision `foo`) ... ok +tests/actual_tests_bless/revisions.rs (revision `bar`) ... ok +tests/actual_tests_bless/revisions_bad.rs ... ok +tests/actual_tests_bless/revisions_bad.rs (revision `foo`) ... ok +tests/actual_tests_bless/revisions_bad.rs (revision `bar`) ... FAILED +tests/actual_tests_bless/revisions_filter.rs ... ok +tests/actual_tests_bless/revisions_filter.rs (revision `foo`) ... ignored (in-test comment) +tests/actual_tests_bless/revisions_filter.rs (revision `bar`) ... ignored (in-test comment) +tests/actual_tests_bless/revisions_filter2.rs ... ok +tests/actual_tests_bless/revisions_filter2.rs (revision `foo`) ... ignored (in-test comment) +tests/actual_tests_bless/revisions_filter2.rs (revision `bar`) ... ok +tests/actual_tests_bless/revisions_multiple_per_annotation.rs ... ok +tests/actual_tests_bless/revisions_multiple_per_annotation.rs (revision `foo`) ... ok +tests/actual_tests_bless/revisions_multiple_per_annotation.rs (revision `bar`) ... ok +tests/actual_tests_bless/revisions_same_everywhere.rs ... ok +tests/actual_tests_bless/revisions_same_everywhere.rs (revision `foo`) ... ok +tests/actual_tests_bless/revisions_same_everywhere.rs (revision `bar`) ... ok +tests/actual_tests_bless/run_panic.rs ... ok +tests/actual_tests_bless/run_panic.rs (revision `run`) ... ok +tests/actual_tests_bless/rustfix-fail-revisions.rs ... ok +tests/actual_tests_bless/rustfix-fail-revisions.rs (revision `a`) ... ok +tests/actual_tests_bless/rustfix-fail-revisions.rs (revision `b`) ... ok +tests/actual_tests_bless/rustfix-fail-revisions.a.fixed ... FAILED +tests/actual_tests_bless/rustfix-fail-revisions.b.fixed ... FAILED +tests/actual_tests_bless/rustfix-fail.rs ... ok +tests/actual_tests_bless/rustfix-fail.fixed ... FAILED +tests/actual_tests_bless/unicode.rs ... FAILED +tests/actual_tests_bless/unknown_revision.rs ... FAILED +tests/actual_tests_bless/unknown_revision2.rs ... FAILED +tests/actual_tests_bless/wrong_diagnostic_code.rs ... FAILED + +FAILED TEST: tests/actual_tests_bless/abort.rs (revision `run`) +command: "$CMD" + +error: test got signal: 6 (SIGABRT), but expected 0 + = note: the test was expected to run successfully + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/aux_build_not_found.rs +command: canonicalizing path `tests/actual_tests_bless/auxiliary/aasdflkjasdlfjasdlfkjasdf` + +full stderr: +No such file or directory +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/aux_proc_macro_misuse.rs +command: parse comments + +error: proc macros are now auto-detected, you can remove the `:proc-macro` after the file name + --> tests/actual_tests_bless/aux_proc_macro_misuse.rs:1:32 + | +1 | //@aux-build:the_proc_macro.rs:proc-macro + | ^^^^^^^^^^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/aux_proc_macro_no_main.rs +command: "rustc" "--error-format=json" "--crate-type=lib" "--out-dir" "$TMP "tests/actual_tests_bless/aux_proc_macro_no_main.rs" "--extern" "the_proc_macro=$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests_bless/auxiliary/libthe_proc_macro.so" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/0/tests/actual_tests_bless/auxiliary" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: there was 1 unmatched diagnostic + --> tests/actual_tests_bless/aux_proc_macro_no_main.rs:7:8 + | +7 | thing!(cake); + | ^^^^ Error: expected one of `!` or `::`, found `` + | + +error: expected error patterns, but found none + +full stderr: +error: expected one of `!` or `::`, found `` + --> tests/actual_tests_bless/aux_proc_macro_no_main.rs:7:8 + | +7 | thing!(cake); + | ^^^^ expected one of `!` or `::` + +error: aborting due to 1 previous error + + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/compile_flags_quotes.rs +command: parse comments + +error: `compile-flag` is not a command known to `ui_test`, did you mean `compile-flags`? + --> tests/actual_tests_bless/compile_flags_quotes.rs:1:4 + | +1 | //@compile-flag: cake + | ^^^^^^^^^^^^ + | + +error: `-Z "cheese is good` contains an unclosed quotation mark + --> tests/actual_tests_bless/compile_flags_quotes.rs:3:19 + | +3 | //@compile-flags: -Z "cheese is good + | ^^^^^^^^^^^^^^^^^^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/compiletest-rs-command.rs +command: parse comments + +error: a compiletest-rs style comment was detected. +Please use text that could not also be interpreted as a command, +and prefix all actual commands with `//@` + --> tests/actual_tests_bless/compiletest-rs-command.rs:1:3 + | +1 | //aux-build:foomp.rs + | ^^^^^^^^^^^^^^^^^^ + | + +error: a compiletest-rs style comment was detected. +Please use text that could not also be interpreted as a command, +and prefix all actual commands with `//@` + --> tests/actual_tests_bless/compiletest-rs-command.rs:2:4 + | +2 | // aux-build:asf.rs + | ^^^^^^^^^^^^^^^^ + | + +error: comment looks suspiciously like a test suite command: `@aux-build:asldkfjasldfj.rs` +All `//@` test suite commands must be at the start of the line. +The `//` must be directly followed by `@` or `~`. + --> tests/actual_tests_bless/compiletest-rs-command.rs:4:4 + | +4 | // @aux-build:asldkfjasldfj.rs + | ^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/failing_executable.rs (revision `run`) +command: "$CMD" + +error: test got exit status: 101, but expected 0 + --> tests/actual_tests_bless/failing_executable.rs:4:5 + | +4 | assert_eq!(5, 6); + | ^^^^^^^^^^^^^^^^^ assertion `left == right` failed + | + +full stderr: +thread 'main' panicked at tests/actual_tests_bless/failing_executable.rs: +assertion `left == right` failed + left: 5 + right: 6 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/no_main.rs +command: "rustc" "--error-format=json" "--crate-type=lib" "--out-dir" "$TMP "tests/actual_tests_bless/no_main.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: test got exit status: 0, but expected 1 + = note: compilation succeeded, but was expected to fail + +error: expected error patterns, but found none + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/no_main_manual.rs +command: "rustc" "--error-format=json" "--crate-type=lib" "--out-dir" "$TMP "tests/actual_tests_bless/no_main_manual.rs" "--crate-type=bin" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: there was 1 unmatched diagnostic that occurred outside the testfile and had no pattern + Error: cannot mix `bin` crate type with others + +error: there was 1 unmatched diagnostic + --> tests/actual_tests_bless/no_main_manual.rs:3:16 + | +3 | pub fn foo() {} + | ^ Error[E0601]: `main` function not found in crate `no_main_manual` + | + +error: expected error patterns, but found none + +full stderr: +error: cannot mix `bin` crate type with others + +error[E0601]: `main` function not found in crate `no_main_manual` + --> tests/actual_tests_bless/no_main_manual.rs:3:16 + | +3 | pub fn foo() {} + | ^ consider adding a `main` function to `tests/actual_tests_bless/no_main_manual.rs` + +error: aborting due to 2 previous errors + +For more information about this error, try `rustc --explain E0601`. + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/no_test.rs +command: "rustc" "--error-format=json" "--test" "--out-dir" "$TMP "tests/actual_tests_bless/no_test.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: test got exit status: 0, but expected 1 + = note: compilation succeeded, but was expected to fail + +error: expected error patterns, but found none + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/non_top_level_configs.rs +command: parse comments + +error: comment looks suspiciously like a test suite command: `@check-pass` +All `//@` test suite commands must be at the start of the line. +The `//` must be directly followed by `@` or `~`. + --> tests/actual_tests_bless/non_top_level_configs.rs:1:5 + | +1 | ////@check-pass + | ^ + | + +error: comment looks suspiciously like a test suite command: `@ignore-target-cheesecake` +All `//@` test suite commands must be at the start of the line. +The `//` must be directly followed by `@` or `~`. + --> tests/actual_tests_bless/non_top_level_configs.rs:4:7 + | +4 | //@ignore-target-cheesecake + | ^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/pass_with_annotation.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/pass_with_annotation.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: `the cake is a lie` not found in diagnostics on line 3 + --> tests/actual_tests_bless/pass_with_annotation.rs:3:12 + | +3 | //~ ERROR: the cake is a lie + | ^^^^^^^^^^^^^^^^^ expected because of this pattern + | + +error: error pattern found in pass test + --> tests/actual_tests_bless/pass_with_annotation.rs:3:12 + | +3 | //~ ERROR: the cake is a lie + | ^^^^^^^^^^^^^^^^^ expected because of this annotation + | + ::: tests/actual_tests_bless/pass_with_annotation.rs:1:4 + | +1 | //@check-pass + | ^^^^^^^^^^ expected because of this mode change + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/revised_revision.rs +command: parse comments + +error: revisions cannot be declared under a revision + --> tests/actual_tests_bless/revised_revision.rs:2:5 + | +2 | //@[foo] revisions: foo bar + | ^^^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/revisioned_executable.rs (revision `panic.run`) +command: "$CMD" + +error: test got exit status: 0, but expected 101 + = note: the test was expected to panic + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/revisioned_executable_panic.rs (revision `run.run`) +command: "$CMD" + +error: test got exit status: 101, but expected 0 + --> tests/actual_tests_bless/revisioned_executable_panic.rs + | +6 | panic!() + | ^^^^^^^^ explicit panic + | + +full stderr: +thread 'main' panicked at tests/actual_tests_bless/revisioned_executable_panic.rs: +explicit panic +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/revisions_bad.rs (revision `bar`) +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/revisions_bad.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" "--cfg=bar" "-Cextra-filename=bar" + +error: ``main` function not found in crate `revisions_bad`` not found in diagnostics outside the testfile + --> tests/actual_tests_bless/revisions_bad.rs:4:31 + | +4 | //@[bar] error-in-other-file: `main` function not found in crate `revisions_bad` + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected because of this pattern + | + +error: there was 1 unmatched diagnostic + --> tests/actual_tests_bless/revisions_bad.rs:10:2 + | +10 | } + | ^ Error[E0601]: `main` function not found in crate `revisions_bad` + | + +full stderr: +error[E0601]: `main` function not found in crate `revisions_bad` + --> tests/actual_tests_bless/revisions_bad.rs:10:2 + | +10 | } + | ^ consider adding a `main` function to `tests/actual_tests_bless/revisions_bad.rs` + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0601`. + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/rustfix-fail-revisions.a.fixed +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/rustfix-fail-revisions.a.fixed" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" "--crate-name" "__rustfix_fail_revisions_1" + +error: test got exit status: 1, but expected 0 + --> tests/actual_tests_bless/rustfix-fail-revisions.a.fixed:2:9 + | +2 | #![deny(warnings)] + | ^^^^^^^^ after rustfix is applied, all errors should be gone, but weren't + | + +full stderr: +error: path statement drops value + --> tests/actual_tests_bless/rustfix-fail-revisions.a.fixed:11:5 + | +11 | x; + | ^^ help: use `drop` to clarify the intent: `drop(x);` + | +note: the lint level is defined here + --> tests/actual_tests_bless/rustfix-fail-revisions.a.fixed:2:9 + | +2 | #![deny(warnings)] + | ^^^^^^^^ + = note: `#[deny(path_statements)]` implied by `#[deny(warnings)]` + +error: aborting due to 1 previous error + + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/rustfix-fail-revisions.b.fixed +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/rustfix-fail-revisions.b.fixed" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" "--crate-name" "__rustfix_fail_revisions_1" + +error: test got exit status: 1, but expected 0 + --> tests/actual_tests_bless/rustfix-fail-revisions.b.fixed:2:9 + | +2 | #![deny(warnings)] + | ^^^^^^^^ after rustfix is applied, all errors should be gone, but weren't + | + +full stderr: +error: path statement drops value + --> tests/actual_tests_bless/rustfix-fail-revisions.b.fixed:11:5 + | +11 | x; + | ^^ help: use `drop` to clarify the intent: `drop(x);` + | +note: the lint level is defined here + --> tests/actual_tests_bless/rustfix-fail-revisions.b.fixed:2:9 + | +2 | #![deny(warnings)] + | ^^^^^^^^ + = note: `#[deny(path_statements)]` implied by `#[deny(warnings)]` + +error: aborting due to 1 previous error + + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/rustfix-fail.fixed +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/rustfix-fail.fixed" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" "--crate-name" "__rustfix_fail_1" + +error: test got exit status: 1, but expected 0 + --> tests/actual_tests_bless/rustfix-fail.fixed:1:9 + | +1 | #![deny(warnings)] + | ^^^^^^^^ after rustfix is applied, all errors should be gone, but weren't + | + +full stderr: +error: path statement drops value + --> tests/actual_tests_bless/rustfix-fail.fixed:10:5 + | +10 | x; + | ^^ help: use `drop` to clarify the intent: `drop(x);` + | +note: the lint level is defined here + --> tests/actual_tests_bless/rustfix-fail.fixed:1:9 + | +1 | #![deny(warnings)] + | ^^^^^^^^ + = note: `#[deny(path_statements)]` implied by `#[deny(warnings)]` + +error: aborting due to 1 previous error + + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/unicode.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/unicode.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: test got exit status: 0, but expected 1 + = note: compilation succeeded, but was expected to fail + +error: expected error patterns, but found none + +full stderr: +warning: unused variable: `Ě电脑` + --> tests/actual_tests_bless/unicode.rs:7:9 + | +7 | let Ě电脑 = 1; + | ^^^^^ help: if this is intentional, prefix it with an underscore: `_Ě电脑` + | + = note: `#[warn(unused_variables)]` on by default + +warning: variable `Ě电脑` should have a snake case name + --> tests/actual_tests_bless/unicode.rs:7:9 + | +7 | let Ě电脑 = 1; + | ^^^^^ help: convert the identifier to snake case: `ě电脑` + | + = note: `#[warn(non_snake_case)]` on by default + +warning: 2 warnings emitted + + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/unknown_revision.rs +command: parse comments + +error: there are no revisions in this test + --> tests/actual_tests_bless/unknown_revision.rs:3:9 + | +3 | //~[cake, lie] ERROR: kawoom + | ^^^^^^^^^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/unknown_revision2.rs +command: parse comments + +error: the revision `cake` is not known + --> tests/actual_tests_bless/unknown_revision2.rs:5:9 + | +5 | //~[cake, lie] ERROR: kawoom + | ^^^^^^^^^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests_bless/wrong_diagnostic_code.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless/wrong_diagnostic_code.rs" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" + +error: diagnostic code `should_be_dead_code` not found on line 3 + --> tests/actual_tests_bless/wrong_diagnostic_code.rs:4:10 + | +4 | //~^ should_be_dead_code + | ^^^^^^^^^^^^^^^^^^^ expected because of this pattern + | + +error: there was 1 unmatched diagnostic + --> tests/actual_tests_bless/wrong_diagnostic_code.rs:3:4 + | +3 | fn foo() -> i32 { + | ^^^ Error[dead_code]: function `foo` is never used + | + +full stderr: +error: unreachable expression + --> tests/actual_tests_bless/wrong_diagnostic_code.rs:6:5 + | +5 | panic!(); + | -------- any code following this expression is unreachable +6 | 0 + | ^ unreachable expression + | +note: the lint level is defined here + --> tests/actual_tests_bless/wrong_diagnostic_code.rs:1:20 + | +1 | #![deny(dead_code, unreachable_code)] + | ^^^^^^^^^^^^^^^^ + +error: function `foo` is never used + --> tests/actual_tests_bless/wrong_diagnostic_code.rs:3:4 + | +3 | fn foo() -> i32 { + | ^^^ + | +note: the lint level is defined here + --> tests/actual_tests_bless/wrong_diagnostic_code.rs:1:9 + | +1 | #![deny(dead_code, unreachable_code)] + | ^^^^^^^^^ + +error: aborting due to 2 previous errors + + +full stdout: + + +FAILURES: + tests/actual_tests_bless/abort.rs (revision run) + tests/actual_tests_bless/aux_build_not_found.rs + tests/actual_tests_bless/aux_proc_macro_misuse.rs + tests/actual_tests_bless/aux_proc_macro_no_main.rs + tests/actual_tests_bless/compile_flags_quotes.rs + tests/actual_tests_bless/compiletest-rs-command.rs + tests/actual_tests_bless/failing_executable.rs (revision run) + tests/actual_tests_bless/no_main.rs + tests/actual_tests_bless/no_main_manual.rs + tests/actual_tests_bless/no_test.rs + tests/actual_tests_bless/non_top_level_configs.rs + tests/actual_tests_bless/pass_with_annotation.rs + tests/actual_tests_bless/revised_revision.rs + tests/actual_tests_bless/revisioned_executable.rs (revision panic.run) + tests/actual_tests_bless/revisioned_executable_panic.rs (revision run.run) + tests/actual_tests_bless/revisions_bad.rs (revision bar) + tests/actual_tests_bless/rustfix-fail-revisions.a.fixed + tests/actual_tests_bless/rustfix-fail-revisions.b.fixed + tests/actual_tests_bless/rustfix-fail.fixed + tests/actual_tests_bless/unicode.rs + tests/actual_tests_bless/unknown_revision.rs + tests/actual_tests_bless/unknown_revision2.rs + tests/actual_tests_bless/wrong_diagnostic_code.rs + +test result: FAIL. 23 failed; 26 passed; 3 ignored + +Building dependencies ... ok +tests/actual_tests_bless_yolo/revisions_bad.rs ... ok +tests/actual_tests_bless_yolo/revisions_bad.rs (revision `foo`) ... ok +tests/actual_tests_bless_yolo/revisions_bad.rs (revision `bar`) ... ok +tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs ... ok +tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.fixed ... ok +tests/actual_tests_bless_yolo/rustfix-multiple-fail.rs ... ok +tests/actual_tests_bless_yolo/rustfix-multiple-fail.1.fixed ... ok +tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed ... FAILED +tests/actual_tests_bless_yolo/rustfix-multiple-fail.3.fixed ... ok + +FAILED TEST: tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" "--crate-name" "__rustfix_multiple_fail_2" + +error: test got exit status: 1, but expected 0 + --> tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed:1:8 + | +1 | pub fn f(_: &i32) -> &i32 { + | ^ after rustfix is applied, all errors should be gone, but weren't + | + +full stderr: +error[E0308]: mismatched types + --> tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed:7:7 + | +7 | f(1); + | - ^ expected `&i32`, found integer + | | + | arguments to this function are incorrect + | +note: function defined here + --> tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed:1:8 + | +1 | pub fn f(_: &i32) -> &i32 { + | ^ ------- +help: consider borrowing here + | +7 | f(&1); + | + + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. + +full stdout: + + +FAILURES: + tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed + +test result: FAIL. 1 failed; 7 passed + +tests/actual_tests/bad_pattern.rs ... FAILED +tests/actual_tests/bad_pattern_multiple.rs ... FAILED +tests/actual_tests/executable.rs ... FAILED +tests/actual_tests/executable_compile_err.rs ... FAILED +tests/actual_tests/exit_code_fail.rs ... FAILED +tests/actual_tests/filters.rs ... FAILED +tests/actual_tests/foomp.rs ... FAILED +tests/actual_tests/foomp2.rs ... FAILED +tests/actual_tests/ice_annotations.rs ... FAILED +tests/actual_tests/inline_chain.rs ... FAILED +tests/actual_tests/joined_wrong_order.rs ... FAILED +tests/actual_tests/lone_joined_pattern.rs ... FAILED +tests/actual_tests/pattern_too_many_arrow.rs ... FAILED +tests/actual_tests/pattern_too_many_arrow_above.rs ... FAILED +tests/actual_tests/rustc_ice.rs ... FAILED +tests/actual_tests/touching_above_below.rs ... FAILED +tests/actual_tests/touching_above_below_chain.rs ... FAILED + +FAILED TEST: tests/actual_tests/bad_pattern.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/bad_pattern.rs" "--edition" "2021" + +error: actual output differed from expected +Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/bad_pattern.stderr` to the actual output +--- tests/actual_tests/bad_pattern.stderr ++++ +-error[E0308]: mismatched types ++error[E0432]: unresolved import `basic_fail` +- --> tests/actual_tests/bad_pattern.rs:4:9 ++ --> tests/actual_tests/bad_pattern.rs:1:5 + | +-4 | add("42", 3); +- | --- ^^^^ expected `usize`, found `&str` +- | | +- | arguments to this function are incorrect +- | +-note: function defined here +- --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC +- | +-1 | pub fn add(left: usize, right: usize) -> usize { +- | ^^^ ++1 | use basic_fail::add; ++ | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` + +-error: aborting due to previous error ++error: aborting due to 1 previous error + +-For more information about this error, try `rustc --explain E0308`. ++For more information about this error, try `rustc --explain E0432`. + +Full unnormalized output: +error[E0432]: unresolved import `basic_fail` + --> tests/actual_tests/bad_pattern.rs:1:5 + | +1 | use basic_fail::add; + | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0432`. + + +error: `miesmätsched types` not found in diagnostics on line 4 + --> tests/actual_tests/bad_pattern.rs:5:17 + | +5 | //~^ ERROR: miesmätsched types + | ^^^^^^^^^^^^^^^^^^ expected because of this pattern + | + +error: there was 1 unmatched diagnostic + --> tests/actual_tests/bad_pattern.rs:1:5 + | +1 | use basic_fail::add; + | ^^^^^^^^^^ Error[E0432]: unresolved import `basic_fail` + | + + +FAILED TEST: tests/actual_tests/bad_pattern_multiple.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/bad_pattern_multiple.rs" "--edition" "2021" + +error: actual output differed from expected +Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/bad_pattern_multiple.stderr` to the actual output +--- tests/actual_tests/bad_pattern_multiple.stderr ++++ +-error[E0308]: mismatched types ++error[E0432]: unresolved import `basic_fail` +- --> tests/actual_tests/bad_pattern_multiple.rs:4:9 ++ --> tests/actual_tests/bad_pattern_multiple.rs:1:5 + | +-4 | add("42", 3); +- | --- ^^^^ expected `usize`, found `&str` +- | | +- | arguments to this function are incorrect +- | +-note: function defined here +- --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC +- | +-1 | pub fn add(left: usize, right: usize) -> usize { +- | ^^^ ++1 | use basic_fail::add; ++ | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` + +-error[E0308]: mismatched types +- --> tests/actual_tests/bad_pattern_multiple.rs:6:9 +- | +-6 | add("42", 3); +- | --- ^^^^ expected `usize`, found `&str` +- | | +- | arguments to this function are incorrect +- | +-note: function defined here +- --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC +- | +-1 | pub fn add(left: usize, right: usize) -> usize { +- | ^^^ ++error: aborting due to 1 previous error + +- error: aborting due to 2 previous errors +- +-For more information about this error, try `rustc --explain E0308`. ++For more information about this error, try `rustc --explain E0432`. + +Full unnormalized output: +error[E0432]: unresolved import `basic_fail` + --> tests/actual_tests/bad_pattern_multiple.rs:1:5 + | +1 | use basic_fail::add; + | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0432`. + + +error: `miesmätsched types` not found in diagnostics on line 4 + --> tests/actual_tests/bad_pattern_multiple.rs:5:17 + | +5 | //~^ ERROR: miesmätsched types + | ^^^^^^^^^^^^^^^^^^ expected because of this pattern + | + +error: `miesmätsched types` not found in diagnostics on line 6 + --> tests/actual_tests/bad_pattern_multiple.rs:7:17 + | +7 | //~^ ERROR: miesmätsched types + | ^^^^^^^^^^^^^^^^^^ expected because of this pattern + | + +error: there was 1 unmatched diagnostic + --> tests/actual_tests/bad_pattern_multiple.rs:1:5 + | +1 | use basic_fail::add; + | ^^^^^^^^^^ Error[E0432]: unresolved import `basic_fail` + | + + +FAILED TEST: tests/actual_tests/executable.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/executable.rs" "--edition" "2021" + +error: test got exit status: 1, but expected 0 + --> tests/actual_tests/executable.rs:3:4 + | +3 | //@run + | ^^^ compilation failed, but was expected to succeed + | + +error: no output was expected +Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/executable.stderr` to the actual output ++++ +error[E0432]: unresolved import `basic_fail` + --> tests/actual_tests/executable.rs:1:5 + | +1 | use basic_fail::add; + | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0432`. + + + +FAILED TEST: tests/actual_tests/executable_compile_err.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/executable_compile_err.rs" "--edition" "2021" + +error: test got exit status: 1, but expected 0 + --> tests/actual_tests/executable_compile_err.rs:1:4 + | +1 | //@run + | ^^^ compilation failed, but was expected to succeed + | + +error: no output was expected +Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/executable_compile_err.stderr` to the actual output ++++ +error: this file contains an unclosed delimiter + --> tests/actual_tests/executable_compile_err.rs:4:2 + | +3 | fn main() { + | - unclosed delimiter +4 | + | ^ + +error: aborting due to 1 previous error + + + + +FAILED TEST: tests/actual_tests/exit_code_fail.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/exit_code_fail.rs" "--edition" "2021" + +error: test got exit status: 0, but expected 1 + = note: compilation succeeded, but was expected to fail + +error: expected error patterns, but found none + + +FAILED TEST: tests/actual_tests/filters.rs +command: parse comments + +error: `x86_64` is not a valid condition, expected `on-host`, /[0-9]+bit/, /host-.*/, or /target-.*/ + --> tests/actual_tests/filters.rs:1:9 + | +1 | //@only-x86_64 + | ^^^^^^ + | + + +FAILED TEST: tests/actual_tests/foomp.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/foomp.rs" "--edition" "2021" + +error: actual output differed from expected +Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/foomp.stderr` to the actual output +--- tests/actual_tests/foomp.stderr ++++ +-error[E0308]: mismatched types ++error[E0432]: unresolved import `basic_fail` +- --> tests/actual_tests/foomp.rs:4:9 ++ --> tests/actual_tests/foomp.rs:1:5 + | +-4 | add("42", 3); +- | --- ^^^^ expected `usize`, found `&str` +- | +-note: function defined here +- --> $DIR/tests/integrations/basic/src/lib.rs:LL:CC +- | +-1 | pub fn add(left: usize, right: usize) -> usize { +- | ^^^ some expected text that isn't in the actual message ++1 | use basic_fail::add; ++ | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` + +-error: aborting doo to previous error ++error: aborting due to 1 previous error + +-For more information about this error, try `rustc --explain E0308`. ++For more information about this error, try `rustc --explain E0432`. + +Full unnormalized output: +error[E0432]: unresolved import `basic_fail` + --> tests/actual_tests/foomp.rs:1:5 + | +1 | use basic_fail::add; + | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0432`. + + +error: `mismatched types` not found in diagnostics on line 4 + --> tests/actual_tests/foomp.rs:5:17 + | +5 | //~^ ERROR: mismatched types + | ^^^^^^^^^^^^^^^^ expected because of this pattern + | + +error: there was 1 unmatched diagnostic + --> tests/actual_tests/foomp.rs:1:5 + | +1 | use basic_fail::add; + | ^^^^^^^^^^ Error[E0432]: unresolved import `basic_fail` + | + + +FAILED TEST: tests/actual_tests/foomp2.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/foomp2.rs" "--edition" "2021" + +error: actual output differed from expected +Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/foomp2.stderr` to the actual output +--- tests/actual_tests/foomp2.stderr ++++ +-error[E0308]: mismatched types ++error[E0432]: unresolved import `basic_fail` +- --> tests/actual_tests/foomp2.rs:4:9 ++ --> tests/actual_tests/foomp2.rs:1:5 + | +-4 | add("42", 3); +- | --- ^^^^ expected `usize`, found `&str` +- | | +- | arguments to this function are incorrect +- | +-note: function defined here +- --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC +- | +-1 | pub fn add(left: usize, right: usize) -> usize { +- | ^^^ ++1 | use basic_fail::add; ++ | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` + +-error: aborting due to previous error ++error: aborting due to 1 previous error + +-For more information about this error, try `rustc --explain E0308`. ++For more information about this error, try `rustc --explain E0432`. + +Full unnormalized output: +error[E0432]: unresolved import `basic_fail` + --> tests/actual_tests/foomp2.rs:1:5 + | +1 | use basic_fail::add; + | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0432`. + + +error: `mismatched types` not found in diagnostics on line 4 + --> tests/actual_tests/foomp2.rs:5:17 + | +5 | //~^ ERROR: mismatched types + | ^^^^^^^^^^^^^^^^ expected because of this pattern + | + +error: there was 1 unmatched diagnostic + --> tests/actual_tests/foomp2.rs:1:5 + | +1 | use basic_fail::add; + | ^^^^^^^^^^ Error[E0432]: unresolved import `basic_fail` + | + + +FAILED TEST: tests/actual_tests/ice_annotations.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/ice_annotations.rs" "-Ztreat-err-as-bug" "--edition" "2021" + +error: test got exit status: 101, but expected 1 + = note: the compiler panicked + +error: no output was expected +Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/ice_annotations.stderr` to the actual output ++++ +error: internal compiler error[E0432]: unresolved import `basic_fail` + --> tests/actual_tests/ice_annotations.rs:5:5 + | +5 | use basic_fail::add; + | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` + +thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs: +aborting due to `-Z treat-err-as-bug=1` +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace + +error: the compiler unexpectedly panicked. this is a bug. + +note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md + +note: please make sure that you have updated to the latest nightly + + + +note: compiler flags: -Z treat-err-as-bug + +query stack during panic: +#0 [resolver_for_lowering_raw] getting the resolver for lowering +end of query stack + + +error: `mismatched types` not found in diagnostics on line 8 + --> tests/actual_tests/ice_annotations.rs:9:15 + | +9 | //~^ ICE: mismatched types + | ^^^^^^^^^^^^^^^^ expected because of this pattern + | + +error: there was 1 unmatched diagnostic + --> tests/actual_tests/ice_annotations.rs:5:5 + | +5 | use basic_fail::add; + | ^^^^^^^^^^ Ice: unresolved import `basic_fail` + | + + +FAILED TEST: tests/actual_tests/inline_chain.rs +command: parse comments + +error: `//~|` comment not attached to anchoring matcher + --> tests/actual_tests/inline_chain.rs:5:26 + | +5 | //~| unused_variables + | ^ + | + + +FAILED TEST: tests/actual_tests/joined_wrong_order.rs +command: parse comments + +error: `//~|` comment not attached to anchoring matcher + --> tests/actual_tests/joined_wrong_order.rs:5:8 + | +5 | //~| unused_mut + | ^ + | + + +FAILED TEST: tests/actual_tests/lone_joined_pattern.rs +command: parse comments + +error: `//~|` comment not attached to anchoring matcher + --> tests/actual_tests/lone_joined_pattern.rs:2:8 + | +2 | //~| ERROR: mismatched types + | ^ + | + +error: `//~|` comment not attached to anchoring matcher + --> tests/actual_tests/lone_joined_pattern.rs:4:8 + | +4 | //~| ERROR: mismatched types + | ^ + | + + +FAILED TEST: tests/actual_tests/pattern_too_many_arrow.rs +command: parse comments + +error: //~^ pattern is trying to refer to 7 lines above, but there are only 2 lines above + --> tests/actual_tests/pattern_too_many_arrow.rs:3:8 + | +3 | //~^^^^^^^ ERROR: mismatched types + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + + +FAILED TEST: tests/actual_tests/pattern_too_many_arrow_above.rs +command: parse comments + +error: //~v pattern is trying to refer to line 8, but the file only has 6 lines + --> tests/actual_tests/pattern_too_many_arrow_above.rs:2:22 + | +2 | //~vvvvvv ERROR: mismatched types + | ^^^^^^^^^^^^^^^^ + | + + +FAILED TEST: tests/actual_tests/rustc_ice.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustc_ice.rs" "-Ztreat-err-as-bug" "--edition" "2021" + +error: test got exit status: 101, but expected 1 + = note: the compiler panicked + +error: actual output differed from expected +Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/rustc_ice.stderr` to the actual output +--- tests/actual_tests/rustc_ice.stderr ++++ +-error: internal compiler error[E0308]: mismatched types ++error: internal compiler error[E0432]: unresolved import `basic_fail` +- --> tests/actual_tests/rustc_ice.rs:8:9 ++ --> tests/actual_tests/rustc_ice.rs:5:5 + | +-8 | add("42", 3); +- | --- ^^^^ expected `usize`, found `&str` +- | | +- | arguments to this function are incorrect +- | +-note: function defined here +- --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC +- | +-1 | pub fn add(left: usize, right: usize) -> usize { +- | ^^^ ++5 | use basic_fail::add; ++ | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` + + thread 'rustc' panicked + +Full unnormalized output: +error: internal compiler error[E0432]: unresolved import `basic_fail` + --> tests/actual_tests/rustc_ice.rs:5:5 + | +5 | use basic_fail::add; + | ^^^^^^^^^^ use of undeclared crate or module `basic_fail` + +thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs: +aborting due to `-Z treat-err-as-bug=1` +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace + +error: the compiler unexpectedly panicked. this is a bug. + +note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md + +note: please make sure that you have updated to the latest nightly + + + +note: compiler flags: -Z treat-err-as-bug + +query stack during panic: +#0 [resolver_for_lowering_raw] getting the resolver for lowering +end of query stack + + +error: `mismatched types` not found in diagnostics on line 8 + --> tests/actual_tests/rustc_ice.rs:9:17 + | +9 | //~^ ERROR: mismatched types + | ^^^^^^^^^^^^^^^^ expected because of this pattern + | + +error: there was 1 unmatched diagnostic + --> tests/actual_tests/rustc_ice.rs:5:5 + | +5 | use basic_fail::add; + | ^^^^^^^^^^ Ice: unresolved import `basic_fail` + | + + +FAILED TEST: tests/actual_tests/touching_above_below.rs +command: parse comments + +error: `//~v` comment immediately following a `//~^` comment chain + --> tests/actual_tests/touching_above_below.rs:4:8 + | +4 | //~v ERROR: mismatched types + | ^^^^^^^^^^^^^^^^^^^^^^^^^ + | + + +FAILED TEST: tests/actual_tests/touching_above_below_chain.rs +command: parse comments + +error: `//~v` comment immediately following a `//~^` comment chain + --> tests/actual_tests/touching_above_below_chain.rs:5:8 + | +5 | //~v ERROR: unused variable + | ^^^^^^^^^^^^^^^^^^^^^^^^ + | + +FAILURES: + tests/actual_tests/bad_pattern.rs + tests/actual_tests/bad_pattern_multiple.rs + tests/actual_tests/executable.rs + tests/actual_tests/executable_compile_err.rs + tests/actual_tests/exit_code_fail.rs + tests/actual_tests/filters.rs + tests/actual_tests/foomp.rs + tests/actual_tests/foomp2.rs + tests/actual_tests/ice_annotations.rs + tests/actual_tests/inline_chain.rs + tests/actual_tests/joined_wrong_order.rs + tests/actual_tests/lone_joined_pattern.rs + tests/actual_tests/pattern_too_many_arrow.rs + tests/actual_tests/pattern_too_many_arrow_above.rs + tests/actual_tests/rustc_ice.rs + tests/actual_tests/touching_above_below.rs + tests/actual_tests/touching_above_below_chain.rs + +test result: FAIL. 17 failed + +tests/actual_tests/bad_pattern.rs ... FAILED +tests/actual_tests/bad_pattern_multiple.rs ... FAILED +tests/actual_tests/executable.rs ... FAILED +tests/actual_tests/executable_compile_err.rs ... FAILED +tests/actual_tests/exit_code_fail.rs ... FAILED +tests/actual_tests/filters.rs ... FAILED +tests/actual_tests/foomp.rs ... FAILED +tests/actual_tests/foomp2.rs ... FAILED +tests/actual_tests/ice_annotations.rs ... FAILED +tests/actual_tests/inline_chain.rs ... FAILED +tests/actual_tests/joined_wrong_order.rs ... FAILED +tests/actual_tests/lone_joined_pattern.rs ... FAILED +tests/actual_tests/pattern_too_many_arrow.rs ... FAILED +tests/actual_tests/pattern_too_many_arrow_above.rs ... FAILED +tests/actual_tests/rustc_ice.rs ... FAILED +tests/actual_tests/touching_above_below.rs ... FAILED +tests/actual_tests/touching_above_below_chain.rs ... FAILED + +FAILED TEST: tests/actual_tests/bad_pattern.rs +command: "$CMD" "tests/actual_tests/bad_pattern.rs" "--edition" "2021" + +full stderr: +No such file or directory +full stdout: +could not spawn `"invalid_foobarlaksdfalsdfj"` as a process + + +FAILED TEST: tests/actual_tests/bad_pattern_multiple.rs +command: "$CMD" "tests/actual_tests/bad_pattern_multiple.rs" "--edition" "2021" + +full stderr: +No such file or directory +full stdout: +could not spawn `"invalid_foobarlaksdfalsdfj"` as a process + + +FAILED TEST: tests/actual_tests/executable.rs +command: "$CMD" "tests/actual_tests/executable.rs" "--edition" "2021" + +full stderr: +No such file or directory +full stdout: +could not spawn `"invalid_foobarlaksdfalsdfj"` as a process + + +FAILED TEST: tests/actual_tests/executable_compile_err.rs +command: "$CMD" "tests/actual_tests/executable_compile_err.rs" "--edition" "2021" + +full stderr: +No such file or directory +full stdout: +could not spawn `"invalid_foobarlaksdfalsdfj"` as a process + + +FAILED TEST: tests/actual_tests/exit_code_fail.rs +command: "$CMD" "tests/actual_tests/exit_code_fail.rs" "--edition" "2021" + +full stderr: +No such file or directory +full stdout: +could not spawn `"invalid_foobarlaksdfalsdfj"` as a process + + +FAILED TEST: tests/actual_tests/filters.rs +command: parse comments + +error: `x86_64` is not a valid condition, expected `on-host`, /[0-9]+bit/, /host-.*/, or /target-.*/ + --> tests/actual_tests/filters.rs:1:9 + | +1 | //@only-x86_64 + | ^^^^^^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/foomp.rs +command: "$CMD" "tests/actual_tests/foomp.rs" "--edition" "2021" + +full stderr: +No such file or directory +full stdout: +could not spawn `"invalid_foobarlaksdfalsdfj"` as a process + + +FAILED TEST: tests/actual_tests/foomp2.rs +command: "$CMD" "tests/actual_tests/foomp2.rs" "--edition" "2021" + +full stderr: +No such file or directory +full stdout: +could not spawn `"invalid_foobarlaksdfalsdfj"` as a process + + +FAILED TEST: tests/actual_tests/ice_annotations.rs +command: "$CMD" "tests/actual_tests/ice_annotations.rs" "-Ztreat-err-as-bug" "--edition" "2021" + +full stderr: +No such file or directory +full stdout: +could not spawn `"invalid_foobarlaksdfalsdfj"` as a process + + +FAILED TEST: tests/actual_tests/inline_chain.rs +command: parse comments + +error: `//~|` comment not attached to anchoring matcher + --> tests/actual_tests/inline_chain.rs:5:26 + | +5 | //~| unused_variables + | ^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/joined_wrong_order.rs +command: parse comments + +error: `//~|` comment not attached to anchoring matcher + --> tests/actual_tests/joined_wrong_order.rs:5:8 + | +5 | //~| unused_mut + | ^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/lone_joined_pattern.rs +command: parse comments + +error: `//~|` comment not attached to anchoring matcher + --> tests/actual_tests/lone_joined_pattern.rs:2:8 + | +2 | //~| ERROR: mismatched types + | ^ + | + +error: `//~|` comment not attached to anchoring matcher + --> tests/actual_tests/lone_joined_pattern.rs:4:8 + | +4 | //~| ERROR: mismatched types + | ^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/pattern_too_many_arrow.rs +command: parse comments + +error: //~^ pattern is trying to refer to 7 lines above, but there are only 2 lines above + --> tests/actual_tests/pattern_too_many_arrow.rs:3:8 + | +3 | //~^^^^^^^ ERROR: mismatched types + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/pattern_too_many_arrow_above.rs +command: parse comments + +error: //~v pattern is trying to refer to line 8, but the file only has 6 lines + --> tests/actual_tests/pattern_too_many_arrow_above.rs:2:22 + | +2 | //~vvvvvv ERROR: mismatched types + | ^^^^^^^^^^^^^^^^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/rustc_ice.rs +command: "$CMD" "tests/actual_tests/rustc_ice.rs" "-Ztreat-err-as-bug" "--edition" "2021" + +full stderr: +No such file or directory +full stdout: +could not spawn `"invalid_foobarlaksdfalsdfj"` as a process + + +FAILED TEST: tests/actual_tests/touching_above_below.rs +command: parse comments + +error: `//~v` comment immediately following a `//~^` comment chain + --> tests/actual_tests/touching_above_below.rs:4:8 + | +4 | //~v ERROR: mismatched types + | ^^^^^^^^^^^^^^^^^^^^^^^^^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/touching_above_below_chain.rs +command: parse comments + +error: `//~v` comment immediately following a `//~^` comment chain + --> tests/actual_tests/touching_above_below_chain.rs:5:8 + | +5 | //~v ERROR: unused variable + | ^^^^^^^^^^^^^^^^^^^^^^^^ + | + +full stderr: + +full stdout: + + +FAILURES: + tests/actual_tests/bad_pattern.rs + tests/actual_tests/bad_pattern_multiple.rs + tests/actual_tests/executable.rs + tests/actual_tests/executable_compile_err.rs + tests/actual_tests/exit_code_fail.rs + tests/actual_tests/filters.rs + tests/actual_tests/foomp.rs + tests/actual_tests/foomp2.rs + tests/actual_tests/ice_annotations.rs + tests/actual_tests/inline_chain.rs + tests/actual_tests/joined_wrong_order.rs + tests/actual_tests/lone_joined_pattern.rs + tests/actual_tests/pattern_too_many_arrow.rs + tests/actual_tests/pattern_too_many_arrow_above.rs + tests/actual_tests/rustc_ice.rs + tests/actual_tests/touching_above_below.rs + tests/actual_tests/touching_above_below_chain.rs + +test result: FAIL. 17 failed + + +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished + diff --git a/tests/integrations/basic-fail/Cargo.toml b/tests/integrations/basic-fail/Cargo.toml new file mode 100644 index 00000000..70590753 --- /dev/null +++ b/tests/integrations/basic-fail/Cargo.toml @@ -0,0 +1,36 @@ +[package] +name = "basic_fail" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dev-dependencies] +ui_test = { path = "../../.." } +tempfile = "3.3.0" + +[[test]] +name = "ui_tests" +harness = false + +[[test]] +name = "json" +harness = false + +[[test]] +name = "ui_tests_invalid_program" +harness = false + +[[test]] +name = "ui_tests_invalid_program2" +harness = false + +[[test]] +name = "ui_tests_diff_only" +harness = false + +[[test]] +name = "ui_tests_bless" +harness = false + +#@normalize-stdout-test: "(command: canonicalizing path `tests/actual_tests_bless/auxiliary/aasdflkjasdlfjasdlfkjasdf`\n\nfull stderr:\n).*" -> "${1}No such file or directory" diff --git a/tests/integrations/basic-fail/src/lib.rs b/tests/integrations/basic-fail/src/lib.rs new file mode 100644 index 00000000..211bfff7 --- /dev/null +++ b/tests/integrations/basic-fail/src/lib.rs @@ -0,0 +1,3 @@ +pub fn add(left: usize, right: usize) -> usize { + left + right +} diff --git a/tests/integrations/basic-fail/tests/actual_tests/bad_pattern.rs b/tests/integrations/basic-fail/tests/actual_tests/bad_pattern.rs new file mode 100644 index 00000000..34d2e201 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/bad_pattern.rs @@ -0,0 +1,6 @@ +use basic_fail::add; + +fn main() { + add("42", 3); + //~^ ERROR: miesmätsched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests/bad_pattern.stderr b/tests/integrations/basic-fail/tests/actual_tests/bad_pattern.stderr new file mode 100644 index 00000000..6bafa7c4 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/bad_pattern.stderr @@ -0,0 +1,17 @@ +error[E0308]: mismatched types + --> tests/actual_tests/bad_pattern.rs:4:9 + | +4 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.rs b/tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.rs new file mode 100644 index 00000000..c74528f5 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.rs @@ -0,0 +1,8 @@ +use basic_fail::add; + +fn main() { + add("42", 3); + //~^ ERROR: miesmätsched types + add("42", 3); + //~^ ERROR: miesmätsched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.stderr b/tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.stderr new file mode 100644 index 00000000..260eefb6 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/bad_pattern_multiple.stderr @@ -0,0 +1,31 @@ +error[E0308]: mismatched types + --> tests/actual_tests/bad_pattern_multiple.rs:4:9 + | +4 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error[E0308]: mismatched types + --> tests/actual_tests/bad_pattern_multiple.rs:6:9 + | +6 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + + error: aborting due to 2 previous errors + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests/executable.rs b/tests/integrations/basic-fail/tests/actual_tests/executable.rs new file mode 100644 index 00000000..00a6a191 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/executable.rs @@ -0,0 +1,7 @@ +use basic_fail::add; + +//@run + +fn main() { + println!("{}", add(20, 22)); +} diff --git a/tests/integrations/basic-fail/tests/actual_tests/executable.run.stdout b/tests/integrations/basic-fail/tests/actual_tests/executable.run.stdout new file mode 100644 index 00000000..b5489e5e --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/executable.run.stdout @@ -0,0 +1 @@ +69 diff --git a/tests/integrations/basic-fail/tests/actual_tests/executable_compile_err.rs b/tests/integrations/basic-fail/tests/actual_tests/executable_compile_err.rs new file mode 100644 index 00000000..9dc8393c --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/executable_compile_err.rs @@ -0,0 +1,4 @@ +//@run + +fn main() { + diff --git a/tests/integrations/basic-fail/tests/actual_tests/exit_code_fail.rs b/tests/integrations/basic-fail/tests/actual_tests/exit_code_fail.rs new file mode 100644 index 00000000..f328e4d9 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/exit_code_fail.rs @@ -0,0 +1 @@ +fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests/filters.rs b/tests/integrations/basic-fail/tests/actual_tests/filters.rs new file mode 100644 index 00000000..18f18b16 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/filters.rs @@ -0,0 +1,3 @@ +//@only-x86_64 + +fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests/foomp.rs b/tests/integrations/basic-fail/tests/actual_tests/foomp.rs new file mode 100644 index 00000000..9d1a43d2 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/foomp.rs @@ -0,0 +1,6 @@ +use basic_fail::add; + +fn main() { + add("42", 3); + //~^ ERROR: mismatched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests/foomp.stderr b/tests/integrations/basic-fail/tests/actual_tests/foomp.stderr new file mode 100644 index 00000000..bb5f5b2f --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/foomp.stderr @@ -0,0 +1,15 @@ +error[E0308]: mismatched types + --> tests/actual_tests/foomp.rs:4:9 + | +4 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | +note: function defined here + --> $DIR/tests/integrations/basic/src/lib.rs:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ some expected text that isn't in the actual message + +error: aborting doo to previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests/foomp2.fixed b/tests/integrations/basic-fail/tests/actual_tests/foomp2.fixed new file mode 100644 index 00000000..1ab44b66 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/foomp2.fixed @@ -0,0 +1,2 @@ +this is just a test file showing that +stray .fixed files are detected and blessed away diff --git a/tests/integrations/basic-fail/tests/actual_tests/foomp2.rs b/tests/integrations/basic-fail/tests/actual_tests/foomp2.rs new file mode 100644 index 00000000..9d1a43d2 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/foomp2.rs @@ -0,0 +1,6 @@ +use basic_fail::add; + +fn main() { + add("42", 3); + //~^ ERROR: mismatched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests/foomp2.stderr b/tests/integrations/basic-fail/tests/actual_tests/foomp2.stderr new file mode 100644 index 00000000..c6895212 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/foomp2.stderr @@ -0,0 +1,17 @@ +error[E0308]: mismatched types + --> tests/actual_tests/foomp2.rs:4:9 + | +4 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests/ice_annotations.rs b/tests/integrations/basic-fail/tests/actual_tests/ice_annotations.rs new file mode 100644 index 00000000..4ea10071 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/ice_annotations.rs @@ -0,0 +1,10 @@ +//@compile-flags: -Ztreat-err-as-bug +//@rustc-env: RUSTC_BOOTSTRAP=1 +//@rustc-env: RUSTC_ICE=0 +//@normalize-stderr-test: "(?s)(thread 'rustc' panicked).*end of query stack" -> "$1" +use basic_fail::add; + +fn main() { + add("42", 3); + //~^ ICE: mismatched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests/inline_chain.rs b/tests/integrations/basic-fail/tests/actual_tests/inline_chain.rs new file mode 100644 index 00000000..e24173e7 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/inline_chain.rs @@ -0,0 +1,6 @@ +#![deny(unused_mut, unused_variables)] + +fn main() { + let mut x = 0u32; //~ unused_mut + //~| unused_variables +} diff --git a/tests/integrations/basic-fail/tests/actual_tests/joined_wrong_order.rs b/tests/integrations/basic-fail/tests/actual_tests/joined_wrong_order.rs new file mode 100644 index 00000000..9afef5dd --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/joined_wrong_order.rs @@ -0,0 +1,7 @@ +#![deny(unused_mut, unused_variables)] + +fn main() { + //~vv unused_variables + //~| unused_mut + let mut x = 0u32; +} diff --git a/tests/integrations/basic-fail/tests/actual_tests/lone_joined_pattern.rs b/tests/integrations/basic-fail/tests/actual_tests/lone_joined_pattern.rs new file mode 100644 index 00000000..55784cd3 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/lone_joined_pattern.rs @@ -0,0 +1,7 @@ +fn main() { + //~| ERROR: mismatched types + use_unit(1_u32); + //~| ERROR: mismatched types +} + +fn use_unit(_: ()) {} diff --git a/tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow.rs b/tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow.rs new file mode 100644 index 00000000..308ff798 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow.rs @@ -0,0 +1,6 @@ +fn main() { + use_unit(1_u32); + //~^^^^^^^ ERROR: mismatched types +} + +fn use_unit(_: ()) {} diff --git a/tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow_above.rs b/tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow_above.rs new file mode 100644 index 00000000..29a5ac0a --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/pattern_too_many_arrow_above.rs @@ -0,0 +1,6 @@ +fn main() { + //~vvvvvv ERROR: mismatched types + use_unit(1_u32); +} + +fn use_unit(_: ()) {} diff --git a/tests/integrations/basic-fail/tests/actual_tests/rustc_ice.rs b/tests/integrations/basic-fail/tests/actual_tests/rustc_ice.rs new file mode 100644 index 00000000..e87ddae0 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/rustc_ice.rs @@ -0,0 +1,10 @@ +//@compile-flags: -Ztreat-err-as-bug +//@rustc-env: RUSTC_BOOTSTRAP=1 +//@rustc-env: RUSTC_ICE=0 +//@normalize-stderr-test: "(?s)(thread 'rustc' panicked).*end of query stack" -> "$1" +use basic_fail::add; + +fn main() { + add("42", 3); + //~^ ERROR: mismatched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests/rustc_ice.stderr b/tests/integrations/basic-fail/tests/actual_tests/rustc_ice.stderr new file mode 100644 index 00000000..e8dbb87a --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/rustc_ice.stderr @@ -0,0 +1,15 @@ +error: internal compiler error[E0308]: mismatched types + --> tests/actual_tests/rustc_ice.rs:8:9 + | +8 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +thread 'rustc' panicked diff --git a/tests/integrations/basic-fail/tests/actual_tests/touching_above_below.rs b/tests/integrations/basic-fail/tests/actual_tests/touching_above_below.rs new file mode 100644 index 00000000..8c1208a9 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/touching_above_below.rs @@ -0,0 +1,8 @@ +fn main() { + use_unit(1_u32); + //~^ ERROR: mismatched types + //~v ERROR: mismatched types + use_unit(1_u32); +} + +fn use_unit(_: ()) {} diff --git a/tests/integrations/basic-fail/tests/actual_tests/touching_above_below_chain.rs b/tests/integrations/basic-fail/tests/actual_tests/touching_above_below_chain.rs new file mode 100644 index 00000000..477c00d7 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests/touching_above_below_chain.rs @@ -0,0 +1,9 @@ +fn main() { + use_unit(1_u32); + //~^ ERROR: mismatched types + //~| ERROR: variable does not need to be mutable + //~v ERROR: unused variable + let mut x = 0u32; +} + +fn use_unit(_: ()) {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/abort.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/abort.rs new file mode 100644 index 00000000..8b200a11 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/abort.rs @@ -0,0 +1,5 @@ +//@run + +fn main() { + std::process::abort(); +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/aux_build_not_found.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/aux_build_not_found.rs new file mode 100644 index 00000000..25ce3478 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/aux_build_not_found.rs @@ -0,0 +1,3 @@ +//@aux-build:aasdflkjasdlfjasdlfkjasdf + +fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_misuse.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_misuse.rs new file mode 100644 index 00000000..f3f0c3e9 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_misuse.rs @@ -0,0 +1,8 @@ +//@aux-build:the_proc_macro.rs:proc-macro + +use the_proc_macro::thing; + +fn main() { + thing!(cake); + //~^ ERROR: cannot find value `cake` in this scope +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.rs new file mode 100644 index 00000000..0806f482 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.rs @@ -0,0 +1,7 @@ +//@aux-build:the_proc_macro.rs +//! Test that our automatic --crate-type detection (changing this crate to `lib`) +//! does not change the aux build to `lib` + +use the_proc_macro::thing; + +thing!(cake); diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.stderr new file mode 100644 index 00000000..23f8688a --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.stderr @@ -0,0 +1,8 @@ +error: expected one of `!` or `::`, found `` + --> tests/actual_tests_bless/aux_proc_macro_no_main.rs:7:8 + | +7 | thing!(cake); + | ^^^^ expected one of `!` or `::` + +error: aborting due to 1 previous error + diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/foomp.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/foomp.rs new file mode 100644 index 00000000..4717fe7c --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/foomp.rs @@ -0,0 +1 @@ +pub fn add(_: u8, _: u8) {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/nested.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/nested.rs new file mode 100644 index 00000000..dad6ebcc --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/nested.rs @@ -0,0 +1,5 @@ +//@aux-build:foomp.rs + +pub fn bar() { + foomp::add(1, 2); +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/the_proc_macro.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/the_proc_macro.rs new file mode 100644 index 00000000..9eb2efe7 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/the_proc_macro.rs @@ -0,0 +1,10 @@ +#![crate_type = "proc-macro"] + +extern crate proc_macro; + +use proc_macro::TokenStream; + +#[proc_macro] +pub fn thing(input: TokenStream) -> TokenStream { + input +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/compile_flags_quotes.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/compile_flags_quotes.rs new file mode 100644 index 00000000..699afbbf --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/compile_flags_quotes.rs @@ -0,0 +1,3 @@ +//@compile-flag: cake +//@compile-flags: -Z "cake is a lie" +//@compile-flags: -Z "cheese is good diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/compiletest-rs-command.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/compiletest-rs-command.rs new file mode 100644 index 00000000..6421eaaf --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/compiletest-rs-command.rs @@ -0,0 +1,6 @@ +//aux-build:foomp.rs +// aux-build:asf.rs +// aux-build:asasdflk.rs +// @aux-build:asldkfjasldfj.rs +// @aux-build:asldkjf.rs +fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.rs new file mode 100644 index 00000000..55bd7a87 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.rs @@ -0,0 +1,9 @@ +//@edition: 2018 +//@check-pass + +fn main() { + match 42 { + 0...1 => {} + _ => {} + } +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.stderr new file mode 100644 index 00000000..4b533a94 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/edition_override.stderr @@ -0,0 +1,12 @@ +warning: `...` range patterns are deprecated + --> tests/actual_tests_bless/edition_override.rs:6:10 + | +6 | 0...1 => {} + | ^^^ help: use `..=` for an inclusive range + | + = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021! + = note: for more information, see + = note: `#[warn(ellipsis_inclusive_range_patterns)]` on by default + +warning: 1 warning emitted + diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.rs new file mode 100644 index 00000000..d3cafbdf --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.rs @@ -0,0 +1,5 @@ +//@run + +fn main() { + assert_eq!(5, 6); +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.run.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.run.stderr new file mode 100644 index 00000000..b6f31ef3 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.run.stderr @@ -0,0 +1,5 @@ +thread 'main' panicked at tests/actual_tests_bless/failing_executable.rs:4:5: +assertion `left == right` failed + left: 5 + right: 6 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.rs new file mode 100644 index 00000000..a3ee84a9 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.rs @@ -0,0 +1,8 @@ +//@aux-build:foomp.rs + +use foomp::add; + +fn main() { + add("42", 3); + //~^ ERROR: mismatched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.stderr new file mode 100644 index 00000000..edc20dbe --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.stderr @@ -0,0 +1,17 @@ +error[E0308]: mismatched types + --> tests/actual_tests_bless/foomp_aux.rs:6:9 + | +6 | add("42", 3); + | --- ^^^^ expected `u8`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/tests/actual_tests_bless/auxiliary/foomp.rs:1:8 + | +1 | pub fn add(_: u8, _: u8) {} + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/nested_aux.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/nested_aux.rs new file mode 100644 index 00000000..fd533438 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/nested_aux.rs @@ -0,0 +1,8 @@ +//@aux-build:nested.rs +//@check-pass + +use nested::bar; + +fn main() { + bar(); +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/no_main.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/no_main.rs new file mode 100644 index 00000000..b76b4321 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/no_main.rs @@ -0,0 +1 @@ +pub fn foo() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.rs new file mode 100644 index 00000000..894b5cb9 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.rs @@ -0,0 +1,3 @@ +//@compile-flags: --crate-type=bin + +pub fn foo() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.stderr new file mode 100644 index 00000000..4ed5c842 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/no_main_manual.stderr @@ -0,0 +1,11 @@ +error: cannot mix `bin` crate type with others + +error[E0601]: `main` function not found in crate `no_main_manual` + --> tests/actual_tests_bless/no_main_manual.rs:3:16 + | +3 | pub fn foo() {} + | ^ consider adding a `main` function to `tests/actual_tests_bless/no_main_manual.rs` + +error: aborting due to 2 previous errors + +For more information about this error, try `rustc --explain E0601`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/no_test.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/no_test.rs new file mode 100644 index 00000000..7e1d5163 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/no_test.rs @@ -0,0 +1,2 @@ +#[test] +fn foo() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/non_top_level_configs.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/non_top_level_configs.rs new file mode 100644 index 00000000..1021c219 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/non_top_level_configs.rs @@ -0,0 +1,5 @@ +////@check-pass + +fn main() { + //@ignore-target-cheesecake +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.rs new file mode 100644 index 00000000..5f97ef36 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.rs @@ -0,0 +1,7 @@ +//@normalize-stderr-test: "NORMALIZATION_OVERRIDE" -> "SUCCESS" + +// Test that the above normalization will be run after the default normalization set in ui_tests_bless.rs + +fn main() { + asdf //~ ERROR: cannot find +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.stderr new file mode 100644 index 00000000..ea524eb8 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/normalization_override.stderr @@ -0,0 +1,9 @@ +error[E0425]: cannot find value `asdf` in this scope + --> tests/actual_tests_bless/SUCCESS.rs:6:5 + | +6 | asdf + | ^^^^ not found in this scope + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0425`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/pass.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/pass.rs new file mode 100644 index 00000000..85129e81 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/pass.rs @@ -0,0 +1,3 @@ +//@check-pass + +fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/pass_with_annotation.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/pass_with_annotation.rs new file mode 100644 index 00000000..f09929aa --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/pass_with_annotation.rs @@ -0,0 +1,4 @@ +//@check-pass + +//~ ERROR: the cake is a lie +fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revised_revision.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revised_revision.rs new file mode 100644 index 00000000..e1deb110 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revised_revision.rs @@ -0,0 +1,13 @@ +use basic_fail::add; +//@[foo] revisions: foo bar + +#[cfg(foo)] +fn main() { + add("42", 3); //~[foo] ERROR: mismatched types +} + +#[cfg(bar)] +fn main() { + add("42", 3); + //~[bar]^ ERROR: mismatched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable.rs new file mode 100644 index 00000000..489b7010 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable.rs @@ -0,0 +1,5 @@ +//@revisions: run panic +//@[run]run +//@[panic]run:101 + +fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.panic.run.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.panic.run.stderr new file mode 100644 index 00000000..b76abb5f --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.panic.run.stderr @@ -0,0 +1,3 @@ +thread 'main' panicked at tests/actual_tests_bless/revisioned_executable_panic.rs:6:5: +explicit panic +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.rs new file mode 100644 index 00000000..4152ec4a --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.rs @@ -0,0 +1,7 @@ +//@revisions: run panic +//@[run]run +//@[panic]run:101 + +fn main() { + panic!() +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.run.run.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.run.run.stderr new file mode 100644 index 00000000..b76abb5f --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.run.run.stderr @@ -0,0 +1,3 @@ +thread 'main' panicked at tests/actual_tests_bless/revisioned_executable_panic.rs:6:5: +explicit panic +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.bar.stderr new file mode 100644 index 00000000..40809709 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.bar.stderr @@ -0,0 +1,17 @@ +error[E0308]: mismatched types + --> tests/actual_tests_bless/revisions.rs:11:9 + | +11 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.foo.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.foo.stderr new file mode 100644 index 00000000..da590f39 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.foo.stderr @@ -0,0 +1,17 @@ +error[E0308]: mismatched types + --> tests/actual_tests_bless/revisions.rs:6:9 + | +6 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.rs new file mode 100644 index 00000000..cd346128 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.rs @@ -0,0 +1,13 @@ +use basic_fail::add; +//@ revisions: foo bar + +#[cfg(foo)] +fn main() { + add("42", 3); //~[foo] ERROR: mismatched types +} + +#[cfg(bar)] +fn main() { + add("42", 3); + //~[bar]^ ERROR: mismatched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.bar.stderr new file mode 100644 index 00000000..d8d1eef6 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.bar.stderr @@ -0,0 +1,9 @@ +error[E0601]: `main` function not found in crate `revisions_bad` + --> tests/actual_tests_bless/revisions_bad.rs:10:2 + | +10 | } + | ^ consider adding a `main` function to `tests/actual_tests_bless/revisions_bad.rs` + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0601`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.foo.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.foo.stderr new file mode 100644 index 00000000..2011cf55 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.foo.stderr @@ -0,0 +1,17 @@ +error[E0308]: mismatched types + --> tests/actual_tests_bless/revisions_bad.rs:8:9 + | +8 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.rs new file mode 100644 index 00000000..1986e0fc --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.rs @@ -0,0 +1,10 @@ +#[cfg(foo)] +use basic_fail::add; +//@ revisions: foo bar +//@[bar] error-in-other-file: `main` function not found in crate `revisions_bad` + +#[cfg(foo)] +fn main() { + add("42", 3); + //~[foo]^ ERROR: mismatched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter.rs new file mode 100644 index 00000000..a8ee7906 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter.rs @@ -0,0 +1,14 @@ +use basic_fail::add; +//@ignore-on-host +//@ revisions: foo bar + +#[cfg(foo)] +fn main() { + add("42", 3); +} + +#[cfg(bar)] +fn main() { + add("42", 3); + //~[bar]^ ERROR: mismatched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.bar.stderr new file mode 100644 index 00000000..9d79a396 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.bar.stderr @@ -0,0 +1,17 @@ +error[E0308]: mismatched types + --> tests/actual_tests_bless/revisions_filter2.rs:12:9 + | +12 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.rs new file mode 100644 index 00000000..2037461d --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.rs @@ -0,0 +1,14 @@ +use basic_fail::add; +//@[foo] ignore-on-host +//@ revisions: foo bar + +#[cfg(foo)] +fn main() { + add("42", 3); +} + +#[cfg(bar)] +fn main() { + add("42", 3); + //~[bar]^ ERROR: mismatched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.bar.stderr new file mode 100644 index 00000000..29461bf8 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.bar.stderr @@ -0,0 +1,17 @@ +error[E0308]: mismatched types + --> tests/actual_tests_bless/revisions_multiple_per_annotation.rs:5:9 + | +5 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.foo.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.foo.stderr new file mode 100644 index 00000000..29461bf8 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.foo.stderr @@ -0,0 +1,17 @@ +error[E0308]: mismatched types + --> tests/actual_tests_bless/revisions_multiple_per_annotation.rs:5:9 + | +5 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.rs new file mode 100644 index 00000000..24a248c9 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.rs @@ -0,0 +1,7 @@ +use basic_fail::add; +//@ revisions: foo bar + +fn main() { + add("42", 3); + //~[bar, foo]^ ERROR: mismatched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.bar.stderr new file mode 100644 index 00000000..6513fbef --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.bar.stderr @@ -0,0 +1,17 @@ +error[E0308]: mismatched types + --> tests/actual_tests_bless/revisions_same_everywhere.rs:5:9 + | +5 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.foo.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.foo.stderr new file mode 100644 index 00000000..6513fbef --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.foo.stderr @@ -0,0 +1,17 @@ +error[E0308]: mismatched types + --> tests/actual_tests_bless/revisions_same_everywhere.rs:5:9 + | +5 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.rs new file mode 100644 index 00000000..1d4b672c --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.rs @@ -0,0 +1,7 @@ +use basic_fail::add; +//@ revisions: foo bar + +fn main() { + add("42", 3); + //~^ ERROR: mismatched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.rs new file mode 100644 index 00000000..48b17cf1 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.rs @@ -0,0 +1,5 @@ +//@run: 101 + +fn main() { + panic!(); +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.run.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.run.stderr new file mode 100644 index 00000000..b91585fc --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.run.stderr @@ -0,0 +1,3 @@ +thread 'main' panicked at tests/actual_tests_bless/run_panic.rs:4:5: +explicit panic +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.fixed b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.fixed new file mode 100644 index 00000000..3631cb66 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.fixed @@ -0,0 +1,12 @@ +//@revisions: a b +#![deny(warnings)] + +fn main() { + let x = match 0 { + 0 => String::new(), + //~^ ERROR: expected `,` + _ => return, + }; + + x; +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.stderr new file mode 100644 index 00000000..f5788fa4 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.stderr @@ -0,0 +1,8 @@ +error: expected `,` following `match` arm + --> tests/actual_tests_bless/rustfix-fail-revisions.rs:6:27 + | +6 | 0 => String::new() + | ^ help: missing a comma here to end this `match` arm: `,` + +error: aborting due to 1 previous error + diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.fixed b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.fixed new file mode 100644 index 00000000..3631cb66 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.fixed @@ -0,0 +1,12 @@ +//@revisions: a b +#![deny(warnings)] + +fn main() { + let x = match 0 { + 0 => String::new(), + //~^ ERROR: expected `,` + _ => return, + }; + + x; +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.stderr new file mode 100644 index 00000000..f5788fa4 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.stderr @@ -0,0 +1,8 @@ +error: expected `,` following `match` arm + --> tests/actual_tests_bless/rustfix-fail-revisions.rs:6:27 + | +6 | 0 => String::new() + | ^ help: missing a comma here to end this `match` arm: `,` + +error: aborting due to 1 previous error + diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.rs new file mode 100644 index 00000000..035ba4fa --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.rs @@ -0,0 +1,12 @@ +//@revisions: a b +#![deny(warnings)] + +fn main() { + let x = match 0 { + 0 => String::new() + //~^ ERROR: expected `,` + _ => return, + }; + + x; +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.fixed b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.fixed new file mode 100644 index 00000000..3255796f --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.fixed @@ -0,0 +1,11 @@ +#![deny(warnings)] + +fn main() { + let x = match 0 { + 0 => String::new(), + //~^ ERROR: expected `,` + _ => return, + }; + + x; +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.rs new file mode 100644 index 00000000..9c40631f --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.rs @@ -0,0 +1,11 @@ +#![deny(warnings)] + +fn main() { + let x = match 0 { + 0 => String::new() + //~^ ERROR: expected `,` + _ => return, + }; + + x; +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.stderr new file mode 100644 index 00000000..6187df41 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.stderr @@ -0,0 +1,8 @@ +error: expected `,` following `match` arm + --> tests/actual_tests_bless/rustfix-fail.rs:5:27 + | +5 | 0 => String::new() + | ^ help: missing a comma here to end this `match` arm: `,` + +error: aborting due to 1 previous error + diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/unicode.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/unicode.rs new file mode 100644 index 00000000..d9e54ab5 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/unicode.rs @@ -0,0 +1,8 @@ +#![deny(confusable_idents)] + +// Test that a missing annotation causing a +// ui_test diagnostic will not ICE due to byte vs char offsets. + +fn main() { + let Ě电脑 = 1; +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/unicode.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/unicode.stderr new file mode 100644 index 00000000..b92bcd9e --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/unicode.stderr @@ -0,0 +1,18 @@ +warning: unused variable: `Ě电脑` + --> tests/actual_tests_bless/unicode.rs:7:9 + | +7 | let Ě电脑 = 1; + | ^^^^^ help: if this is intentional, prefix it with an underscore: `_Ě电脑` + | + = note: `#[warn(unused_variables)]` on by default + +warning: variable `Ě电脑` should have a snake case name + --> tests/actual_tests_bless/unicode.rs:7:9 + | +7 | let Ě电脑 = 1; + | ^^^^^ help: convert the identifier to snake case: `ě电脑` + | + = note: `#[warn(non_snake_case)]` on by default + +warning: 2 warnings emitted + diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision.rs new file mode 100644 index 00000000..3b28694f --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision.rs @@ -0,0 +1,4 @@ +fn main() { + assert_eq!(5, 6); + //~[cake, lie] ERROR: kawoom +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision2.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision2.rs new file mode 100644 index 00000000..3f1fd3a8 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/unknown_revision2.rs @@ -0,0 +1,6 @@ +//@ revisions: cheese lie + +fn main() { + assert_eq!(5, 6); + //~[cake, lie] ERROR: kawoom +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.rs b/tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.rs new file mode 100644 index 00000000..81958d46 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.rs @@ -0,0 +1,9 @@ +#![deny(dead_code, unreachable_code)] + +fn foo() -> i32 { + //~^ should_be_dead_code + panic!(); + 0 //~ unreachable_code +} + +fn main() {} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.stderr new file mode 100644 index 00000000..4e5a9065 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless/wrong_diagnostic_code.stderr @@ -0,0 +1,28 @@ +error: unreachable expression + --> tests/actual_tests_bless/wrong_diagnostic_code.rs:6:5 + | +5 | panic!(); + | -------- any code following this expression is unreachable +6 | 0 + | ^ unreachable expression + | +note: the lint level is defined here + --> tests/actual_tests_bless/wrong_diagnostic_code.rs:1:20 + | +1 | #![deny(dead_code, unreachable_code)] + | ^^^^^^^^^^^^^^^^ + +error: function `foo` is never used + --> tests/actual_tests_bless/wrong_diagnostic_code.rs:3:4 + | +3 | fn foo() -> i32 { + | ^^^ + | +note: the lint level is defined here + --> tests/actual_tests_bless/wrong_diagnostic_code.rs:1:9 + | +1 | #![deny(dead_code, unreachable_code)] + | ^^^^^^^^^ + +error: aborting due to 2 previous errors + diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.bar.stderr new file mode 100644 index 00000000..1e61b080 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.bar.stderr @@ -0,0 +1,9 @@ +error[E0601]: `main` function not found in crate `revisions_bad` + --> tests/actual_tests_bless_yolo/revisions_bad.rs:9:2 + | +9 | } + | ^ consider adding a `main` function to `tests/actual_tests_bless_yolo/revisions_bad.rs` + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0601`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.foo.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.foo.stderr new file mode 100644 index 00000000..6a662007 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.foo.stderr @@ -0,0 +1,17 @@ +error[E0308]: mismatched types + --> tests/actual_tests_bless_yolo/revisions_bad.rs:7:9 + | +7 | add("42", 3); + | --- ^^^^ expected `usize`, found `&str` + | | + | arguments to this function are incorrect + | +note: function defined here + --> $DIR/tests/integrations/basic-fail/src/lib.rs:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.rs b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.rs new file mode 100644 index 00000000..1d159832 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.rs @@ -0,0 +1,10 @@ +#[cfg(foo)] +use basic_fail::add; +//@ revisions: foo bar + +#[cfg(foo)] +fn main() { + add("42", 3); + //~[foo]^ ERROR: mismatched types +} +//~[bar]^ ERROR: `main` function not found in crate `revisions_bad` diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.fixed b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.fixed new file mode 100644 index 00000000..35070685 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.fixed @@ -0,0 +1,6 @@ +#![deny(warnings)] + +fn main() { + let _x: String = 42.to_string(); + //~^ ERROR: mismatched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs new file mode 100644 index 00000000..253998ff --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs @@ -0,0 +1,6 @@ +#![deny(warnings)] + +fn main() { + let _x: String = 42; + //~^ ERROR: mismatched types +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.stderr new file mode 100644 index 00000000..928b8c28 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.stderr @@ -0,0 +1,12 @@ +error[E0308]: mismatched types + --> tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs:4:22 + | +4 | let _x: String = 42; + | ------ ^^- help: try using a conversion method: `.to_string()` + | | | + | | expected `String`, found integer + | expected due to this + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.1.fixed b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.1.fixed new file mode 100644 index 00000000..5732438e --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.1.fixed @@ -0,0 +1,8 @@ +pub fn f(_: i32) -> &'static i32 { + //~^ ERROR: missing lifetime + unimplemented!() +} + +fn main() { + f(1); +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed new file mode 100644 index 00000000..8f6b996e --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.2.fixed @@ -0,0 +1,8 @@ +pub fn f(_: &i32) -> &i32 { + //~^ ERROR: missing lifetime + unimplemented!() +} + +fn main() { + f(1); +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.3.fixed b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.3.fixed new file mode 100644 index 00000000..6c351ae3 --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.3.fixed @@ -0,0 +1,8 @@ +pub fn f(_: i32) -> i32 { + //~^ ERROR: missing lifetime + unimplemented!() +} + +fn main() { + f(1); +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.rs b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.rs new file mode 100644 index 00000000..c855e8eb --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.rs @@ -0,0 +1,8 @@ +pub fn f(_: i32) -> &i32 { + //~^ ERROR: missing lifetime + unimplemented!() +} + +fn main() { + f(1); +} diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.stderr new file mode 100644 index 00000000..6ad1823a --- /dev/null +++ b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-multiple-fail.stderr @@ -0,0 +1,24 @@ +error[E0106]: missing lifetime specifier + --> tests/actual_tests_bless_yolo/rustfix-multiple-fail.rs:1:21 + | +1 | pub fn f(_: i32) -> &i32 { + | ^ expected named lifetime parameter + | + = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from +help: consider using the `'static` lifetime, but this is uncommon unless you're returning a borrowed value from a `const` or a `static` + | +1 | pub fn f(_: i32) -> &'static i32 { + | +++++++ +help: instead, you are more likely to want to change the argument to be borrowed... + | +1 | pub fn f(_: &i32) -> &i32 { + | + +help: ...or alternatively, you might want to return an owned value + | +1 - pub fn f(_: i32) -> &i32 { +1 + pub fn f(_: i32) -> i32 { + | + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0106`. diff --git a/tests/integrations/basic-fail/tests/json.rs b/tests/integrations/basic-fail/tests/json.rs new file mode 100644 index 00000000..763617c6 --- /dev/null +++ b/tests/integrations/basic-fail/tests/json.rs @@ -0,0 +1,34 @@ +use ui_test::{dependencies::DependencyBuilder, *}; + +fn main() -> ui_test::color_eyre::Result<()> { + let path = "../../../target"; + let mut config = Config { + // Never bless integrations-fail tests, we want to see stderr mismatches + output_conflict_handling: ui_test::error_on_output_conflict, + bless_command: Some("DO NOT BLESS. These are meant to fail".to_string()), + ..Config::rustc("tests/actual_tests") + }; + + config + .comment_defaults + .base() + .set_custom("dependencies", DependencyBuilder::default()); + + // hide binaries generated for successfully passing tests + let tmp_dir = tempfile::tempdir_in(path)?; + let tmp_dir = tmp_dir.path(); + config.out_dir = tmp_dir.into(); + config.path_stderr_filter(tmp_dir, "$TMP"); + + config.stderr_filter("in ([0-9]m )?[0-9\\.]+s", ""); + config.stdout_filter("in ([0-9]m )?[0-9\\.]+s", ""); + config.stderr_filter(r"[^ ]*/\.?cargo/registry/.*/", "$$CARGO_REGISTRY"); + config.path_stderr_filter(&std::path::Path::new(path), "$DIR"); + + run_tests_generic( + vec![config], + default_file_filter, + default_per_file_config, + status_emitter::JSON::new(), + ) +} diff --git a/tests/integrations/basic-fail/tests/ui_tests.rs b/tests/integrations/basic-fail/tests/ui_tests.rs new file mode 100644 index 00000000..2432f749 --- /dev/null +++ b/tests/integrations/basic-fail/tests/ui_tests.rs @@ -0,0 +1,35 @@ +use ui_test::{dependencies::DependencyBuilder, *}; + +fn main() -> ui_test::color_eyre::Result<()> { + let path = "../../../target"; + let mut config = Config { + // Never bless integrations-fail tests, we want to see stderr mismatches + output_conflict_handling: ui_test::error_on_output_conflict, + bless_command: Some("DO NOT BLESS. These are meant to fail".to_string()), + ..Config::rustc("tests/actual_tests") + }; + + config + .comment_defaults + .base() + .set_custom("dependencies", DependencyBuilder::default()); + + // hide binaries generated for successfully passing tests + let tmp_dir = tempfile::tempdir_in(path)?; + let tmp_dir = tmp_dir.path(); + config.out_dir = tmp_dir.into(); + config.path_stderr_filter(tmp_dir, "$TMP"); + + config.stderr_filter("in ([0-9]m )?[0-9\\.]+s", ""); + config.stdout_filter("in ([0-9]m )?[0-9\\.]+s", ""); + config.stderr_filter(r"[^ ]*/\.?cargo/registry/.*/", "$$CARGO_REGISTRY"); + config.path_stderr_filter(&std::path::Path::new(path), "$DIR"); + + run_tests_generic( + vec![config], + default_file_filter, + default_per_file_config, + // Avoid github actions, as these would end up showing up in `Cargo.stderr` + status_emitter::Text::verbose(), + ) +} diff --git a/tests/integrations/basic-fail/tests/ui_tests_bless.rs b/tests/integrations/basic-fail/tests/ui_tests_bless.rs new file mode 100644 index 00000000..e23bd1e4 --- /dev/null +++ b/tests/integrations/basic-fail/tests/ui_tests_bless.rs @@ -0,0 +1,62 @@ +use ui_test::{ + custom_flags::rustfix_mode::RustfixMode, dependencies::DependencyBuilder, spanned::Spanned, *, +}; + +fn main() -> ui_test::color_eyre::Result<()> { + for rustfix in [RustfixMode::MachineApplicable, RustfixMode::Everything] { + let path = "../../../target"; + + let root_dir = match rustfix { + RustfixMode::Everything => "tests/actual_tests_bless_yolo", + RustfixMode::MachineApplicable { .. } => "tests/actual_tests_bless", + _ => unreachable!(), + }; + + let mut config = Config { + output_conflict_handling: if std::env::var_os("BLESS").is_some() { + ui_test::bless_output_files + } else { + ui_test::error_on_output_conflict + }, + bless_command: Some("cargo test".to_string()), + ..Config::rustc(root_dir) + }; + config.comment_defaults.base().exit_status = match rustfix { + RustfixMode::Everything => None.into(), + RustfixMode::MachineApplicable { .. } => Spanned::dummy(1).into(), + _ => unreachable!(), + }; + config + .comment_defaults + .base() + .set_custom("rustfix-mode", rustfix); + + config + .comment_defaults + .base() + .set_custom("dependencies", DependencyBuilder::default()); + + // hide binaries generated for successfully passing tests + let tmp_dir = tempfile::tempdir_in(path)?; + let tmp_dir = tmp_dir.path(); + config.out_dir = tmp_dir.into(); + config.path_stderr_filter(tmp_dir, "$TMP"); + + config.stderr_filter("in ([0-9]m )?[0-9\\.]+s", ""); + config.stdout_filter("in ([0-9]m )?[0-9\\.]+s", ""); + config.stderr_filter(r"[^ ]*/\.?cargo/registry/.*/", "$$CARGO_REGISTRY"); + config.path_stderr_filter(&std::path::Path::new(path), "$DIR"); + + // This is part of a test: we want to make sure the base filters are run first + config.stderr_filter("normalization_override", "NORMALIZATION_OVERRIDE"); + + let _ = run_tests_generic( + vec![config], + default_file_filter, + default_per_file_config, + // Avoid github actions, as these would end up showing up in `Cargo.stderr` + status_emitter::Text::verbose(), + ); + } + Ok(()) +} diff --git a/tests/integrations/basic-fail/tests/ui_tests_diff_only.rs b/tests/integrations/basic-fail/tests/ui_tests_diff_only.rs new file mode 100644 index 00000000..022eb3f2 --- /dev/null +++ b/tests/integrations/basic-fail/tests/ui_tests_diff_only.rs @@ -0,0 +1,18 @@ +use ui_test::*; + +fn main() -> ui_test::color_eyre::Result<()> { + let config = Config { + // Never bless integrations-fail tests, we want to see stderr mismatches + output_conflict_handling: ui_test::error_on_output_conflict, + bless_command: Some("DO NOT BLESS. These are meant to fail".to_string()), + ..Config::rustc("tests/actual_tests") + }; + + run_tests_generic( + vec![config], + default_file_filter, + default_per_file_config, + // Avoid github actions, as these would end up showing up in `Cargo.stderr` + status_emitter::Text::diff(), + ) +} diff --git a/tests/integrations/basic-fail/tests/ui_tests_invalid_program.rs b/tests/integrations/basic-fail/tests/ui_tests_invalid_program.rs new file mode 100644 index 00000000..d0aac471 --- /dev/null +++ b/tests/integrations/basic-fail/tests/ui_tests_invalid_program.rs @@ -0,0 +1,19 @@ +use ui_test::*; + +fn main() -> ui_test::color_eyre::Result<()> { + let config = Config { + program: CommandBuilder::cmd("invalid_foobarlaksdfalsdfj"), + // Never bless integrations-fail tests, we want to see stderr mismatches + output_conflict_handling: ui_test::error_on_output_conflict, + bless_command: Some("DO NOT BLESS. These are meant to fail".to_string()), + ..Config::rustc("tests/actual_tests") + }; + + run_tests_generic( + vec![config], + default_file_filter, + default_per_file_config, + // Avoid github actions, as these would end up showing up in `Cargo.stderr` + status_emitter::Text::verbose(), + ) +} diff --git a/tests/integrations/basic-fail/tests/ui_tests_invalid_program2.rs b/tests/integrations/basic-fail/tests/ui_tests_invalid_program2.rs new file mode 100644 index 00000000..e3d072e0 --- /dev/null +++ b/tests/integrations/basic-fail/tests/ui_tests_invalid_program2.rs @@ -0,0 +1,20 @@ +use ui_test::*; + +fn main() -> ui_test::color_eyre::Result<()> { + let config = Config { + program: CommandBuilder::cmd("invalid_foobarlaksdfalsdfj"), + // Never bless integrations-fail tests, we want to see stderr mismatches + output_conflict_handling: ui_test::error_on_output_conflict, + bless_command: Some("DO NOT BLESS. These are meant to fail".to_string()), + host: Some("foo".into()), + ..Config::rustc("tests/actual_tests") + }; + + run_tests_generic( + vec![config], + default_file_filter, + default_per_file_config, + // Avoid github actions, as these would end up showing up in `Cargo.stderr` + status_emitter::Text::verbose(), + ) +} diff --git a/tests/integrations/basic/Cargo.stderr b/tests/integrations/basic/Cargo.stderr index 19b7ff27..46ea0e7e 100644 --- a/tests/integrations/basic/Cargo.stderr +++ b/tests/integrations/basic/Cargo.stderr @@ -1,50 +1,3 @@ -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/aux_derive.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/aux_proc_macro.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/error_above.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/foomp-rustfix.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/foomp.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/joined_above.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/joined_below.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/joined_mixed.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/mac_span.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/match_diagnostic_code.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/rustfix-multiple.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/windows_paths.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/subdir/aux_proc_macro.rs" Error: tests failed Location: @@ -53,53 +6,6 @@ error: test failed, to rerun pass `--test json` Caused by: process didn't exit successfully: `$DIR/target/ui/0/tests/integrations/basic/debug/deps/json-HASH` (exit status: 1) -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/aux_derive.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/aux_proc_macro.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/error_above.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/foomp-rustfix.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/foomp.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/joined_above.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/joined_below.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/joined_mixed.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/mac_span.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/match_diagnostic_code.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/rustfix-multiple.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/windows_paths.rs" -[$DIR/src/custom_flags/rustfix.rs:LL:CC] *self = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] global_rustfix = Everything -[$DIR/src/custom_flags/rustfix.rs:LL:CC] path = "tests/actual_tests/subdir/aux_proc_macro.rs" Error: tests failed Location: diff --git a/tests/integrations/basic/Cargo.stdout b/tests/integrations/basic/Cargo.stdout index 5ff9209b..02209308 100644 --- a/tests/integrations/basic/Cargo.stdout +++ b/tests/integrations/basic/Cargo.stdout @@ -19,9 +19,10 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini { "type": "test", "event": "started", "name": "tests/actual_tests/mac_span.rs () - tests/actual_tests/mac_span.rs" } { "type": "test", "event": "started", "name": "tests/actual_tests/match_diagnostic_code.rs () - tests/actual_tests/match_diagnostic_code.rs" } { "type": "test", "event": "started", "name": "tests/actual_tests/no_rustfix.rs () - tests/actual_tests/no_rustfix.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/rustfix-mode-disabled.rs () - tests/actual_tests/rustfix-mode-disabled.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/rustfix-mode-everything.rs () - tests/actual_tests/rustfix-mode-everything.rs" } -{ "type": "test", "event": "started", "name": "tests/actual_tests/rustfix-mode-machine-applicable.rs () - tests/actual_tests/rustfix-mode-machine-applicable.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/rustfix-mode_disabled.rs () - tests/actual_tests/rustfix-mode_disabled.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/rustfix-mode_everything.rs () - tests/actual_tests/rustfix-mode_everything.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/rustfix-mode_invalid.rs () - tests/actual_tests/rustfix-mode_invalid.rs" } +{ "type": "test", "event": "started", "name": "tests/actual_tests/rustfix-mode_machine-applicable.rs () - tests/actual_tests/rustfix-mode_machine-applicable.rs" } { "type": "test", "event": "started", "name": "tests/actual_tests/rustfix-multiple.rs () - tests/actual_tests/rustfix-multiple.rs" } { "type": "test", "event": "started", "name": "tests/actual_tests/stdin.rs () - tests/actual_tests/stdin.rs" } { "type": "test", "event": "started", "name": "tests/actual_tests/unicode.rs () - tests/actual_tests/unicode.rs" } @@ -56,9 +57,10 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini { "type": "test", "event": "ok", "name": "tests/actual_tests/match_diagnostic_code.rs () - tests/actual_tests/match_diagnostic_code.rs" } { "type": "test", "event": "ok", "name": "tests/actual_tests/match_diagnostic_code.rs () - tests/actual_tests/match_diagnostic_code.fixed" } { "type": "test", "event": "ok", "name": "tests/actual_tests/no_rustfix.rs () - tests/actual_tests/no_rustfix.rs" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode-disabled.rs () - tests/actual_tests/rustfix-mode-disabled.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustfix-mode-disabled.rs\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta\" \"--extern\" \"serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustfix-mode-disabled.rs:4:12\n |\n4 | pub static x: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `X`\n |\n = note: `#[warn(non_upper_case_globals)]` on by default\n\nwarning: static variable `y` should have an upper case name\n --> tests/actual_tests/rustfix-mode-disabled.rs:7:16\n |\n7 | pub static y: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `Y`\n\nwarning: 2 warnings emitted\n\n> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode-everything.rs () - tests/actual_tests/rustfix-mode-everything.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustfix-mode-everything.rs\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta\" \"--extern\" \"serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustfix-mode-everything.rs:4:12\n |\n4 | pub static x: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `X`\n |\n = note: `#[warn(non_upper_case_globals)]` on by default\n\nwarning: static variable `y` should have an upper case name\n --> tests/actual_tests/rustfix-mode-everything.rs:7:16\n |\n7 | pub static y: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `Y`\n\nwarning: 2 warnings emitted\n\n> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode-machine-applicable.rs () - tests/actual_tests/rustfix-mode-machine-applicable.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustfix-mode-machine-applicable.rs\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta\" \"--extern\" \"serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustfix-mode-machine-applicable.rs:4:12\n |\n4 | pub static x: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `X`\n |\n = note: `#[warn(non_upper_case_globals)]` on by default\n\nwarning: static variable `y` should have an upper case name\n --> tests/actual_tests/rustfix-mode-machine-applicable.rs:7:16\n |\n7 | pub static y: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `Y`\n\nwarning: 2 warnings emitted\n\n> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode_disabled.rs () - tests/actual_tests/rustfix-mode_disabled.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustfix-mode_disabled.rs\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta\" \"--extern\" \"serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustfix-mode_disabled.rs:4:12\n |\n4 | pub static x: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `X`\n |\n = note: `#[warn(non_upper_case_globals)]` on by default\n\nwarning: static variable `y` should have an upper case name\n --> tests/actual_tests/rustfix-mode_disabled.rs:7:16\n |\n7 | pub static y: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `Y`\n\nwarning: 2 warnings emitted\n\n> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode_everything.rs () - tests/actual_tests/rustfix-mode_everything.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustfix-mode_everything.rs\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta\" \"--extern\" \"serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustfix-mode_everything.rs:4:12\n |\n4 | pub static x: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `X`\n |\n = note: `#[warn(non_upper_case_globals)]` on by default\n\nwarning: static variable `y` should have an upper case name\n --> tests/actual_tests/rustfix-mode_everything.rs:7:16\n |\n7 | pub static y: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `Y`\n\nwarning: 2 warnings emitted\n\n> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode_invalid.rs () - tests/actual_tests/rustfix-mode_invalid.rs", "stdout": "command: stdout: <> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode_machine-applicable.rs () - tests/actual_tests/rustfix-mode_machine-applicable.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustfix-mode_machine-applicable.rs\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta\" \"--extern\" \"serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustfix-mode_machine-applicable.rs:4:12\n |\n4 | pub static x: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `X`\n |\n = note: `#[warn(non_upper_case_globals)]` on by default\n\nwarning: static variable `y` should have an upper case name\n --> tests/actual_tests/rustfix-mode_machine-applicable.rs:7:16\n |\n7 | pub static y: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `Y`\n\nwarning: 2 warnings emitted\n\n> stderr: <>" } { "type": "test", "event": "ok", "name": "tests/actual_tests/rustfix-multiple.rs () - tests/actual_tests/rustfix-multiple.rs" } { "type": "test", "event": "ok", "name": "tests/actual_tests/rustfix-multiple.rs () - tests/actual_tests/rustfix-multiple.1.fixed" } { "type": "test", "event": "ok", "name": "tests/actual_tests/rustfix-multiple.rs () - tests/actual_tests/rustfix-multiple.2.fixed" } @@ -67,7 +69,7 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini { "type": "test", "event": "ok", "name": "tests/actual_tests/unicode.rs () - tests/actual_tests/unicode.rs" } { "type": "test", "event": "ok", "name": "tests/actual_tests/windows_paths.rs () - tests/actual_tests/windows_paths.rs" } { "type": "test", "event": "ok", "name": "tests/actual_tests/subdir/aux_proc_macro.rs () - tests/actual_tests/subdir/aux_proc_macro.rs" } -{ "type": "suite", "event": "failed", "passed": 33, "failed": 3, "ignored": 0, "measured": 0, "filtered_out": 0 } +{ "type": "suite", "event": "failed", "passed": 33, "failed": 4, "ignored": 0, "measured": 0, "filtered_out": 0 } running 3 tests ... @@ -102,9 +104,10 @@ tests/actual_tests/mac_span.fixed ... ok tests/actual_tests/match_diagnostic_code.rs ... ok tests/actual_tests/match_diagnostic_code.fixed ... ok tests/actual_tests/no_rustfix.rs ... ok -tests/actual_tests/rustfix-mode-disabled.rs ... FAILED -tests/actual_tests/rustfix-mode-everything.rs ... FAILED -tests/actual_tests/rustfix-mode-machine-applicable.rs ... FAILED +tests/actual_tests/rustfix-mode_disabled.rs ... FAILED +tests/actual_tests/rustfix-mode_everything.rs ... FAILED +tests/actual_tests/rustfix-mode_invalid.rs ... FAILED +tests/actual_tests/rustfix-mode_machine-applicable.rs ... FAILED tests/actual_tests/rustfix-multiple.rs ... ok tests/actual_tests/rustfix-multiple.1.fixed ... ok tests/actual_tests/rustfix-multiple.2.fixed ... ok @@ -114,8 +117,8 @@ tests/actual_tests/unicode.rs ... ok tests/actual_tests/windows_paths.rs ... ok tests/actual_tests/subdir/aux_proc_macro.rs ... ok -FAILED TEST: tests/actual_tests/rustfix-mode-disabled.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustfix-mode-disabled.rs" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta" "--extern" "serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/0/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" +FAILED TEST: tests/actual_tests/rustfix-mode_disabled.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustfix-mode_disabled.rs" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta" "--extern" "serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/0/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" error: test got exit status: 0, but expected 1 = note: compilation succeeded, but was expected to fail @@ -124,7 +127,7 @@ error: expected error patterns, but found none full stderr: warning: static variable `x` should have an upper case name - --> tests/actual_tests/rustfix-mode-disabled.rs:4:12 + --> tests/actual_tests/rustfix-mode_disabled.rs:4:12 | 4 | pub static x: u32 = 0; | ^ help: convert the identifier to upper case (notice the capitalization): `X` @@ -132,7 +135,7 @@ warning: static variable `x` should have an upper case name = note: `#[warn(non_upper_case_globals)]` on by default warning: static variable `y` should have an upper case name - --> tests/actual_tests/rustfix-mode-disabled.rs:7:16 + --> tests/actual_tests/rustfix-mode_disabled.rs:7:16 | 7 | pub static y: u32 = 0; | ^ help: convert the identifier to upper case (notice the capitalization): `Y` @@ -144,8 +147,8 @@ full stdout: -FAILED TEST: tests/actual_tests/rustfix-mode-everything.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustfix-mode-everything.rs" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta" "--extern" "serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/0/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" +FAILED TEST: tests/actual_tests/rustfix-mode_everything.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustfix-mode_everything.rs" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta" "--extern" "serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/0/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" error: test got exit status: 0, but expected 1 = note: compilation succeeded, but was expected to fail @@ -154,7 +157,7 @@ error: expected error patterns, but found none full stderr: warning: static variable `x` should have an upper case name - --> tests/actual_tests/rustfix-mode-everything.rs:4:12 + --> tests/actual_tests/rustfix-mode_everything.rs:4:12 | 4 | pub static x: u32 = 0; | ^ help: convert the identifier to upper case (notice the capitalization): `X` @@ -162,7 +165,7 @@ warning: static variable `x` should have an upper case name = note: `#[warn(non_upper_case_globals)]` on by default warning: static variable `y` should have an upper case name - --> tests/actual_tests/rustfix-mode-everything.rs:7:16 + --> tests/actual_tests/rustfix-mode_everything.rs:7:16 | 7 | pub static y: u32 = 0; | ^ help: convert the identifier to upper case (notice the capitalization): `Y` @@ -174,8 +177,24 @@ full stdout: -FAILED TEST: tests/actual_tests/rustfix-mode-machine-applicable.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustfix-mode-machine-applicable.rs" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta" "--extern" "serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/0/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" +FAILED TEST: tests/actual_tests/rustfix-mode_invalid.rs +command: parse comments + +error: unknown `RustfixMode`: invalid + --> tests/actual_tests/rustfix-mode_invalid.rs:1:18 + | +1 | //@rustfix-mode: invalid + | ^^^^^^^ + | + +full stderr: + +full stdout: + + + +FAILED TEST: tests/actual_tests/rustfix-mode_machine-applicable.rs +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustfix-mode_machine-applicable.rs" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta" "--extern" "serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/0/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" error: test got exit status: 0, but expected 1 = note: compilation succeeded, but was expected to fail @@ -184,7 +203,7 @@ error: expected error patterns, but found none full stderr: warning: static variable `x` should have an upper case name - --> tests/actual_tests/rustfix-mode-machine-applicable.rs:4:12 + --> tests/actual_tests/rustfix-mode_machine-applicable.rs:4:12 | 4 | pub static x: u32 = 0; | ^ help: convert the identifier to upper case (notice the capitalization): `X` @@ -192,7 +211,7 @@ warning: static variable `x` should have an upper case name = note: `#[warn(non_upper_case_globals)]` on by default warning: static variable `y` should have an upper case name - --> tests/actual_tests/rustfix-mode-machine-applicable.rs:7:16 + --> tests/actual_tests/rustfix-mode_machine-applicable.rs:7:16 | 7 | pub static y: u32 = 0; | ^ help: convert the identifier to upper case (notice the capitalization): `Y` @@ -204,11 +223,12 @@ full stdout: FAILURES: - tests/actual_tests/rustfix-mode-disabled.rs - tests/actual_tests/rustfix-mode-everything.rs - tests/actual_tests/rustfix-mode-machine-applicable.rs + tests/actual_tests/rustfix-mode_disabled.rs + tests/actual_tests/rustfix-mode_everything.rs + tests/actual_tests/rustfix-mode_invalid.rs + tests/actual_tests/rustfix-mode_machine-applicable.rs -test result: FAIL. 3 failed; 33 passed +test result: FAIL. 4 failed; 33 passed running 0 tests diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_disabled.fixed b/tests/integrations/basic/tests/actual_tests/rustfix-mode_disabled.fixed index e69de29b..e86a897b 100644 --- a/tests/integrations/basic/tests/actual_tests/rustfix-mode_disabled.fixed +++ b/tests/integrations/basic/tests/actual_tests/rustfix-mode_disabled.fixed @@ -0,0 +1,10 @@ +//@rustfix-mode: disabled +#![allow(dead_code)] + +pub static x: u32 = 0; + +mod internal { + pub static y: u32 = 0; +} + +fn main() {} diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_everything.fixed b/tests/integrations/basic/tests/actual_tests/rustfix-mode_everything.fixed index e69de29b..2b4715b9 100644 --- a/tests/integrations/basic/tests/actual_tests/rustfix-mode_everything.fixed +++ b/tests/integrations/basic/tests/actual_tests/rustfix-mode_everything.fixed @@ -0,0 +1,10 @@ +//@rustfix-mode: everything +#![allow(dead_code)] + +pub static X: u32 = 0; + +mod internal { + pub static Y: u32 = 0; +} + +fn main() {} diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.fixed b/tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.fixed index e69de29b..241e5b3d 100644 --- a/tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.fixed +++ b/tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.fixed @@ -0,0 +1,10 @@ +//@rustfix-mode: invalid +#![allow(dead_code)] + +pub static x: u32 = 0; + +mod internal { + pub static y: u32 = 0; +} + +fn main() {} diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.stderr b/tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.stderr deleted file mode 100644 index 623ebc65..00000000 --- a/tests/integrations/basic/tests/actual_tests/rustfix-mode_invalid.stderr +++ /dev/null @@ -1,16 +0,0 @@ -warning: static variable `x` should have an upper case name - --> tests/actual_tests/rustfix-mode-disabled.rs:4:12 - | -4 | pub static x: u32 = 0; - | ^ help: convert the identifier to upper case (notice the capitalization): `X` - | - = note: `#[warn(non_upper_case_globals)]` on by default - -warning: static variable `y` should have an upper case name - --> tests/actual_tests/rustfix-mode-disabled.rs:7:16 - | -7 | pub static y: u32 = 0; - | ^ help: convert the identifier to upper case (notice the capitalization): `Y` - -warning: 2 warnings emitted - diff --git a/tests/integrations/basic/tests/actual_tests/rustfix-mode_machine-applicable.fixed b/tests/integrations/basic/tests/actual_tests/rustfix-mode_machine-applicable.fixed index e69de29b..e48d2b51 100644 --- a/tests/integrations/basic/tests/actual_tests/rustfix-mode_machine-applicable.fixed +++ b/tests/integrations/basic/tests/actual_tests/rustfix-mode_machine-applicable.fixed @@ -0,0 +1,10 @@ +//@rustfix-mode: machine-applicable +#![allow(dead_code)] + +pub static x: u32 = 0; + +mod internal { + pub static Y: u32 = 0; +} + +fn main() {} diff --git a/tests/integrations/basic/tests/json.rs b/tests/integrations/basic/tests/json.rs index 5096ffb3..f745d310 100644 --- a/tests/integrations/basic/tests/json.rs +++ b/tests/integrations/basic/tests/json.rs @@ -1,4 +1,4 @@ -use ui_test::{custom_flags::rustfix::RustfixMode, dependencies::DependencyBuilder, *}; +use ui_test::{custom_flags::rustfix_mode::RustfixMode, dependencies::DependencyBuilder, *}; fn main() -> ui_test::color_eyre::Result<()> { let path = "../../../target"; @@ -22,7 +22,7 @@ fn main() -> ui_test::color_eyre::Result<()> { config .comment_defaults .base() - .set_custom("rustfix", RustfixMode::Everything); + .set_custom("rustfix-mode", RustfixMode::Everything); if let Ok(target) = std::env::var("UITEST_TEST_TARGET") { config.target = Some(target); diff --git a/tests/integrations/basic/tests/ui_tests.rs b/tests/integrations/basic/tests/ui_tests.rs index 9d51f43e..1e185337 100644 --- a/tests/integrations/basic/tests/ui_tests.rs +++ b/tests/integrations/basic/tests/ui_tests.rs @@ -1,4 +1,4 @@ -use ui_test::{custom_flags::rustfix::RustfixMode, dependencies::DependencyBuilder, *}; +use ui_test::{custom_flags::rustfix_mode::RustfixMode, dependencies::DependencyBuilder, *}; fn main() -> ui_test::color_eyre::Result<()> { let path = "../../../target"; @@ -22,7 +22,7 @@ fn main() -> ui_test::color_eyre::Result<()> { config .comment_defaults .base() - .set_custom("rustfix", RustfixMode::Everything); + .set_custom("rustfix-mode", RustfixMode::Everything); if let Ok(target) = std::env::var("UITEST_TEST_TARGET") { config.target = Some(target); diff --git a/tests/integrations/cargo-run/Cargo.lock b/tests/integrations/cargo-run/Cargo.lock new file mode 100644 index 00000000..cacf869f --- /dev/null +++ b/tests/integrations/cargo-run/Cargo.lock @@ -0,0 +1,848 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "annotate-snippets" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5a59f105fb9635e9eebdc1e29d53e764fa5795b9cf899a638a53e61567ef61" +dependencies = [ + "anstyle", + "unicode-width", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anyhow" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "basic_bin" +version = "0.1.0" +dependencies = [ + "tempfile", + "ui_test", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bstr" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +dependencies = [ + "memchr", + "regex-automata 0.4.3", + "serde", +] + +[[package]] +name = "camino" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "color-eyre" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors 3.5.0", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" +dependencies = [ + "once_cell", + "owo-colors 3.5.0", + "tracing-core", + "tracing-error", +] + +[[package]] +name = "colored" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "comma" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.45.0", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "eyre" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indicatif" +version = "0.17.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "itoa" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "levenshtein" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" + +[[package]] +name = "libc" +version = "0.2.156" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "owo-colors" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" + +[[package]] +name = "pin-project-lite" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" + +[[package]] +name = "portable-atomic" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc55135a600d700580e406b4de0d59cb9ad25e344a3a091a97ded2622ec4ec6" + +[[package]] +name = "prettydiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac17546d82912e64874e3d5b40681ce32eac4e5834344f51efcf689ff1550a65" +dependencies = [ + "owo-colors 4.2.3", +] + +[[package]] +name = "proc-macro2" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "regex-automata 0.3.2", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustfix" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "rustix" +version = "0.37.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "ryu" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "spanned" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e8e76fd7aeee255ddaa885b9de506484b21cbd458ae9d04d1b24851e82ee58a" +dependencies = [ + "anyhow", + "bstr", + "color-eyre", +] + +[[package]] +name = "syn" +version = "2.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +dependencies = [ + "autocfg", + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "sharded-slab", + "thread_local", + "tracing-core", +] + +[[package]] +name = "ui_test" +version = "0.30.3" +dependencies = [ + "annotate-snippets", + "anyhow", + "bstr", + "cargo-platform", + "cargo_metadata", + "color-eyre", + "colored", + "comma", + "crossbeam-channel", + "indicatif", + "levenshtein", + "prettydiff", + "regex", + "rustc_version", + "rustfix", + "serde", + "serde_json", + "spanned", +] + +[[package]] +name = "unicode-ident" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/tests/integrations/cargo-run/Cargo.stdout b/tests/integrations/cargo-run/Cargo.stdout new file mode 100644 index 00000000..d8030038 --- /dev/null +++ b/tests/integrations/cargo-run/Cargo.stdout @@ -0,0 +1,12 @@ + +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished + +tests/actual_tests/empty_no_stdin.rs ... ok +tests/actual_tests/matching_stdin.rs ... ok +tests/actual_tests/mismatching_stdin.rs ... ok +tests/actual_tests/no_stdin.rs ... ok + +test result: ok. 4 passed + diff --git a/tests/integrations/cargo-run/Cargo.toml b/tests/integrations/cargo-run/Cargo.toml new file mode 100644 index 00000000..7474d9c4 --- /dev/null +++ b/tests/integrations/cargo-run/Cargo.toml @@ -0,0 +1,14 @@ +[package] +name = "basic_bin" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dev-dependencies] +ui_test = { path = "../../.."} +tempfile = "3.3.0" + +[[test]] +name = "ui_tests" +harness = false diff --git a/tests/integrations/cargo-run/src/main.rs b/tests/integrations/cargo-run/src/main.rs new file mode 100644 index 00000000..7d4a5aa2 --- /dev/null +++ b/tests/integrations/cargo-run/src/main.rs @@ -0,0 +1,13 @@ +fn main() { + let arg = std::env::args().nth(1).unwrap(); + let input = std::fs::read_to_string(arg).unwrap(); + let mut b = std::io::stdin().lines(); + for (line, a ) in input.lines().enumerate() { + let b = b.next().expect(&format!(".stdin file is missing line {}", line + 1)).unwrap(); + assert_eq!(a, b); + } + for b in b { + panic!("{}", b.unwrap()); + } + panic!("done"); +} diff --git a/tests/integrations/cargo-run/tests/actual_tests/empty_no_stdin.rs b/tests/integrations/cargo-run/tests/actual_tests/empty_no_stdin.rs new file mode 100644 index 00000000..e69de29b diff --git a/tests/integrations/cargo-run/tests/actual_tests/empty_no_stdin.stderr b/tests/integrations/cargo-run/tests/actual_tests/empty_no_stdin.stderr new file mode 100644 index 00000000..692519fe --- /dev/null +++ b/tests/integrations/cargo-run/tests/actual_tests/empty_no_stdin.stderr @@ -0,0 +1,3 @@ +thread 'main' panicked at src/main.rs:12:5: +done +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.rs b/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.rs new file mode 100644 index 00000000..5f5521fa --- /dev/null +++ b/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.rs @@ -0,0 +1,2 @@ +abc +def diff --git a/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stderr b/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stderr new file mode 100644 index 00000000..692519fe --- /dev/null +++ b/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stderr @@ -0,0 +1,3 @@ +thread 'main' panicked at src/main.rs:12:5: +done +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stdin b/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stdin new file mode 100644 index 00000000..5f5521fa --- /dev/null +++ b/tests/integrations/cargo-run/tests/actual_tests/matching_stdin.stdin @@ -0,0 +1,2 @@ +abc +def diff --git a/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.rs b/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.rs new file mode 100644 index 00000000..0bf4a5ab --- /dev/null +++ b/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.rs @@ -0,0 +1,2 @@ +cake +lie diff --git a/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stderr b/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stderr new file mode 100644 index 00000000..3e8e2627 --- /dev/null +++ b/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stderr @@ -0,0 +1,5 @@ +thread 'main' panicked at src/main.rs:7:9: +assertion `left == right` failed + left: "cake" + right: "asdfasdf" +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stdin b/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stdin new file mode 100644 index 00000000..f13588b9 --- /dev/null +++ b/tests/integrations/cargo-run/tests/actual_tests/mismatching_stdin.stdin @@ -0,0 +1 @@ +asdfasdf diff --git a/tests/integrations/cargo-run/tests/actual_tests/no_stdin.rs b/tests/integrations/cargo-run/tests/actual_tests/no_stdin.rs new file mode 100644 index 00000000..cba17e97 --- /dev/null +++ b/tests/integrations/cargo-run/tests/actual_tests/no_stdin.rs @@ -0,0 +1,2 @@ +asdf +uiop diff --git a/tests/integrations/cargo-run/tests/actual_tests/no_stdin.stderr b/tests/integrations/cargo-run/tests/actual_tests/no_stdin.stderr new file mode 100644 index 00000000..a6617e31 --- /dev/null +++ b/tests/integrations/cargo-run/tests/actual_tests/no_stdin.stderr @@ -0,0 +1,3 @@ +thread 'main' panicked at src/main.rs:6:26: +.stdin file is missing line 1 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/integrations/cargo-run/tests/ui_tests.rs b/tests/integrations/cargo-run/tests/ui_tests.rs new file mode 100644 index 00000000..4efd0ec2 --- /dev/null +++ b/tests/integrations/cargo-run/tests/ui_tests.rs @@ -0,0 +1,26 @@ +use ui_test::{spanned::Spanned, *}; + +fn main() -> ui_test::color_eyre::Result<()> { + let mut config = Config { + output_conflict_handling: if std::env::var_os("BLESS").is_some() { + ui_test::bless_output_files + } else { + ui_test::error_on_output_conflict + }, + bless_command: Some("cargo test".to_string()), + ..Config::cargo("tests/actual_tests") + }; + config.comment_defaults.base().exit_status = Spanned::dummy(101).into(); + config.comment_defaults.base().require_annotations = Spanned::dummy(false).into(); + + config.program.args = vec!["run".into(), "--quiet".into()]; + config.program.input_file_flag = Some("--".into()); + + run_tests_generic( + vec![config], + default_file_filter, + |_config, _content| {}, + // Avoid github actions, as these would end up showing up in `Cargo.stderr` + status_emitter::Text::verbose(), + ) +} diff --git a/tests/integrations/dep-fail/Cargo.lock b/tests/integrations/dep-fail/Cargo.lock new file mode 100644 index 00000000..1233a4f4 --- /dev/null +++ b/tests/integrations/dep-fail/Cargo.lock @@ -0,0 +1,675 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "annotate-snippets" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5a59f105fb9635e9eebdc1e29d53e764fa5795b9cf899a638a53e61567ef61" +dependencies = [ + "anstyle", + "unicode-width", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anyhow" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + +[[package]] +name = "backtrace" +version = "0.3.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "regex-automata", + "serde", +] + +[[package]] +name = "camino" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cc" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "color-eyre" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors 3.5.0", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" +dependencies = [ + "once_cell", + "owo-colors 3.5.0", + "tracing-core", + "tracing-error", +] + +[[package]] +name = "colored" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "comma" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" + +[[package]] +name = "compile_test" +version = "0.1.0" +dependencies = [ + "ui_test", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "levenshtein" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" + +[[package]] +name = "libc" +version = "0.2.156" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "owo-colors" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "prettydiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac17546d82912e64874e3d5b40681ce32eac4e5834344f51efcf689ff1550a65" +dependencies = [ + "owo-colors 4.2.3", +] + +[[package]] +name = "proc-macro2" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustfix" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "spanned" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4b0c055fde758f086eb4a6e73410247df8a3837fd606d2caeeaf72aa566d" +dependencies = [ + "anyhow", + "bstr", + "color-eyre", +] + +[[package]] +name = "syn" +version = "2.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "thiserror" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "sharded-slab", + "thread_local", + "tracing-core", +] + +[[package]] +name = "ui_test" +version = "0.30.3" +dependencies = [ + "annotate-snippets", + "anyhow", + "bstr", + "cargo-platform", + "cargo_metadata", + "color-eyre", + "colored", + "comma", + "crossbeam-channel", + "indicatif", + "levenshtein", + "prettydiff", + "regex", + "rustc_version", + "rustfix", + "serde", + "serde_json", + "spanned", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/tests/integrations/dep-fail/Cargo.stderr b/tests/integrations/dep-fail/Cargo.stderr new file mode 100644 index 00000000..a9e6fbb3 --- /dev/null +++ b/tests/integrations/dep-fail/Cargo.stderr @@ -0,0 +1,10 @@ +Error: tests failed + +Location: + $DIR/src/lib.rs:LL:CC +error: test failed, to rerun pass `--test ui` + +Caused by: + process didn't exit successfully: `$DIR/target/ui/1/tests/integrations/dep-fail/debug/deps/ui-HASH` (exit status: 1) +error: 1 target failed: + `--test ui` diff --git a/tests/integrations/dep-fail/Cargo.stdout b/tests/integrations/dep-fail/Cargo.stdout new file mode 100644 index 00000000..370874ff --- /dev/null +++ b/tests/integrations/dep-fail/Cargo.stdout @@ -0,0 +1,40 @@ + +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished + +Building dependencies ... FAILED +tests/ui/basic_test.rs ... FAILED + +FAILED TEST: tests/ui/basic_test.rs +command: "$CMD" "build" "--color=never" "--quiet" "--jobs" "1" "--target-dir" "$DIR/tests/integrations/dep-fail/target/ui/0" "--manifest-path" "tested_crate/Cargo.toml" "--message-format=json" + +full stderr: +error: could not compile `tested_crate` (lib) due to 2 previous errors + +full stdout: +$DIR/tests/integrations/dep-fail/tested_crate/src/lib.rs +error: this file contains an unclosed delimiter + --> src/lib.rs:LL:CC + | +1 | pub trait A { + | - ^ + | | + | unclosed delimiter + +$DIR/tests/integrations/dep-fail/tested_crate/src/lib.rs +error: aborting due to 1 previous error + +BuildFinished { success: false } + + +FAILURES: + tests/ui/basic_test.rs + +test result: FAIL. 1 failed + + +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished + diff --git a/tests/integrations/dep-fail/Cargo.toml b/tests/integrations/dep-fail/Cargo.toml new file mode 100644 index 00000000..9272ca44 --- /dev/null +++ b/tests/integrations/dep-fail/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "compile_test" +version = "0.1.0" +edition = "2021" + +[dev-dependencies] +ui_test = { path = "../../.." } + +[[test]] +name = "ui" +harness = false diff --git a/tests/integrations/dep-fail/src/lib.rs b/tests/integrations/dep-fail/src/lib.rs new file mode 100644 index 00000000..e69de29b diff --git a/tests/integrations/dep-fail/tested_crate/Cargo.lock b/tests/integrations/dep-fail/tested_crate/Cargo.lock new file mode 100644 index 00000000..7cedfe5b --- /dev/null +++ b/tests/integrations/dep-fail/tested_crate/Cargo.lock @@ -0,0 +1,7 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "tested_crate" +version = "0.1.0-dev" diff --git a/tests/integrations/dep-fail/tested_crate/Cargo.toml b/tests/integrations/dep-fail/tested_crate/Cargo.toml new file mode 100644 index 00000000..e9d328ee --- /dev/null +++ b/tests/integrations/dep-fail/tested_crate/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "tested_crate" +version = "0.1.0-dev" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] \ No newline at end of file diff --git a/tests/integrations/dep-fail/tested_crate/src/lib.rs b/tests/integrations/dep-fail/tested_crate/src/lib.rs new file mode 100644 index 00000000..a929c6be --- /dev/null +++ b/tests/integrations/dep-fail/tested_crate/src/lib.rs @@ -0,0 +1 @@ +pub trait A { diff --git a/tests/integrations/dep-fail/tests/ui.rs b/tests/integrations/dep-fail/tests/ui.rs new file mode 100644 index 00000000..447a963a --- /dev/null +++ b/tests/integrations/dep-fail/tests/ui.rs @@ -0,0 +1,29 @@ +use ui_test::{ + default_file_filter, default_per_file_config, dependencies::DependencyBuilder, + run_tests_generic, status_emitter::Text, Args, Config, +}; + +fn main() -> ui_test::Result<()> { + let mut config = Config { + output_conflict_handling: ui_test::ignore_output_conflict, + ..Config::rustc("tests/ui") + }; + config.comment_defaults.base().set_custom( + "dependencies", + DependencyBuilder { + crate_manifest_path: "tested_crate/Cargo.toml".into(), + ..DependencyBuilder::default() + }, + ); + + let args = Args::test()?; + + config.with_args(&args); + + run_tests_generic( + [config].into(), + default_file_filter, + default_per_file_config, + Text::verbose(), + ) +} diff --git a/tests/integrations/dep-fail/tests/ui/basic_test.rs b/tests/integrations/dep-fail/tests/ui/basic_test.rs new file mode 100644 index 00000000..cbfb3e82 --- /dev/null +++ b/tests/integrations/dep-fail/tests/ui/basic_test.rs @@ -0,0 +1 @@ +use tested_crate::A; diff --git a/tests/integrations/ui_test_dep_bug/Cargo.lock b/tests/integrations/ui_test_dep_bug/Cargo.lock new file mode 100644 index 00000000..88012f8d --- /dev/null +++ b/tests/integrations/ui_test_dep_bug/Cargo.lock @@ -0,0 +1,680 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "annotate-snippets" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5a59f105fb9635e9eebdc1e29d53e764fa5795b9cf899a638a53e61567ef61" +dependencies = [ + "anstyle", + "unicode-width", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anyhow" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + +[[package]] +name = "backtrace" +version = "0.3.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "regex-automata", + "serde", +] + +[[package]] +name = "camino" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cc" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "color-eyre" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors 3.5.0", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" +dependencies = [ + "once_cell", + "owo-colors 3.5.0", + "tracing-core", + "tracing-error", +] + +[[package]] +name = "colored" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "comma" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" + +[[package]] +name = "compile_test" +version = "0.1.0" +dependencies = [ + "tested_crate", + "ui_test", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "levenshtein" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" + +[[package]] +name = "libc" +version = "0.2.156" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "owo-colors" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52" + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "prettydiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac17546d82912e64874e3d5b40681ce32eac4e5834344f51efcf689ff1550a65" +dependencies = [ + "owo-colors 4.2.3", +] + +[[package]] +name = "proc-macro2" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustfix" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "spanned" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4b0c055fde758f086eb4a6e73410247df8a3837fd606d2caeeaf72aa566d" +dependencies = [ + "anyhow", + "bstr", + "color-eyre", +] + +[[package]] +name = "syn" +version = "2.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tested_crate" +version = "0.1.0-dev" + +[[package]] +name = "thiserror" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "sharded-slab", + "thread_local", + "tracing-core", +] + +[[package]] +name = "ui_test" +version = "0.30.3" +dependencies = [ + "annotate-snippets", + "anyhow", + "bstr", + "cargo-platform", + "cargo_metadata", + "color-eyre", + "colored", + "comma", + "crossbeam-channel", + "indicatif", + "levenshtein", + "prettydiff", + "regex", + "rustc_version", + "rustfix", + "serde", + "serde_json", + "spanned", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/tests/integrations/ui_test_dep_bug/Cargo.stdout b/tests/integrations/ui_test_dep_bug/Cargo.stdout new file mode 100644 index 00000000..990abfae --- /dev/null +++ b/tests/integrations/ui_test_dep_bug/Cargo.stdout @@ -0,0 +1,15 @@ + +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished + +Building dependencies ... ok +tests/ui/basic_test.rs ... ok + +test result: ok. 1 passed + + +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished + diff --git a/tests/integrations/ui_test_dep_bug/Cargo.toml b/tests/integrations/ui_test_dep_bug/Cargo.toml new file mode 100644 index 00000000..44ed7a8b --- /dev/null +++ b/tests/integrations/ui_test_dep_bug/Cargo.toml @@ -0,0 +1,20 @@ +[package] +name = "compile_test" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +# This fails +tested_crate = { path = "tested_crate" } + +# This works +#tested_crate = { path = "../tested_crate", version = "0.1.0-dev" } + +[dev-dependencies] +ui_test = { path = "../../.." } + +[[test]] +name = "ui" +harness = false diff --git a/tests/integrations/ui_test_dep_bug/src/lib.rs b/tests/integrations/ui_test_dep_bug/src/lib.rs new file mode 100644 index 00000000..e69de29b diff --git a/tests/integrations/ui_test_dep_bug/tested_crate/Cargo.toml b/tests/integrations/ui_test_dep_bug/tested_crate/Cargo.toml new file mode 100644 index 00000000..e9d328ee --- /dev/null +++ b/tests/integrations/ui_test_dep_bug/tested_crate/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "tested_crate" +version = "0.1.0-dev" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] \ No newline at end of file diff --git a/tests/integrations/ui_test_dep_bug/tested_crate/src/lib.rs b/tests/integrations/ui_test_dep_bug/tested_crate/src/lib.rs new file mode 100644 index 00000000..ecb62fe4 --- /dev/null +++ b/tests/integrations/ui_test_dep_bug/tested_crate/src/lib.rs @@ -0,0 +1,2 @@ +pub trait A {} +pub trait B: A {} diff --git a/tests/integrations/ui_test_dep_bug/tests/ui.rs b/tests/integrations/ui_test_dep_bug/tests/ui.rs new file mode 100644 index 00000000..8a304e53 --- /dev/null +++ b/tests/integrations/ui_test_dep_bug/tests/ui.rs @@ -0,0 +1,26 @@ +use ui_test::{ + default_file_filter, default_per_file_config, dependencies::DependencyBuilder, + run_tests_generic, status_emitter::Text, Args, Config, +}; + +fn main() -> ui_test::Result<()> { + let mut config = Config { + output_conflict_handling: ui_test::ignore_output_conflict, + ..Config::rustc("tests/ui") + }; + config + .comment_defaults + .base() + .set_custom("dependencies", DependencyBuilder::default()); + + let args = Args::test()?; + + config.with_args(&args); + + run_tests_generic( + [config].into(), + default_file_filter, + default_per_file_config, + Text::verbose(), + ) +} diff --git a/tests/integrations/ui_test_dep_bug/tests/ui/basic_test.rs b/tests/integrations/ui_test_dep_bug/tests/ui/basic_test.rs new file mode 100644 index 00000000..63ffaa88 --- /dev/null +++ b/tests/integrations/ui_test_dep_bug/tests/ui/basic_test.rs @@ -0,0 +1,6 @@ +use tested_crate::B; + +struct DoesntImplementA; + +impl B for DoesntImplementA {} +//~^ E0277 \ No newline at end of file From 32b25dae85eb4a76a8f6991061d3fc82eb414e1f Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Tue, 2 Dec 2025 13:11:37 -0500 Subject: [PATCH 4/4] Replace hashes with `$HASH` placeholder --- tests/integration.rs | 2 ++ tests/integrations/basic/Cargo.stdout | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/integration.rs b/tests/integration.rs index bb3b82da..37916d3d 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -61,7 +61,9 @@ fn main() -> Result<()> { config.filter("RUSTC_ICE=\"0\" ", ""); // The order of the `/deps` directory flag is flaky config.stdout_filter("/deps", ""); + config.stdout_filter("[0-9a-f]+\\.rlib", "$$HASH.rlib"); config.stdout_filter("[0-9a-f]+\\.rmeta", "$$HASH.rmeta"); + config.stdout_filter("[0-9a-f]+\\.so", "$$HASH.so"); // Windows backslashes are sometimes escaped. // Insert the replacement filter at the start to make sure the filter for single backslashes // runs afterwards. diff --git a/tests/integrations/basic/Cargo.stdout b/tests/integrations/basic/Cargo.stdout index 02209308..94c608bd 100644 --- a/tests/integrations/basic/Cargo.stdout +++ b/tests/integrations/basic/Cargo.stdout @@ -57,10 +57,10 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini { "type": "test", "event": "ok", "name": "tests/actual_tests/match_diagnostic_code.rs () - tests/actual_tests/match_diagnostic_code.rs" } { "type": "test", "event": "ok", "name": "tests/actual_tests/match_diagnostic_code.rs () - tests/actual_tests/match_diagnostic_code.fixed" } { "type": "test", "event": "ok", "name": "tests/actual_tests/no_rustfix.rs () - tests/actual_tests/no_rustfix.rs" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode_disabled.rs () - tests/actual_tests/rustfix-mode_disabled.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustfix-mode_disabled.rs\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta\" \"--extern\" \"serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustfix-mode_disabled.rs:4:12\n |\n4 | pub static x: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `X`\n |\n = note: `#[warn(non_upper_case_globals)]` on by default\n\nwarning: static variable `y` should have an upper case name\n --> tests/actual_tests/rustfix-mode_disabled.rs:7:16\n |\n7 | pub static y: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `Y`\n\nwarning: 2 warnings emitted\n\n> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode_everything.rs () - tests/actual_tests/rustfix-mode_everything.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustfix-mode_everything.rs\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta\" \"--extern\" \"serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustfix-mode_everything.rs:4:12\n |\n4 | pub static x: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `X`\n |\n = note: `#[warn(non_upper_case_globals)]` on by default\n\nwarning: static variable `y` should have an upper case name\n --> tests/actual_tests/rustfix-mode_everything.rs:7:16\n |\n7 | pub static y: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `Y`\n\nwarning: 2 warnings emitted\n\n> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode_disabled.rs () - tests/actual_tests/rustfix-mode_disabled.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustfix-mode_disabled.rs\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rlib\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta\" \"--extern\" \"serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-$HASH.so\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasi$HASH.rlib\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustfix-mode_disabled.rs:4:12\n |\n4 | pub static x: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `X`\n |\n = note: `#[warn(non_upper_case_globals)]` on by default\n\nwarning: static variable `y` should have an upper case name\n --> tests/actual_tests/rustfix-mode_disabled.rs:7:16\n |\n7 | pub static y: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `Y`\n\nwarning: 2 warnings emitted\n\n> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode_everything.rs () - tests/actual_tests/rustfix-mode_everything.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustfix-mode_everything.rs\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rlib\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta\" \"--extern\" \"serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-$HASH.so\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasi$HASH.rlib\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustfix-mode_everything.rs:4:12\n |\n4 | pub static x: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `X`\n |\n = note: `#[warn(non_upper_case_globals)]` on by default\n\nwarning: static variable `y` should have an upper case name\n --> tests/actual_tests/rustfix-mode_everything.rs:7:16\n |\n7 | pub static y: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `Y`\n\nwarning: 2 warnings emitted\n\n> stderr: <>" } { "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode_invalid.rs () - tests/actual_tests/rustfix-mode_invalid.rs", "stdout": "command: stdout: <> stderr: <>" } -{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode_machine-applicable.rs () - tests/actual_tests/rustfix-mode_machine-applicable.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustfix-mode_machine-applicable.rs\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta\" \"--extern\" \"serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustfix-mode_machine-applicable.rs:4:12\n |\n4 | pub static x: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `X`\n |\n = note: `#[warn(non_upper_case_globals)]` on by default\n\nwarning: static variable `y` should have an upper case name\n --> tests/actual_tests/rustfix-mode_machine-applicable.rs:7:16\n |\n7 | pub static y: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `Y`\n\nwarning: 2 warnings emitted\n\n> stderr: <>" } +{ "type": "test", "event": "failed", "name": "tests/actual_tests/rustfix-mode_machine-applicable.rs () - tests/actual_tests/rustfix-mode_machine-applicable.rs", "stdout": "command: <\"rustc\" \"--error-format=json\" \"--out-dir\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/tests/actual_tests\" \"tests/actual_tests/rustfix-mode_machine-applicable.rs\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rlib\" \"--extern\" \"quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta\" \"--extern\" \"serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-$HASH.so\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a\" \"--extern\" \"basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasi$HASH.rlib\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/0/debug\" \"-L\" \"$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug\" \"--edition\" \"2021\"> stdout: tests/actual_tests/rustfix-mode_machine-applicable.rs:4:12\n |\n4 | pub static x: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `X`\n |\n = note: `#[warn(non_upper_case_globals)]` on by default\n\nwarning: static variable `y` should have an upper case name\n --> tests/actual_tests/rustfix-mode_machine-applicable.rs:7:16\n |\n7 | pub static y: u32 = 0;\n | ^ help: convert the identifier to upper case (notice the capitalization): `Y`\n\nwarning: 2 warnings emitted\n\n> stderr: <>" } { "type": "test", "event": "ok", "name": "tests/actual_tests/rustfix-multiple.rs () - tests/actual_tests/rustfix-multiple.rs" } { "type": "test", "event": "ok", "name": "tests/actual_tests/rustfix-multiple.rs () - tests/actual_tests/rustfix-multiple.1.fixed" } { "type": "test", "event": "ok", "name": "tests/actual_tests/rustfix-multiple.rs () - tests/actual_tests/rustfix-multiple.2.fixed" } @@ -118,7 +118,7 @@ tests/actual_tests/windows_paths.rs ... ok tests/actual_tests/subdir/aux_proc_macro.rs ... ok FAILED TEST: tests/actual_tests/rustfix-mode_disabled.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustfix-mode_disabled.rs" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta" "--extern" "serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/0/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustfix-mode_disabled.rs" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rlib" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta" "--extern" "serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-$HASH.so" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasi$HASH.rlib" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/0/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" error: test got exit status: 0, but expected 1 = note: compilation succeeded, but was expected to fail @@ -148,7 +148,7 @@ full stdout: FAILED TEST: tests/actual_tests/rustfix-mode_everything.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustfix-mode_everything.rs" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta" "--extern" "serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/0/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustfix-mode_everything.rs" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rlib" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta" "--extern" "serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-$HASH.so" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasi$HASH.rlib" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/0/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" error: test got exit status: 0, but expected 1 = note: compilation succeeded, but was expected to fail @@ -194,7 +194,7 @@ full stdout: FAILED TEST: tests/actual_tests/rustfix-mode_machine-applicable.rs -command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustfix-mode_machine-applicable.rs" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-a0fa585a448852ad.rlib" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta" "--extern" "serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-add6cb5757212a0a.so" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.rlib" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/0/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" +command: "rustc" "--error-format=json" "--out-dir" "$TMP "tests/actual_tests/rustfix-mode_machine-applicable.rs" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rlib" "--extern" "quote=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libquote-$HASH.rmeta" "--extern" "serde_derive=$DIR/tests/integrations/basic/../../../target/$TMP/0/debug/libserde_derive-$HASH.so" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasic.a" "--extern" "basic=$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug/libbasi$HASH.rlib" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/0/debug" "-L" "$DIR/tests/integrations/basic/../../../target/$TMP/$TRIPLE/debug" "--edition" "2021" error: test got exit status: 0, but expected 1 = note: compilation succeeded, but was expected to fail