From ca0bf4b781798cc5efd64b6760bb410020593c33 Mon Sep 17 00:00:00 2001 From: Oneirical Date: Mon, 7 Jul 2025 21:52:51 -0400 Subject: [PATCH] Selectively replace `error-pattern` with `check-run-result` --- tests/ui/array-slice-vec/bounds-check-no-overflow.rs | 2 +- tests/ui/array-slice-vec/dst-raw-slice.rs | 2 +- tests/ui/array-slice-vec/vec-overrun.rs | 2 +- .../issue-65419-async-fn-resume-after-completion.rs | 3 +-- .../issue-65419/issue-65419-async-fn-resume-after-panic.rs | 3 +-- .../issue-65419-coroutine-resume-after-completion.rs | 2 +- tests/ui/binop/binop-fail-3.rs | 2 +- tests/ui/binop/binop-panic.rs | 2 +- tests/ui/borrowck/borrowck-local-borrow.rs | 2 +- tests/ui/borrowck/issue-28934.rs | 2 +- tests/ui/closures/diverging-closure.rs | 2 +- tests/ui/consts/issue-29798.rs | 2 +- tests/ui/coroutine/coroutine-resume-after-panic.rs | 2 +- tests/ui/errors/remap-path-prefix-reverse.rs | 2 +- tests/ui/expr/copy.rs | 1 + tests/ui/expr/if/expr-if-panic-fn.rs | 2 +- tests/ui/expr/if/expr-if-panic.rs | 2 +- tests/ui/expr/if/if-check-panic.rs | 2 +- tests/ui/expr/if/if-cond-bot.rs | 2 +- tests/ui/extern/issue-18576.rs | 2 +- tests/ui/fn/expr-fn-panic.rs | 2 +- .../static-lifetime-tip-with-default-type.rs | 4 +--- tests/ui/imports/glob-use-std.rs | 2 +- tests/ui/issues/issue-12920.rs | 2 +- tests/ui/issues/issue-13202.rs | 2 +- tests/ui/issues/issue-20971.rs | 2 +- tests/ui/issues/issue-23354-2.rs | 2 +- tests/ui/issues/issue-23354.rs | 2 +- tests/ui/issues/issue-2470-bounds-check-overflow.rs | 2 +- tests/ui/issues/issue-2761.rs | 2 +- tests/ui/issues/issue-3029.rs | 2 +- tests/ui/issues/issue-30380.rs | 2 +- tests/ui/issues/issue-44216-add-instant.rs | 2 +- tests/ui/issues/issue-44216-add-system-time.rs | 2 +- tests/ui/issues/issue-44216-sub-instant.rs | 2 +- tests/ui/issues/issue-44216-sub-system-time.rs | 2 +- tests/ui/loops/for-each-loop-panic.rs | 2 +- tests/ui/loops/issue-69225-SCEVAddExpr-wrap-flag.rs | 2 +- tests/ui/loops/issue-69225-layout-repeated-checked-add.rs | 2 +- tests/ui/macros/assert-as-macro.rs | 2 +- tests/ui/macros/assert-eq-macro-msg.rs | 4 +--- tests/ui/macros/assert-eq-macro-panic.rs | 4 +--- tests/ui/macros/assert-macro-explicit.rs | 2 +- tests/ui/macros/assert-macro-fmt.rs | 3 +-- tests/ui/macros/assert-macro-owned.rs | 3 +-- tests/ui/macros/assert-macro-static.rs | 3 +-- tests/ui/macros/assert-matches-macro-msg.rs | 4 +--- tests/ui/macros/assert-ne-macro-msg.rs | 4 +--- tests/ui/macros/assert-ne-macro-panic.rs | 4 +--- tests/ui/macros/borrowck-error-in-macro.rs | 2 +- tests/ui/macros/die-macro-2.rs | 2 +- tests/ui/macros/die-macro-expr.rs | 2 +- tests/ui/macros/die-macro-pure.rs | 2 +- tests/ui/macros/unimplemented-macro-panic.rs | 2 +- tests/ui/macros/unreachable-fmt-msg.rs | 2 +- tests/ui/macros/unreachable-macro-panic.rs | 2 +- tests/ui/macros/unreachable-static-msg.rs | 2 +- tests/ui/macros/unreachable.rs | 2 +- tests/ui/match/expr-match-panic-fn.rs | 2 +- tests/ui/match/expr-match-panic.rs | 2 +- tests/ui/match/match-bot-panic.rs | 2 +- tests/ui/match/match-disc-bot.rs | 2 +- tests/ui/match/match-wildcards.rs | 2 +- tests/ui/mir/alignment/borrow_misaligned_field_projection.rs | 2 +- tests/ui/mir/alignment/misaligned_borrow.rs | 2 +- tests/ui/mir/alignment/misaligned_lhs.rs | 2 +- tests/ui/mir/alignment/misaligned_mut_borrow.rs | 2 +- tests/ui/mir/alignment/misaligned_rhs.rs | 2 +- tests/ui/mir/alignment/two_pointers.rs | 2 +- tests/ui/mir/enum/convert_non_enum_break.rs | 2 +- tests/ui/mir/enum/convert_non_enum_niche_break.rs | 2 +- tests/ui/mir/enum/negative_discr_break.rs | 2 +- tests/ui/mir/enum/niche_option_tuple_break.rs | 2 +- tests/ui/mir/enum/numbered_variants_break.rs | 2 +- tests/ui/mir/enum/option_with_bigger_niche_break.rs | 2 +- tests/ui/mir/enum/plain_no_data_break.rs | 2 +- tests/ui/mir/enum/single_with_repr_break.rs | 2 +- tests/ui/mir/enum/with_niche_int_break.rs | 2 +- tests/ui/mir/enum/wrap_break.rs | 2 +- tests/ui/mir/mir_codegen_calls_converging_drops.rs | 4 +--- tests/ui/mir/mir_codegen_calls_converging_drops_2.rs | 4 +--- tests/ui/mir/mir_codegen_calls_diverging.rs | 2 +- tests/ui/mir/mir_codegen_calls_diverging_drops.rs | 3 +-- tests/ui/mir/mir_drop_panics.rs | 3 +-- tests/ui/mir/mir_dynamic_drops_1.rs | 3 +-- tests/ui/mir/mir_dynamic_drops_2.rs | 2 +- tests/ui/mir/mir_dynamic_drops_3.rs | 5 +---- tests/ui/mir/mir_indexing_oob_1.rs | 2 +- tests/ui/mir/mir_indexing_oob_2.rs | 2 +- tests/ui/mir/mir_indexing_oob_3.rs | 2 +- tests/ui/mir/null/borrowed_mut_null.rs | 2 +- tests/ui/mir/null/borrowed_null.rs | 2 +- tests/ui/mir/null/borrowed_null_zst.rs | 2 +- tests/ui/mir/null/null_lhs.rs | 2 +- tests/ui/mir/null/null_rhs.rs | 2 +- tests/ui/mir/null/two_pointers.rs | 2 +- tests/ui/never_type/return-never-coerce.rs | 2 +- tests/ui/nll/issue-51345-2.rs | 3 +-- tests/ui/numbers-arithmetic/divide-by-zero.rs | 2 +- tests/ui/numbers-arithmetic/location-add-assign-overflow.rs | 2 +- tests/ui/numbers-arithmetic/location-add-overflow.rs | 2 +- .../ui/numbers-arithmetic/location-divide-assign-by-zero.rs | 2 +- tests/ui/numbers-arithmetic/location-divide-by-zero.rs | 2 +- tests/ui/numbers-arithmetic/location-mod-assign-by-zero.rs | 2 +- tests/ui/numbers-arithmetic/location-mod-by-zero.rs | 2 +- tests/ui/numbers-arithmetic/location-mul-assign-overflow.rs | 2 +- tests/ui/numbers-arithmetic/location-mul-overflow.rs | 2 +- tests/ui/numbers-arithmetic/location-sub-assign-overflow.rs | 2 +- tests/ui/numbers-arithmetic/location-sub-overflow.rs | 2 +- tests/ui/numbers-arithmetic/mod-zero.rs | 2 +- tests/ui/numbers-arithmetic/overflowing-add.rs | 3 +-- tests/ui/numbers-arithmetic/overflowing-mul.rs | 3 +-- tests/ui/numbers-arithmetic/overflowing-sub.rs | 3 +-- tests/ui/numbers-arithmetic/promoted_overflow.rs | 2 +- tests/ui/panic-runtime/unwind-interleaved.rs | 2 +- tests/ui/panic-runtime/unwind-rec.rs | 2 +- tests/ui/panic-runtime/unwind-rec2.rs | 2 +- tests/ui/panic-runtime/unwind-unique.rs | 2 +- tests/ui/panics/args-panic.rs | 2 +- tests/ui/panics/doublepanic.rs | 2 +- tests/ui/panics/explicit-panic-msg.rs | 2 +- tests/ui/panics/explicit-panic.rs | 2 +- tests/ui/panics/fmt-panic.rs | 2 +- tests/ui/panics/main-panic.rs | 2 +- tests/ui/panics/panic-arg.rs | 2 +- tests/ui/panics/panic-in-cleanup.rs | 1 - tests/ui/panics/panic-in-ffi.rs | 2 -- tests/ui/panics/panic-in-message-fmt.rs | 1 - tests/ui/panics/panic-macro-any-wrapped.rs | 3 +-- tests/ui/panics/panic-macro-any.rs | 3 +-- tests/ui/panics/panic-macro-explicit.rs | 3 +-- tests/ui/panics/panic-macro-fmt.rs | 3 +-- tests/ui/panics/panic-macro-owned.rs | 3 +-- tests/ui/panics/panic-macro-static.rs | 3 +-- tests/ui/panics/panic-main.rs | 2 +- tests/ui/panics/panic-parens.rs | 2 +- tests/ui/panics/panic-set-handler.rs | 2 +- tests/ui/panics/panic-set-unset-handler.rs | 3 +-- tests/ui/panics/panic-take-handler-nop.rs | 3 +-- tests/ui/panics/panic-task-name-none.rs | 3 +-- tests/ui/panics/panic-task-name-owned.rs | 3 +-- tests/ui/panics/panic.rs | 2 +- tests/ui/panics/result-get-panic.rs | 2 +- tests/ui/panics/unique-panic.rs | 2 +- tests/ui/panics/while-body-panics.rs | 2 +- tests/ui/panics/while-panic.rs | 2 +- tests/ui/precondition-checks/alignment.rs | 2 +- tests/ui/precondition-checks/ascii-char-digit_unchecked.rs | 2 +- tests/ui/precondition-checks/assert_unchecked.rs | 2 +- tests/ui/precondition-checks/char-from_u32_unchecked.rs | 2 +- tests/ui/precondition-checks/copy.rs | 2 +- tests/ui/precondition-checks/layout.rs | 2 +- tests/ui/precondition-checks/nonnull.rs | 2 +- tests/ui/precondition-checks/nonzero-from_mut_unchecked.rs | 2 +- tests/ui/precondition-checks/nonzero-new_unchecked.rs | 2 +- tests/ui/precondition-checks/read.rs | 2 +- tests/ui/precondition-checks/read_volatile.rs | 2 +- tests/ui/precondition-checks/replace.rs | 2 +- tests/ui/precondition-checks/slice-from-raw-parts-mut.rs | 2 +- tests/ui/precondition-checks/slice-from-raw-parts.rs | 2 +- tests/ui/precondition-checks/slice-get_unchecked.rs | 2 +- tests/ui/precondition-checks/slice-get_unchecked_mut.rs | 2 +- tests/ui/precondition-checks/slice-swap_unchecked.rs | 2 +- tests/ui/precondition-checks/str-get_unchecked_mut.rs | 2 +- tests/ui/precondition-checks/swap-nonoverlapping.rs | 2 +- tests/ui/precondition-checks/unchecked_add.rs | 2 +- tests/ui/precondition-checks/unchecked_mul.rs | 2 +- tests/ui/precondition-checks/unchecked_shl.rs | 2 +- tests/ui/precondition-checks/unchecked_shr.rs | 2 +- tests/ui/precondition-checks/unchecked_sub.rs | 2 +- tests/ui/precondition-checks/unreachable_unchecked.rs | 2 +- tests/ui/precondition-checks/write.rs | 2 +- tests/ui/precondition-checks/write_bytes.rs | 2 +- tests/ui/precondition-checks/write_volatile.rs | 2 +- tests/ui/process/tls-exit-status.rs | 2 +- tests/ui/reachable/issue-948.rs | 2 +- .../termination-trait-for-box-dyn-error-err.rs | 2 +- .../termination-trait-for-never.rs | 2 +- .../termination-trait-for-result-box-error_err.rs | 2 +- .../termination-trait-for-str-err.rs | 2 +- tests/ui/sanitizer/address.rs | 3 +-- tests/ui/sanitizer/hwaddress.rs | 2 +- tests/ui/sanitizer/leak.rs | 2 +- tests/ui/sanitizer/memory-eager.rs | 2 +- tests/ui/sanitizer/memory.rs | 4 +--- tests/ui/sanitizer/new-llvm-pass-manager-thin-lto.rs | 2 +- tests/ui/sanitizer/thread.rs | 4 +--- tests/ui/sanitizer/use-after-scope.rs | 2 +- tests/ui/str/str-overrun.rs | 2 +- tests/ui/structs/rhs-type.rs | 2 +- tests/ui/threads-sendsync/task-spawn-barefn.rs | 2 +- 191 files changed, 188 insertions(+), 237 deletions(-) diff --git a/tests/ui/array-slice-vec/bounds-check-no-overflow.rs b/tests/ui/array-slice-vec/bounds-check-no-overflow.rs index c5ff805a853e0..5f719edd53b76 100644 --- a/tests/ui/array-slice-vec/bounds-check-no-overflow.rs +++ b/tests/ui/array-slice-vec/bounds-check-no-overflow.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:index out of bounds +//@ check-run-results //@ needs-subprocess use std::mem::size_of; diff --git a/tests/ui/array-slice-vec/dst-raw-slice.rs b/tests/ui/array-slice-vec/dst-raw-slice.rs index ab9dedc139d7e..01921da14fac6 100644 --- a/tests/ui/array-slice-vec/dst-raw-slice.rs +++ b/tests/ui/array-slice-vec/dst-raw-slice.rs @@ -1,7 +1,7 @@ // Test bounds checking for DST raw slices //@ run-fail -//@ error-pattern:index out of bounds +//@ check-run-results //@ needs-subprocess #[allow(unconditional_panic)] diff --git a/tests/ui/array-slice-vec/vec-overrun.rs b/tests/ui/array-slice-vec/vec-overrun.rs index 3b3e9215279f9..27fc516562b6d 100644 --- a/tests/ui/array-slice-vec/vec-overrun.rs +++ b/tests/ui/array-slice-vec/vec-overrun.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:index out of bounds: the len is 1 but the index is 2 +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs b/tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs index a8b05a4befa58..e95e4b013f29f 100644 --- a/tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs +++ b/tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs @@ -2,8 +2,7 @@ // be talking about `async fn`s instead. //@ run-fail -//@ error-pattern: thread 'main' panicked -//@ error-pattern: `async fn` resumed after completion +//@ check-run-results //@ edition:2018 #![feature(coroutines, coroutine_trait)] diff --git a/tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs b/tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs index 94366e662638b..38cbf4219ae4c 100644 --- a/tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs +++ b/tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs @@ -3,8 +3,7 @@ //@ run-fail //@ needs-unwind -//@ error-pattern: thread 'main' panicked -//@ error-pattern: `async fn` resumed after panicking +//@ check-run-results //@ edition:2018 #![feature(coroutines, coroutine_trait)] diff --git a/tests/ui/async-await/issues/issue-65419/issue-65419-coroutine-resume-after-completion.rs b/tests/ui/async-await/issues/issue-65419/issue-65419-coroutine-resume-after-completion.rs index 6b7dfc1235e8e..7780c9ea061dc 100644 --- a/tests/ui/async-await/issues/issue-65419/issue-65419-coroutine-resume-after-completion.rs +++ b/tests/ui/async-await/issues/issue-65419/issue-65419-coroutine-resume-after-completion.rs @@ -3,7 +3,7 @@ // panic when resumed after completion. //@ run-fail -//@ error-pattern:coroutine resumed after completion +//@ check-run-results //@ edition:2018 #![feature(coroutines, coroutine_trait, stmt_expr_attributes)] diff --git a/tests/ui/binop/binop-fail-3.rs b/tests/ui/binop/binop-fail-3.rs index 4e8d7e92ab6b0..8816e94224236 100644 --- a/tests/ui/binop/binop-fail-3.rs +++ b/tests/ui/binop/binop-fail-3.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:quux +//@ check-run-results //@ needs-subprocess fn foo() -> ! { diff --git a/tests/ui/binop/binop-panic.rs b/tests/ui/binop/binop-panic.rs index 8173eb0d6898f..a8c967b653c49 100644 --- a/tests/ui/binop/binop-panic.rs +++ b/tests/ui/binop/binop-panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:quux +//@ check-run-results //@ needs-subprocess fn my_err(s: String) -> ! { diff --git a/tests/ui/borrowck/borrowck-local-borrow.rs b/tests/ui/borrowck/borrowck-local-borrow.rs index 4d22503e37bae..0ac06498996f7 100644 --- a/tests/ui/borrowck/borrowck-local-borrow.rs +++ b/tests/ui/borrowck/borrowck-local-borrow.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:panic 1 +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/borrowck/issue-28934.rs b/tests/ui/borrowck/issue-28934.rs index 64559d4cf1ddc..39eaed695aaf4 100644 --- a/tests/ui/borrowck/issue-28934.rs +++ b/tests/ui/borrowck/issue-28934.rs @@ -2,7 +2,7 @@ // which were not being considered during the contraction phase. //@ run-fail -//@ error-pattern:explicit panic +//@ check-run-results //@ needs-subprocess struct Parser<'i: 't, 't>(&'i u8, &'t u8); diff --git a/tests/ui/closures/diverging-closure.rs b/tests/ui/closures/diverging-closure.rs index 2c86f55cf2595..6aa28aee01454 100644 --- a/tests/ui/closures/diverging-closure.rs +++ b/tests/ui/closures/diverging-closure.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:oops +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/consts/issue-29798.rs b/tests/ui/consts/issue-29798.rs index f7470d7aac908..b4216747ec79f 100644 --- a/tests/ui/consts/issue-29798.rs +++ b/tests/ui/consts/issue-29798.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:index out of bounds: the len is 5 but the index is 5 +//@ check-run-results //@ needs-subprocess const fn test(x: usize) -> i32 { diff --git a/tests/ui/coroutine/coroutine-resume-after-panic.rs b/tests/ui/coroutine/coroutine-resume-after-panic.rs index 1aa547c2a7bd2..2de4d903b2a68 100644 --- a/tests/ui/coroutine/coroutine-resume-after-panic.rs +++ b/tests/ui/coroutine/coroutine-resume-after-panic.rs @@ -1,6 +1,6 @@ //@ run-fail //@ needs-unwind -//@ error-pattern:coroutine resumed after panicking +//@ check-run-results //@ needs-subprocess // Test that we get the correct message for resuming a panicked coroutine. diff --git a/tests/ui/errors/remap-path-prefix-reverse.rs b/tests/ui/errors/remap-path-prefix-reverse.rs index 28fdabb8f4df1..5f4cd85b5224e 100644 --- a/tests/ui/errors/remap-path-prefix-reverse.rs +++ b/tests/ui/errors/remap-path-prefix-reverse.rs @@ -6,7 +6,7 @@ //@ [remapped-self] remap-src-base // Verify that the expected source code is shown. -//@ error-pattern: pub struct SomeStruct {} // This line should be show +//@ check-run-results extern crate remapped_dep; diff --git a/tests/ui/expr/copy.rs b/tests/ui/expr/copy.rs index cfe47ff6d939c..7778750fb6c6d 100644 --- a/tests/ui/expr/copy.rs +++ b/tests/ui/expr/copy.rs @@ -1,3 +1,4 @@ +// FLUFFY //@ run-pass fn f(arg: &mut A) { diff --git a/tests/ui/expr/if/expr-if-panic-fn.rs b/tests/ui/expr/if/expr-if-panic-fn.rs index 0b4742d4a8999..9a8a1c75d9761 100644 --- a/tests/ui/expr/if/expr-if-panic-fn.rs +++ b/tests/ui/expr/if/expr-if-panic-fn.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:explicit panic +//@ check-run-results //@ needs-subprocess fn f() -> ! { diff --git a/tests/ui/expr/if/expr-if-panic.rs b/tests/ui/expr/if/expr-if-panic.rs index 2f35878e844d1..1375dabab1e17 100644 --- a/tests/ui/expr/if/expr-if-panic.rs +++ b/tests/ui/expr/if/expr-if-panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:explicit panic +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/expr/if/if-check-panic.rs b/tests/ui/expr/if/if-check-panic.rs index eb0413f42fcf1..c8ebd8b924c7f 100644 --- a/tests/ui/expr/if/if-check-panic.rs +++ b/tests/ui/expr/if/if-check-panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:Number is odd +//@ check-run-results //@ needs-subprocess fn even(x: usize) -> bool { diff --git a/tests/ui/expr/if/if-cond-bot.rs b/tests/ui/expr/if/if-cond-bot.rs index 56bd5ec35f925..ba26a96ae24ef 100644 --- a/tests/ui/expr/if/if-cond-bot.rs +++ b/tests/ui/expr/if/if-cond-bot.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:quux +//@ check-run-results //@ needs-subprocess fn my_err(s: String) -> ! { diff --git a/tests/ui/extern/issue-18576.rs b/tests/ui/extern/issue-18576.rs index 6b41fe7363145..25c585de2b123 100644 --- a/tests/ui/extern/issue-18576.rs +++ b/tests/ui/extern/issue-18576.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:stop +//@ check-run-results //@ needs-subprocess // #18576 diff --git a/tests/ui/fn/expr-fn-panic.rs b/tests/ui/fn/expr-fn-panic.rs index d726aac2a4c07..581a59737eeca 100644 --- a/tests/ui/fn/expr-fn-panic.rs +++ b/tests/ui/fn/expr-fn-panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:explicit panic +//@ check-run-results //@ needs-subprocess fn f() -> ! { diff --git a/tests/ui/generic-associated-types/static-lifetime-tip-with-default-type.rs b/tests/ui/generic-associated-types/static-lifetime-tip-with-default-type.rs index 68879a0af292a..8c6390b73e293 100644 --- a/tests/ui/generic-associated-types/static-lifetime-tip-with-default-type.rs +++ b/tests/ui/generic-associated-types/static-lifetime-tip-with-default-type.rs @@ -1,6 +1,4 @@ -//@ error-pattern: r#T: 'static -//@ error-pattern: r#K: 'static -//@ error-pattern: T: 'static= +//@ check-run-results // https://github.com/rust-lang/rust/issues/124785 diff --git a/tests/ui/imports/glob-use-std.rs b/tests/ui/imports/glob-use-std.rs index d2af816e24f2d..0a5bc16d53b68 100644 --- a/tests/ui/imports/glob-use-std.rs +++ b/tests/ui/imports/glob-use-std.rs @@ -1,7 +1,7 @@ // Issue #7580 //@ run-fail -//@ error-pattern:panic works +//@ check-run-results //@ needs-subprocess use std::*; diff --git a/tests/ui/issues/issue-12920.rs b/tests/ui/issues/issue-12920.rs index f3b1b643c45af..b626db3820b00 100644 --- a/tests/ui/issues/issue-12920.rs +++ b/tests/ui/issues/issue-12920.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:explicit panic +//@ check-run-results //@ needs-subprocess pub fn main() { diff --git a/tests/ui/issues/issue-13202.rs b/tests/ui/issues/issue-13202.rs index 99ffba3fba51a..3790ddf192f22 100644 --- a/tests/ui/issues/issue-13202.rs +++ b/tests/ui/issues/issue-13202.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:bad input +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/issues/issue-20971.rs b/tests/ui/issues/issue-20971.rs index 31dd910191935..ac6fa01654f43 100644 --- a/tests/ui/issues/issue-20971.rs +++ b/tests/ui/issues/issue-20971.rs @@ -1,7 +1,7 @@ // Regression test for Issue #20971. //@ run-fail -//@ error-pattern:Hello, world! +//@ check-run-results //@ needs-subprocess pub trait Parser { diff --git a/tests/ui/issues/issue-23354-2.rs b/tests/ui/issues/issue-23354-2.rs index a296477215ed1..449e7c2d113f8 100644 --- a/tests/ui/issues/issue-23354-2.rs +++ b/tests/ui/issues/issue-23354-2.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:panic evaluated +//@ check-run-results //@ needs-subprocess #[allow(unused_variables)] diff --git a/tests/ui/issues/issue-23354.rs b/tests/ui/issues/issue-23354.rs index eff5f3d27147a..f37c61f98cd39 100644 --- a/tests/ui/issues/issue-23354.rs +++ b/tests/ui/issues/issue-23354.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:panic evaluated +//@ check-run-results //@ needs-subprocess #[allow(unused_variables)] diff --git a/tests/ui/issues/issue-2470-bounds-check-overflow.rs b/tests/ui/issues/issue-2470-bounds-check-overflow.rs index 4f300454dcb6e..0547439be0493 100644 --- a/tests/ui/issues/issue-2470-bounds-check-overflow.rs +++ b/tests/ui/issues/issue-2470-bounds-check-overflow.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:index out of bounds +//@ check-run-results //@ needs-subprocess use std::mem; diff --git a/tests/ui/issues/issue-2761.rs b/tests/ui/issues/issue-2761.rs index 6df7a5118b820..296fbaa6a8028 100644 --- a/tests/ui/issues/issue-2761.rs +++ b/tests/ui/issues/issue-2761.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:custom message +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/issues/issue-3029.rs b/tests/ui/issues/issue-3029.rs index 22d0906ccf701..a4ff6a11713bf 100644 --- a/tests/ui/issues/issue-3029.rs +++ b/tests/ui/issues/issue-3029.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:so long +//@ check-run-results //@ needs-subprocess #![allow(unreachable_code)] diff --git a/tests/ui/issues/issue-30380.rs b/tests/ui/issues/issue-30380.rs index 49fce3d150cd7..801353c453cca 100644 --- a/tests/ui/issues/issue-30380.rs +++ b/tests/ui/issues/issue-30380.rs @@ -2,7 +2,7 @@ // destroyed values lying around for other destructors to observe. //@ run-fail -//@ error-pattern:panicking destructors ftw! +//@ check-run-results //@ needs-subprocess struct Observer<'a>(&'a mut FilledOnDrop); diff --git a/tests/ui/issues/issue-44216-add-instant.rs b/tests/ui/issues/issue-44216-add-instant.rs index ca2c52b99a82a..4fb98c4649400 100644 --- a/tests/ui/issues/issue-44216-add-instant.rs +++ b/tests/ui/issues/issue-44216-add-instant.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:overflow +//@ check-run-results use std::time::{Duration, Instant}; diff --git a/tests/ui/issues/issue-44216-add-system-time.rs b/tests/ui/issues/issue-44216-add-system-time.rs index 3838d28e33d1b..0852d479c3966 100644 --- a/tests/ui/issues/issue-44216-add-system-time.rs +++ b/tests/ui/issues/issue-44216-add-system-time.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:overflow +//@ check-run-results //@ needs-subprocess use std::time::{Duration, SystemTime}; diff --git a/tests/ui/issues/issue-44216-sub-instant.rs b/tests/ui/issues/issue-44216-sub-instant.rs index 19cd12e685fd1..212610492d7fa 100644 --- a/tests/ui/issues/issue-44216-sub-instant.rs +++ b/tests/ui/issues/issue-44216-sub-instant.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:overflow +//@ check-run-results //@ needs-subprocess use std::time::{Instant, Duration}; diff --git a/tests/ui/issues/issue-44216-sub-system-time.rs b/tests/ui/issues/issue-44216-sub-system-time.rs index bd4f66f3e161b..e1a8ec892040e 100644 --- a/tests/ui/issues/issue-44216-sub-system-time.rs +++ b/tests/ui/issues/issue-44216-sub-system-time.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:overflow +//@ check-run-results //@ needs-subprocess use std::time::{Duration, SystemTime}; diff --git a/tests/ui/loops/for-each-loop-panic.rs b/tests/ui/loops/for-each-loop-panic.rs index 79cfca93e0e20..a010545786fe6 100644 --- a/tests/ui/loops/for-each-loop-panic.rs +++ b/tests/ui/loops/for-each-loop-panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:moop +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/loops/issue-69225-SCEVAddExpr-wrap-flag.rs b/tests/ui/loops/issue-69225-SCEVAddExpr-wrap-flag.rs index 03717c7c22d54..6d8e7130bee66 100644 --- a/tests/ui/loops/issue-69225-SCEVAddExpr-wrap-flag.rs +++ b/tests/ui/loops/issue-69225-SCEVAddExpr-wrap-flag.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C opt-level=3 -//@ error-pattern: index out of bounds: the len is 0 but the index is 16777216 +//@ check-run-results fn do_test(x: usize) { let mut arr = vec![vec![0u8; 3]]; diff --git a/tests/ui/loops/issue-69225-layout-repeated-checked-add.rs b/tests/ui/loops/issue-69225-layout-repeated-checked-add.rs index 048c7c8872c19..00df50b939ef6 100644 --- a/tests/ui/loops/issue-69225-layout-repeated-checked-add.rs +++ b/tests/ui/loops/issue-69225-layout-repeated-checked-add.rs @@ -3,7 +3,7 @@ //@ run-fail //@ compile-flags: -C opt-level=3 -//@ error-pattern: index out of bounds: the len is 0 but the index is 16777216 +//@ check-run-results fn do_test(x: usize) { let arr = vec![vec![0u8; 3]]; diff --git a/tests/ui/macros/assert-as-macro.rs b/tests/ui/macros/assert-as-macro.rs index c18a3d89fb635..84200d44ca74f 100644 --- a/tests/ui/macros/assert-as-macro.rs +++ b/tests/ui/macros/assert-as-macro.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:assertion failed: 1 == 2 +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/macros/assert-eq-macro-msg.rs b/tests/ui/macros/assert-eq-macro-msg.rs index 9ef7552cc7b2d..e9f3e8ef04a84 100644 --- a/tests/ui/macros/assert-eq-macro-msg.rs +++ b/tests/ui/macros/assert-eq-macro-msg.rs @@ -1,7 +1,5 @@ //@ run-fail -//@ error-pattern:assertion `left == right` failed: 1 + 1 definitely should be 3 -//@ error-pattern: left: 2 -//@ error-pattern: right: 3 +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/macros/assert-eq-macro-panic.rs b/tests/ui/macros/assert-eq-macro-panic.rs index 3c46e2798d11d..20b7b535499fe 100644 --- a/tests/ui/macros/assert-eq-macro-panic.rs +++ b/tests/ui/macros/assert-eq-macro-panic.rs @@ -1,7 +1,5 @@ //@ run-fail -//@ error-pattern:assertion `left == right` failed -//@ error-pattern: left: 14 -//@ error-pattern: right: 15 +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/macros/assert-macro-explicit.rs b/tests/ui/macros/assert-macro-explicit.rs index b14a182a876ce..dff0e96dfe925 100644 --- a/tests/ui/macros/assert-macro-explicit.rs +++ b/tests/ui/macros/assert-macro-explicit.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:assertion failed: false +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/macros/assert-macro-fmt.rs b/tests/ui/macros/assert-macro-fmt.rs index 3fd0f472d1606..685488ae46c73 100644 --- a/tests/ui/macros/assert-macro-fmt.rs +++ b/tests/ui/macros/assert-macro-fmt.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern: panicked -//@ error-pattern: test-assert-fmt 42 rust +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/macros/assert-macro-owned.rs b/tests/ui/macros/assert-macro-owned.rs index f9b6f5f518059..439129088fa4f 100644 --- a/tests/ui/macros/assert-macro-owned.rs +++ b/tests/ui/macros/assert-macro-owned.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:panicked -//@ error-pattern:test-assert-owned +//@ check-run-results //@ needs-subprocess #![allow(non_fmt_panics)] diff --git a/tests/ui/macros/assert-macro-static.rs b/tests/ui/macros/assert-macro-static.rs index 8c91d7722fc40..dc8527a1bf1f6 100644 --- a/tests/ui/macros/assert-macro-static.rs +++ b/tests/ui/macros/assert-macro-static.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:panicked -//@ error-pattern:test-assert-static +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/macros/assert-matches-macro-msg.rs b/tests/ui/macros/assert-matches-macro-msg.rs index 956bc9cf0f49b..a02463fe5e1cf 100644 --- a/tests/ui/macros/assert-matches-macro-msg.rs +++ b/tests/ui/macros/assert-matches-macro-msg.rs @@ -1,7 +1,5 @@ //@ run-fail -//@ error-pattern:assertion `left matches right` failed: 1 + 1 definitely should be 3 -//@ error-pattern: left: 2 -//@ error-pattern: right: 3 +//@ check-run-results //@ needs-subprocess #![feature(assert_matches)] diff --git a/tests/ui/macros/assert-ne-macro-msg.rs b/tests/ui/macros/assert-ne-macro-msg.rs index 24bc4dbea4753..49ec832bdf0c3 100644 --- a/tests/ui/macros/assert-ne-macro-msg.rs +++ b/tests/ui/macros/assert-ne-macro-msg.rs @@ -1,7 +1,5 @@ //@ run-fail -//@ error-pattern:assertion `left != right` failed: 1 + 1 definitely should not be 2 -//@ error-pattern: left: 2 -//@ error-pattern: right: 2 +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/macros/assert-ne-macro-panic.rs b/tests/ui/macros/assert-ne-macro-panic.rs index c349825baf389..698be04d78f8d 100644 --- a/tests/ui/macros/assert-ne-macro-panic.rs +++ b/tests/ui/macros/assert-ne-macro-panic.rs @@ -1,7 +1,5 @@ //@ run-fail -//@ error-pattern:assertion `left != right` failed -//@ error-pattern: left: 14 -//@ error-pattern: right: 14 +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/macros/borrowck-error-in-macro.rs b/tests/ui/macros/borrowck-error-in-macro.rs index fe75188efd203..03e4dddc0954e 100644 --- a/tests/ui/macros/borrowck-error-in-macro.rs +++ b/tests/ui/macros/borrowck-error-in-macro.rs @@ -1,5 +1,5 @@ //@ aux-build: borrowck-error-in-macro.rs -//@ error-pattern: a call in this macro requires a mutable binding due to mutable borrow of `d` +//@ check-run-results //FIXME: remove error-pattern (see #141896) extern crate borrowck_error_in_macro as a; diff --git a/tests/ui/macros/die-macro-2.rs b/tests/ui/macros/die-macro-2.rs index d802f189ce1af..69fa6a9d4ee68 100644 --- a/tests/ui/macros/die-macro-2.rs +++ b/tests/ui/macros/die-macro-2.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:test +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/macros/die-macro-expr.rs b/tests/ui/macros/die-macro-expr.rs index f4fefb0ca37dd..24e6bf9b08898 100644 --- a/tests/ui/macros/die-macro-expr.rs +++ b/tests/ui/macros/die-macro-expr.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:test +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/macros/die-macro-pure.rs b/tests/ui/macros/die-macro-pure.rs index d84787705a1aa..316a718925a6b 100644 --- a/tests/ui/macros/die-macro-pure.rs +++ b/tests/ui/macros/die-macro-pure.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:test +//@ check-run-results //@ needs-subprocess fn f() { diff --git a/tests/ui/macros/unimplemented-macro-panic.rs b/tests/ui/macros/unimplemented-macro-panic.rs index 804bd61270e2a..de6d083159067 100644 --- a/tests/ui/macros/unimplemented-macro-panic.rs +++ b/tests/ui/macros/unimplemented-macro-panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:not implemented +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/macros/unreachable-fmt-msg.rs b/tests/ui/macros/unreachable-fmt-msg.rs index 928e0a427ae42..910f8c4d2579b 100644 --- a/tests/ui/macros/unreachable-fmt-msg.rs +++ b/tests/ui/macros/unreachable-fmt-msg.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:internal error: entered unreachable code: 6 is not prime +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/macros/unreachable-macro-panic.rs b/tests/ui/macros/unreachable-macro-panic.rs index c5cea5551cfcf..8ba5032d2dfb7 100644 --- a/tests/ui/macros/unreachable-macro-panic.rs +++ b/tests/ui/macros/unreachable-macro-panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:internal error: entered unreachable code +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/macros/unreachable-static-msg.rs b/tests/ui/macros/unreachable-static-msg.rs index a85f8962e7d9c..2e4add32b4b92 100644 --- a/tests/ui/macros/unreachable-static-msg.rs +++ b/tests/ui/macros/unreachable-static-msg.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:internal error: entered unreachable code: uhoh +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/macros/unreachable.rs b/tests/ui/macros/unreachable.rs index c5cea5551cfcf..8ba5032d2dfb7 100644 --- a/tests/ui/macros/unreachable.rs +++ b/tests/ui/macros/unreachable.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:internal error: entered unreachable code +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/match/expr-match-panic-fn.rs b/tests/ui/match/expr-match-panic-fn.rs index a07c2c6af8f79..5bd741b3e3262 100644 --- a/tests/ui/match/expr-match-panic-fn.rs +++ b/tests/ui/match/expr-match-panic-fn.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:explicit panic +//@ check-run-results //@ needs-subprocess fn f() -> ! { diff --git a/tests/ui/match/expr-match-panic.rs b/tests/ui/match/expr-match-panic.rs index d15b0a9cd726f..771ff7624b93b 100644 --- a/tests/ui/match/expr-match-panic.rs +++ b/tests/ui/match/expr-match-panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:explicit panic +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/match/match-bot-panic.rs b/tests/ui/match/match-bot-panic.rs index 7ec07ae290d98..92e24e7f4207b 100644 --- a/tests/ui/match/match-bot-panic.rs +++ b/tests/ui/match/match-bot-panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:explicit panic +//@ check-run-results //@ needs-subprocess #![allow(unreachable_code)] diff --git a/tests/ui/match/match-disc-bot.rs b/tests/ui/match/match-disc-bot.rs index d65dc5aea0753..64318f4f1afc6 100644 --- a/tests/ui/match/match-disc-bot.rs +++ b/tests/ui/match/match-disc-bot.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:quux +//@ check-run-results //@ needs-subprocess fn f() -> ! { diff --git a/tests/ui/match/match-wildcards.rs b/tests/ui/match/match-wildcards.rs index 1cc81a7c4159a..62b2338f2d7b3 100644 --- a/tests/ui/match/match-wildcards.rs +++ b/tests/ui/match/match-wildcards.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:squirrelcupcake +//@ check-run-results //@ needs-subprocess fn cmp() -> isize { diff --git a/tests/ui/mir/alignment/borrow_misaligned_field_projection.rs b/tests/ui/mir/alignment/borrow_misaligned_field_projection.rs index a22965ce1d873..4d8d0571cf58a 100644 --- a/tests/ui/mir/alignment/borrow_misaligned_field_projection.rs +++ b/tests/ui/mir/alignment/borrow_misaligned_field_projection.rs @@ -1,7 +1,7 @@ //@ run-fail //@ ignore-i686-pc-windows-msvc: #112480 //@ compile-flags: -C debug-assertions -//@ error-pattern: misaligned pointer dereference: address must be a multiple of 0x4 but is +//@ check-run-results struct Misalignment { a: u32, diff --git a/tests/ui/mir/alignment/misaligned_borrow.rs b/tests/ui/mir/alignment/misaligned_borrow.rs index de8912c703827..0e9a92ec1d955 100644 --- a/tests/ui/mir/alignment/misaligned_borrow.rs +++ b/tests/ui/mir/alignment/misaligned_borrow.rs @@ -1,7 +1,7 @@ //@ run-fail //@ ignore-i686-pc-windows-msvc: #112480 //@ compile-flags: -C debug-assertions -//@ error-pattern: misaligned pointer dereference: address must be a multiple of 0x4 but is +//@ check-run-results fn main() { let x = [0u32; 2]; diff --git a/tests/ui/mir/alignment/misaligned_lhs.rs b/tests/ui/mir/alignment/misaligned_lhs.rs index b169823bc081f..c5bcce4fce3f5 100644 --- a/tests/ui/mir/alignment/misaligned_lhs.rs +++ b/tests/ui/mir/alignment/misaligned_lhs.rs @@ -1,7 +1,7 @@ //@ run-fail //@ ignore-i686-pc-windows-msvc: #112480 //@ compile-flags: -C debug-assertions -//@ error-pattern: misaligned pointer dereference: address must be a multiple of 0x4 but is +//@ check-run-results fn main() { let mut x = [0u32; 2]; diff --git a/tests/ui/mir/alignment/misaligned_mut_borrow.rs b/tests/ui/mir/alignment/misaligned_mut_borrow.rs index bba20edecfddb..515cd58a4fbf4 100644 --- a/tests/ui/mir/alignment/misaligned_mut_borrow.rs +++ b/tests/ui/mir/alignment/misaligned_mut_borrow.rs @@ -1,7 +1,7 @@ //@ run-fail //@ ignore-i686-pc-windows-msvc: #112480 //@ compile-flags: -C debug-assertions -//@ error-pattern: misaligned pointer dereference: address must be a multiple of 0x4 but is +//@ check-run-results fn main() { let mut x = [0u32; 2]; diff --git a/tests/ui/mir/alignment/misaligned_rhs.rs b/tests/ui/mir/alignment/misaligned_rhs.rs index 55da30a2fd75d..4b0b0cb0ceb87 100644 --- a/tests/ui/mir/alignment/misaligned_rhs.rs +++ b/tests/ui/mir/alignment/misaligned_rhs.rs @@ -1,7 +1,7 @@ //@ run-fail //@ ignore-i686-pc-windows-msvc: #112480 //@ compile-flags: -C debug-assertions -//@ error-pattern: misaligned pointer dereference: address must be a multiple of 0x4 but is +//@ check-run-results fn main() { let mut x = [0u32; 2]; diff --git a/tests/ui/mir/alignment/two_pointers.rs b/tests/ui/mir/alignment/two_pointers.rs index 198a1c9853d97..63c15d1d428f7 100644 --- a/tests/ui/mir/alignment/two_pointers.rs +++ b/tests/ui/mir/alignment/two_pointers.rs @@ -1,7 +1,7 @@ //@ run-fail //@ ignore-i686-pc-windows-msvc: #112480 //@ compile-flags: -C debug-assertions -//@ error-pattern: misaligned pointer dereference: address must be a multiple of 0x4 but is +//@ check-run-results fn main() { let x = [0u32; 2]; diff --git a/tests/ui/mir/enum/convert_non_enum_break.rs b/tests/ui/mir/enum/convert_non_enum_break.rs index de062c39907a7..31530468d0101 100644 --- a/tests/ui/mir/enum/convert_non_enum_break.rs +++ b/tests/ui/mir/enum/convert_non_enum_break.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: trying to construct an enum from an invalid value 0x10000 +//@ check-run-results #[allow(dead_code)] #[repr(u32)] diff --git a/tests/ui/mir/enum/convert_non_enum_niche_break.rs b/tests/ui/mir/enum/convert_non_enum_niche_break.rs index 9ff4849c5b1f3..55fd546c48f9c 100644 --- a/tests/ui/mir/enum/convert_non_enum_niche_break.rs +++ b/tests/ui/mir/enum/convert_non_enum_niche_break.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: trying to construct an enum from an invalid value 0x5 +//@ check-run-results #[allow(dead_code)] #[repr(u16)] diff --git a/tests/ui/mir/enum/negative_discr_break.rs b/tests/ui/mir/enum/negative_discr_break.rs index fa1284f72a079..31f5a65bae19e 100644 --- a/tests/ui/mir/enum/negative_discr_break.rs +++ b/tests/ui/mir/enum/negative_discr_break.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: trying to construct an enum from an invalid value 0xfd +//@ check-run-results #[allow(dead_code)] enum Foo { diff --git a/tests/ui/mir/enum/niche_option_tuple_break.rs b/tests/ui/mir/enum/niche_option_tuple_break.rs index 43eef3a4cc5f0..0c94e229f9a84 100644 --- a/tests/ui/mir/enum/niche_option_tuple_break.rs +++ b/tests/ui/mir/enum/niche_option_tuple_break.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: trying to construct an enum from an invalid value 0x3 +//@ check-run-results #[allow(dead_code)] enum Foo { diff --git a/tests/ui/mir/enum/numbered_variants_break.rs b/tests/ui/mir/enum/numbered_variants_break.rs index e3e71dc8aec4f..e0cfcf1f67198 100644 --- a/tests/ui/mir/enum/numbered_variants_break.rs +++ b/tests/ui/mir/enum/numbered_variants_break.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: trying to construct an enum from an invalid value 0x3 +//@ check-run-results #[allow(dead_code)] enum Foo { diff --git a/tests/ui/mir/enum/option_with_bigger_niche_break.rs b/tests/ui/mir/enum/option_with_bigger_niche_break.rs index c66614b845b5d..bc4843a2ce2a1 100644 --- a/tests/ui/mir/enum/option_with_bigger_niche_break.rs +++ b/tests/ui/mir/enum/option_with_bigger_niche_break.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: trying to construct an enum from an invalid value 0x0 +//@ check-run-results #[repr(u32)] #[allow(dead_code)] diff --git a/tests/ui/mir/enum/plain_no_data_break.rs b/tests/ui/mir/enum/plain_no_data_break.rs index db68e752479dd..c38cd6f9a6544 100644 --- a/tests/ui/mir/enum/plain_no_data_break.rs +++ b/tests/ui/mir/enum/plain_no_data_break.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: trying to construct an enum from an invalid value 0x1 +//@ check-run-results #[repr(u32)] #[allow(dead_code)] diff --git a/tests/ui/mir/enum/single_with_repr_break.rs b/tests/ui/mir/enum/single_with_repr_break.rs index 5a4ec85a9b555..f12f5b994e5cc 100644 --- a/tests/ui/mir/enum/single_with_repr_break.rs +++ b/tests/ui/mir/enum/single_with_repr_break.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: trying to construct an enum from an invalid value 0x1 +//@ check-run-results #[allow(dead_code)] #[repr(u16)] diff --git a/tests/ui/mir/enum/with_niche_int_break.rs b/tests/ui/mir/enum/with_niche_int_break.rs index 0ec60a33564af..aeed26ffb5a18 100644 --- a/tests/ui/mir/enum/with_niche_int_break.rs +++ b/tests/ui/mir/enum/with_niche_int_break.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: trying to construct an enum from an invalid value 0x4 +//@ check-run-results #[allow(dead_code)] #[repr(u16)] diff --git a/tests/ui/mir/enum/wrap_break.rs b/tests/ui/mir/enum/wrap_break.rs index 4491394ca5a34..8e94cd878f3e5 100644 --- a/tests/ui/mir/enum/wrap_break.rs +++ b/tests/ui/mir/enum/wrap_break.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: trying to construct an enum from an invalid value 0x0 +//@ check-run-results #![feature(never_type)] #![allow(invalid_value)] diff --git a/tests/ui/mir/mir_codegen_calls_converging_drops.rs b/tests/ui/mir/mir_codegen_calls_converging_drops.rs index 8a6d3926de24a..6797d3faacf84 100644 --- a/tests/ui/mir/mir_codegen_calls_converging_drops.rs +++ b/tests/ui/mir/mir_codegen_calls_converging_drops.rs @@ -1,7 +1,5 @@ //@ run-fail -//@ error-pattern:converging_fn called -//@ error-pattern:0 dropped -//@ error-pattern:exit +//@ check-run-results //@ needs-subprocess struct Droppable(u8); diff --git a/tests/ui/mir/mir_codegen_calls_converging_drops_2.rs b/tests/ui/mir/mir_codegen_calls_converging_drops_2.rs index e89fbc58a0d1c..862e98cd3d8fd 100644 --- a/tests/ui/mir/mir_codegen_calls_converging_drops_2.rs +++ b/tests/ui/mir/mir_codegen_calls_converging_drops_2.rs @@ -1,7 +1,5 @@ //@ run-fail -//@ error-pattern:complex called -//@ error-pattern:dropped -//@ error-pattern:exit +//@ check-run-results //@ needs-subprocess struct Droppable; diff --git a/tests/ui/mir/mir_codegen_calls_diverging.rs b/tests/ui/mir/mir_codegen_calls_diverging.rs index ce2d7140b074e..f01ba5fcf95f2 100644 --- a/tests/ui/mir/mir_codegen_calls_diverging.rs +++ b/tests/ui/mir/mir_codegen_calls_diverging.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:diverging_fn called +//@ check-run-results //@ needs-subprocess fn diverging_fn() -> ! { diff --git a/tests/ui/mir/mir_codegen_calls_diverging_drops.rs b/tests/ui/mir/mir_codegen_calls_diverging_drops.rs index b0675a6a5a0c4..a5668e2df4359 100644 --- a/tests/ui/mir/mir_codegen_calls_diverging_drops.rs +++ b/tests/ui/mir/mir_codegen_calls_diverging_drops.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:diverging_fn called -//@ error-pattern:0 dropped +//@ check-run-results //@ needs-unwind this test checks that a destructor is called after panicking struct Droppable(u8); diff --git a/tests/ui/mir/mir_drop_panics.rs b/tests/ui/mir/mir_drop_panics.rs index ec846fc241b2a..b0ce1b68b2411 100644 --- a/tests/ui/mir/mir_drop_panics.rs +++ b/tests/ui/mir/mir_drop_panics.rs @@ -1,7 +1,6 @@ //@ run-fail //@ needs-unwind -//@ error-pattern:panic 1 -//@ error-pattern:drop 2 +//@ check-run-results struct Droppable(u32); impl Drop for Droppable { diff --git a/tests/ui/mir/mir_dynamic_drops_1.rs b/tests/ui/mir/mir_dynamic_drops_1.rs index 0b0a396057452..ec701d1362954 100644 --- a/tests/ui/mir/mir_dynamic_drops_1.rs +++ b/tests/ui/mir/mir_dynamic_drops_1.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:drop 1 -//@ error-pattern:drop 2 +//@ check-run-results //@ needs-subprocess /// Structure which will not allow to be dropped twice. diff --git a/tests/ui/mir/mir_dynamic_drops_2.rs b/tests/ui/mir/mir_dynamic_drops_2.rs index f625f19be26cb..b2022e738cae8 100644 --- a/tests/ui/mir/mir_dynamic_drops_2.rs +++ b/tests/ui/mir/mir_dynamic_drops_2.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:drop 1 +//@ check-run-results //@ needs-subprocess /// Structure which will not allow to be dropped twice. diff --git a/tests/ui/mir/mir_dynamic_drops_3.rs b/tests/ui/mir/mir_dynamic_drops_3.rs index 2a8af4ce1fb4b..02cc26bb1832d 100644 --- a/tests/ui/mir/mir_dynamic_drops_3.rs +++ b/tests/ui/mir/mir_dynamic_drops_3.rs @@ -1,9 +1,6 @@ //@ run-fail //@ needs-unwind -//@ error-pattern:unwind happens -//@ error-pattern:drop 3 -//@ error-pattern:drop 2 -//@ error-pattern:drop 1 +//@ check-run-results //@ needs-subprocess /// Structure which will not allow to be dropped twice. diff --git a/tests/ui/mir/mir_indexing_oob_1.rs b/tests/ui/mir/mir_indexing_oob_1.rs index 936484b0c1edd..ab1be405a7a38 100644 --- a/tests/ui/mir/mir_indexing_oob_1.rs +++ b/tests/ui/mir/mir_indexing_oob_1.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:index out of bounds: the len is 5 but the index is 10 +//@ check-run-results //@ needs-subprocess const C: [u32; 5] = [0; 5]; diff --git a/tests/ui/mir/mir_indexing_oob_2.rs b/tests/ui/mir/mir_indexing_oob_2.rs index 310a7f8f2b75f..b3c4667ad0869 100644 --- a/tests/ui/mir/mir_indexing_oob_2.rs +++ b/tests/ui/mir/mir_indexing_oob_2.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:index out of bounds: the len is 5 but the index is 10 +//@ check-run-results //@ needs-subprocess const C: &'static [u8; 5] = b"hello"; diff --git a/tests/ui/mir/mir_indexing_oob_3.rs b/tests/ui/mir/mir_indexing_oob_3.rs index 44b3a2c5a6dd9..745866fe54827 100644 --- a/tests/ui/mir/mir_indexing_oob_3.rs +++ b/tests/ui/mir/mir_indexing_oob_3.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:index out of bounds: the len is 5 but the index is 10 +//@ check-run-results //@ needs-subprocess const C: &'static [u8; 5] = b"hello"; diff --git a/tests/ui/mir/null/borrowed_mut_null.rs b/tests/ui/mir/null/borrowed_mut_null.rs index d26452b9dac29..90086e80d097b 100644 --- a/tests/ui/mir/null/borrowed_mut_null.rs +++ b/tests/ui/mir/null/borrowed_mut_null.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: null pointer dereference occurred +//@ check-run-results fn main() { let ptr: *mut u32 = std::ptr::null_mut(); diff --git a/tests/ui/mir/null/borrowed_null.rs b/tests/ui/mir/null/borrowed_null.rs index fefac3a7212c9..3d43a1cf494df 100644 --- a/tests/ui/mir/null/borrowed_null.rs +++ b/tests/ui/mir/null/borrowed_null.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: null pointer dereference occurred +//@ check-run-results fn main() { let ptr: *const u32 = std::ptr::null(); diff --git a/tests/ui/mir/null/borrowed_null_zst.rs b/tests/ui/mir/null/borrowed_null_zst.rs index 835727c068b33..1f5257941be76 100644 --- a/tests/ui/mir/null/borrowed_null_zst.rs +++ b/tests/ui/mir/null/borrowed_null_zst.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: null pointer dereference occurred +//@ check-run-results fn main() { let ptr: *const () = std::ptr::null(); diff --git a/tests/ui/mir/null/null_lhs.rs b/tests/ui/mir/null/null_lhs.rs index 238d350d1bdaf..d329a58ffd8fa 100644 --- a/tests/ui/mir/null/null_lhs.rs +++ b/tests/ui/mir/null/null_lhs.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: null pointer dereference occurred +//@ check-run-results fn main() { let ptr: *mut u32 = std::ptr::null_mut(); diff --git a/tests/ui/mir/null/null_rhs.rs b/tests/ui/mir/null/null_rhs.rs index 18eafb618698f..f4927819907bc 100644 --- a/tests/ui/mir/null/null_rhs.rs +++ b/tests/ui/mir/null/null_rhs.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: null pointer dereference occurred +//@ check-run-results fn main() { let ptr: *mut u32 = std::ptr::null_mut(); diff --git a/tests/ui/mir/null/two_pointers.rs b/tests/ui/mir/null/two_pointers.rs index 52b9510be12eb..9864a4e7b61d5 100644 --- a/tests/ui/mir/null/two_pointers.rs +++ b/tests/ui/mir/null/two_pointers.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -C debug-assertions -//@ error-pattern: null pointer dereference occurred +//@ check-run-results fn main() { let ptr = std::ptr::null(); diff --git a/tests/ui/never_type/return-never-coerce.rs b/tests/ui/never_type/return-never-coerce.rs index 14f07dfeb76a9..60f509afa6afa 100644 --- a/tests/ui/never_type/return-never-coerce.rs +++ b/tests/ui/never_type/return-never-coerce.rs @@ -1,7 +1,7 @@ // Test that ! coerces to other types. //@ run-fail -//@ error-pattern:aah! +//@ check-run-results //@ needs-subprocess fn call_another_fn T>(f: F) -> T { diff --git a/tests/ui/nll/issue-51345-2.rs b/tests/ui/nll/issue-51345-2.rs index 39871d56a9af8..7756ac7f1de9b 100644 --- a/tests/ui/nll/issue-51345-2.rs +++ b/tests/ui/nll/issue-51345-2.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:thread 'main' panicked -//@ error-pattern:explicit panic +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/numbers-arithmetic/divide-by-zero.rs b/tests/ui/numbers-arithmetic/divide-by-zero.rs index a05abadf4bb45..78ab687c4642f 100644 --- a/tests/ui/numbers-arithmetic/divide-by-zero.rs +++ b/tests/ui/numbers-arithmetic/divide-by-zero.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:attempt to divide by zero +//@ check-run-results //@ needs-subprocess #[allow(unconditional_panic)] diff --git a/tests/ui/numbers-arithmetic/location-add-assign-overflow.rs b/tests/ui/numbers-arithmetic/location-add-assign-overflow.rs index 8014bae2889c4..1b5a85e13f980 100644 --- a/tests/ui/numbers-arithmetic/location-add-assign-overflow.rs +++ b/tests/ui/numbers-arithmetic/location-add-assign-overflow.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:location-add-assign-overflow.rs +//@ check-run-results fn main() { let mut a: u8 = 255; diff --git a/tests/ui/numbers-arithmetic/location-add-overflow.rs b/tests/ui/numbers-arithmetic/location-add-overflow.rs index 0d2e52d532efa..16ef594e6be58 100644 --- a/tests/ui/numbers-arithmetic/location-add-overflow.rs +++ b/tests/ui/numbers-arithmetic/location-add-overflow.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:location-add-overflow.rs +//@ check-run-results fn main() { let _: u8 = 255 + &1; diff --git a/tests/ui/numbers-arithmetic/location-divide-assign-by-zero.rs b/tests/ui/numbers-arithmetic/location-divide-assign-by-zero.rs index 63fbab5ecc49c..e513c79eda896 100644 --- a/tests/ui/numbers-arithmetic/location-divide-assign-by-zero.rs +++ b/tests/ui/numbers-arithmetic/location-divide-assign-by-zero.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:location-divide-assign-by-zero.rs +//@ check-run-results fn main() { let mut a = 1; diff --git a/tests/ui/numbers-arithmetic/location-divide-by-zero.rs b/tests/ui/numbers-arithmetic/location-divide-by-zero.rs index 88c1b51c1bb4e..d07683ffb8a4d 100644 --- a/tests/ui/numbers-arithmetic/location-divide-by-zero.rs +++ b/tests/ui/numbers-arithmetic/location-divide-by-zero.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:location-divide-by-zero.rs +//@ check-run-results // https://github.com/rust-lang/rust/issues/114814 diff --git a/tests/ui/numbers-arithmetic/location-mod-assign-by-zero.rs b/tests/ui/numbers-arithmetic/location-mod-assign-by-zero.rs index ae62f5c26d9a4..95cf54cedbd5b 100644 --- a/tests/ui/numbers-arithmetic/location-mod-assign-by-zero.rs +++ b/tests/ui/numbers-arithmetic/location-mod-assign-by-zero.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:location-mod-assign-by-zero.rs +//@ check-run-results fn main() { let mut a = 1; diff --git a/tests/ui/numbers-arithmetic/location-mod-by-zero.rs b/tests/ui/numbers-arithmetic/location-mod-by-zero.rs index 6a2e1b158bf7f..20465c6442670 100644 --- a/tests/ui/numbers-arithmetic/location-mod-by-zero.rs +++ b/tests/ui/numbers-arithmetic/location-mod-by-zero.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:location-mod-by-zero.rs +//@ check-run-results fn main() { let _ = 1 % &0; diff --git a/tests/ui/numbers-arithmetic/location-mul-assign-overflow.rs b/tests/ui/numbers-arithmetic/location-mul-assign-overflow.rs index 07cec7d173034..b20ddda6621ce 100644 --- a/tests/ui/numbers-arithmetic/location-mul-assign-overflow.rs +++ b/tests/ui/numbers-arithmetic/location-mul-assign-overflow.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:location-mul-assign-overflow.rs +//@ check-run-results fn main() { let mut a: u8 = 255; diff --git a/tests/ui/numbers-arithmetic/location-mul-overflow.rs b/tests/ui/numbers-arithmetic/location-mul-overflow.rs index 0a00d3beaa786..3aeb81c2980e6 100644 --- a/tests/ui/numbers-arithmetic/location-mul-overflow.rs +++ b/tests/ui/numbers-arithmetic/location-mul-overflow.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:location-mul-overflow.rs +//@ check-run-results fn main() { let _: u8 = 255 * &2; diff --git a/tests/ui/numbers-arithmetic/location-sub-assign-overflow.rs b/tests/ui/numbers-arithmetic/location-sub-assign-overflow.rs index 13f074b0ffef3..d7067c3aa0d0c 100644 --- a/tests/ui/numbers-arithmetic/location-sub-assign-overflow.rs +++ b/tests/ui/numbers-arithmetic/location-sub-assign-overflow.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:location-sub-assign-overflow.rs +//@ check-run-results fn main() { let mut a: u8 = 0; diff --git a/tests/ui/numbers-arithmetic/location-sub-overflow.rs b/tests/ui/numbers-arithmetic/location-sub-overflow.rs index 9a0fabe1cd63c..6b8b27e4c706c 100644 --- a/tests/ui/numbers-arithmetic/location-sub-overflow.rs +++ b/tests/ui/numbers-arithmetic/location-sub-overflow.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:location-sub-overflow.rs +//@ check-run-results fn main() { let _: u8 = 0 - &1; diff --git a/tests/ui/numbers-arithmetic/mod-zero.rs b/tests/ui/numbers-arithmetic/mod-zero.rs index 300bd765c4037..d7b44d900407b 100644 --- a/tests/ui/numbers-arithmetic/mod-zero.rs +++ b/tests/ui/numbers-arithmetic/mod-zero.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:attempt to calculate the remainder with a divisor of zero +//@ check-run-results //@ needs-subprocess #[allow(unconditional_panic)] diff --git a/tests/ui/numbers-arithmetic/overflowing-add.rs b/tests/ui/numbers-arithmetic/overflowing-add.rs index c1f498c802b41..99daab3555238 100644 --- a/tests/ui/numbers-arithmetic/overflowing-add.rs +++ b/tests/ui/numbers-arithmetic/overflowing-add.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:thread 'main' panicked -//@ error-pattern:attempt to add with overflow +//@ check-run-results //@ compile-flags: -C debug-assertions //@ needs-subprocess diff --git a/tests/ui/numbers-arithmetic/overflowing-mul.rs b/tests/ui/numbers-arithmetic/overflowing-mul.rs index 0eece5369299b..72b1dadcf745e 100644 --- a/tests/ui/numbers-arithmetic/overflowing-mul.rs +++ b/tests/ui/numbers-arithmetic/overflowing-mul.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:thread 'main' panicked -//@ error-pattern:attempt to multiply with overflow +//@ check-run-results //@ needs-subprocess //@ compile-flags: -C debug-assertions diff --git a/tests/ui/numbers-arithmetic/overflowing-sub.rs b/tests/ui/numbers-arithmetic/overflowing-sub.rs index 88b1b693f6326..b02941aa50f84 100644 --- a/tests/ui/numbers-arithmetic/overflowing-sub.rs +++ b/tests/ui/numbers-arithmetic/overflowing-sub.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:thread 'main' panicked -//@ error-pattern:attempt to subtract with overflow +//@ check-run-results //@ needs-subprocess //@ compile-flags: -C debug-assertions diff --git a/tests/ui/numbers-arithmetic/promoted_overflow.rs b/tests/ui/numbers-arithmetic/promoted_overflow.rs index 96c5f3b87e18c..8a3a5a90d1b0f 100644 --- a/tests/ui/numbers-arithmetic/promoted_overflow.rs +++ b/tests/ui/numbers-arithmetic/promoted_overflow.rs @@ -1,7 +1,7 @@ #![allow(arithmetic_overflow)] //@ run-fail -//@ error-pattern: overflow +//@ check-run-results //@ compile-flags: -C overflow-checks=yes // for some reason, fails to match error string on // wasm32-unknown-unknown with stripped debuginfo and symbols, diff --git a/tests/ui/panic-runtime/unwind-interleaved.rs b/tests/ui/panic-runtime/unwind-interleaved.rs index 83eb636509755..e406c0da8f580 100644 --- a/tests/ui/panic-runtime/unwind-interleaved.rs +++ b/tests/ui/panic-runtime/unwind-interleaved.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:explicit panic +//@ check-run-results //@ needs-subprocess fn a() {} diff --git a/tests/ui/panic-runtime/unwind-rec.rs b/tests/ui/panic-runtime/unwind-rec.rs index a855a4de28014..dae21b0363910 100644 --- a/tests/ui/panic-runtime/unwind-rec.rs +++ b/tests/ui/panic-runtime/unwind-rec.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:explicit panic +//@ check-run-results //@ needs-subprocess fn build() -> Vec { diff --git a/tests/ui/panic-runtime/unwind-rec2.rs b/tests/ui/panic-runtime/unwind-rec2.rs index ed02b117fff4b..9c65a994366c9 100644 --- a/tests/ui/panic-runtime/unwind-rec2.rs +++ b/tests/ui/panic-runtime/unwind-rec2.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:explicit panic +//@ check-run-results //@ needs-subprocess fn build1() -> Vec { diff --git a/tests/ui/panic-runtime/unwind-unique.rs b/tests/ui/panic-runtime/unwind-unique.rs index b57d81842c4dd..9598a14d5026c 100644 --- a/tests/ui/panic-runtime/unwind-unique.rs +++ b/tests/ui/panic-runtime/unwind-unique.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:explicit panic +//@ check-run-results //@ needs-subprocess fn failfn() { diff --git a/tests/ui/panics/args-panic.rs b/tests/ui/panics/args-panic.rs index 9675c99dcb6f8..c0f45ccb77ad7 100644 --- a/tests/ui/panics/args-panic.rs +++ b/tests/ui/panics/args-panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:meep +//@ check-run-results //@ needs-subprocess fn f(_a: isize, _b: isize, _c: Box) { diff --git a/tests/ui/panics/doublepanic.rs b/tests/ui/panics/doublepanic.rs index 6fddde82a277a..4ce6b70da076f 100644 --- a/tests/ui/panics/doublepanic.rs +++ b/tests/ui/panics/doublepanic.rs @@ -1,7 +1,7 @@ #![allow(unreachable_code)] //@ run-fail -//@ error-pattern:One +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/panics/explicit-panic-msg.rs b/tests/ui/panics/explicit-panic-msg.rs index e5728ef1e20c5..97ecc708154c3 100644 --- a/tests/ui/panics/explicit-panic-msg.rs +++ b/tests/ui/panics/explicit-panic-msg.rs @@ -3,7 +3,7 @@ #![allow(non_fmt_panics)] //@ run-fail -//@ error-pattern:wooooo +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/panics/explicit-panic.rs b/tests/ui/panics/explicit-panic.rs index 7c69289940e49..9039404e5e7a6 100644 --- a/tests/ui/panics/explicit-panic.rs +++ b/tests/ui/panics/explicit-panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:explicit +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/panics/fmt-panic.rs b/tests/ui/panics/fmt-panic.rs index c6cb039684dba..4cf754c7ad457 100644 --- a/tests/ui/panics/fmt-panic.rs +++ b/tests/ui/panics/fmt-panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:meh +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/panics/main-panic.rs b/tests/ui/panics/main-panic.rs index 0b3d5c3aaec85..f9d0ef4b781f0 100644 --- a/tests/ui/panics/main-panic.rs +++ b/tests/ui/panics/main-panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:thread 'main' panicked at +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/panics/panic-arg.rs b/tests/ui/panics/panic-arg.rs index 037cfda3689a1..9cd65988f7bf5 100644 --- a/tests/ui/panics/panic-arg.rs +++ b/tests/ui/panics/panic-arg.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:woe +//@ check-run-results //@ needs-subprocess fn f(a: isize) { diff --git a/tests/ui/panics/panic-in-cleanup.rs b/tests/ui/panics/panic-in-cleanup.rs index 8cddeb37348d0..53dc4d320b26f 100644 --- a/tests/ui/panics/panic-in-cleanup.rs +++ b/tests/ui/panics/panic-in-cleanup.rs @@ -1,7 +1,6 @@ //@ run-fail //@ exec-env:RUST_BACKTRACE=0 //@ check-run-results -//@ error-pattern: panic in a destructor during cleanup //@ normalize-stderr: "\n +[0-9]+:[^\n]+" -> "" //@ normalize-stderr: "\n +at [^\n]+" -> "" //@ normalize-stderr: "(core/src/panicking\.rs):[0-9]+:[0-9]+" -> "$1:$$LINE:$$COL" diff --git a/tests/ui/panics/panic-in-ffi.rs b/tests/ui/panics/panic-in-ffi.rs index 6068e4fdc59be..eb9a15a879caa 100644 --- a/tests/ui/panics/panic-in-ffi.rs +++ b/tests/ui/panics/panic-in-ffi.rs @@ -1,8 +1,6 @@ //@ run-fail //@ exec-env:RUST_BACKTRACE=0 //@ check-run-results -//@ error-pattern: panic in a function that cannot unwind -//@ error-pattern: Noisy Drop //@ normalize-stderr: "\n +[0-9]+:[^\n]+" -> "" //@ normalize-stderr: "\n +at [^\n]+" -> "" //@ normalize-stderr: "(core/src/panicking\.rs):[0-9]+:[0-9]+" -> "$1:$$LINE:$$COL" diff --git a/tests/ui/panics/panic-in-message-fmt.rs b/tests/ui/panics/panic-in-message-fmt.rs index 1e9bbaf45c54f..db245372051c9 100644 --- a/tests/ui/panics/panic-in-message-fmt.rs +++ b/tests/ui/panics/panic-in-message-fmt.rs @@ -3,7 +3,6 @@ //@ run-fail //@ exec-env:RUST_BACKTRACE=0 //@ check-run-results -//@ error-pattern: panicked while processing panic //@ normalize-stderr: "\n +[0-9]+:[^\n]+" -> "" //@ normalize-stderr: "\n +at [^\n]+" -> "" //@ normalize-stderr: "(core/src/panicking\.rs):[0-9]+:[0-9]+" -> "$1:$$LINE:$$COL" diff --git a/tests/ui/panics/panic-macro-any-wrapped.rs b/tests/ui/panics/panic-macro-any-wrapped.rs index e3a2dc6eed42e..d71a929d1cd02 100644 --- a/tests/ui/panics/panic-macro-any-wrapped.rs +++ b/tests/ui/panics/panic-macro-any-wrapped.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:panicked -//@ error-pattern:Box +//@ check-run-results //@ needs-subprocess #![allow(non_fmt_panics)] diff --git a/tests/ui/panics/panic-macro-any.rs b/tests/ui/panics/panic-macro-any.rs index 1392929b65c2e..bfb0e6bbfa46d 100644 --- a/tests/ui/panics/panic-macro-any.rs +++ b/tests/ui/panics/panic-macro-any.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:panicked -//@ error-pattern:Box +//@ check-run-results //@ needs-subprocess #![allow(non_fmt_panics)] diff --git a/tests/ui/panics/panic-macro-explicit.rs b/tests/ui/panics/panic-macro-explicit.rs index b9195e3b0fccf..9039404e5e7a6 100644 --- a/tests/ui/panics/panic-macro-explicit.rs +++ b/tests/ui/panics/panic-macro-explicit.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:panicked -//@ error-pattern:explicit panic +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/panics/panic-macro-fmt.rs b/tests/ui/panics/panic-macro-fmt.rs index 550cd5c1ee333..744dcbe2a710f 100644 --- a/tests/ui/panics/panic-macro-fmt.rs +++ b/tests/ui/panics/panic-macro-fmt.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:panicked -//@ error-pattern:test-fail-fmt 42 rust +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/panics/panic-macro-owned.rs b/tests/ui/panics/panic-macro-owned.rs index 4df04c50bc3eb..e9e17dc2a9fd6 100644 --- a/tests/ui/panics/panic-macro-owned.rs +++ b/tests/ui/panics/panic-macro-owned.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:panicked -//@ error-pattern:test-fail-owned +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/panics/panic-macro-static.rs b/tests/ui/panics/panic-macro-static.rs index 1c6258ebed24b..4dcca6acfed8a 100644 --- a/tests/ui/panics/panic-macro-static.rs +++ b/tests/ui/panics/panic-macro-static.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:panicked -//@ error-pattern:test-fail-static +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/panics/panic-main.rs b/tests/ui/panics/panic-main.rs index 3876dbb37c37d..83e6186c74e26 100644 --- a/tests/ui/panics/panic-main.rs +++ b/tests/ui/panics/panic-main.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:moop +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/panics/panic-parens.rs b/tests/ui/panics/panic-parens.rs index 5440bf18f2567..6dbfa69c33005 100644 --- a/tests/ui/panics/panic-parens.rs +++ b/tests/ui/panics/panic-parens.rs @@ -2,7 +2,7 @@ // certain positions //@ run-fail -//@ error-pattern:oops +//@ check-run-results //@ needs-subprocess fn bigpanic() { diff --git a/tests/ui/panics/panic-set-handler.rs b/tests/ui/panics/panic-set-handler.rs index 41e513e0bd680..6ab9e63257801 100644 --- a/tests/ui/panics/panic-set-handler.rs +++ b/tests/ui/panics/panic-set-handler.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:greetings from the panic handler +//@ check-run-results //@ needs-subprocess use std::panic; diff --git a/tests/ui/panics/panic-set-unset-handler.rs b/tests/ui/panics/panic-set-unset-handler.rs index 66d5003d0f1c5..c9666d63047ed 100644 --- a/tests/ui/panics/panic-set-unset-handler.rs +++ b/tests/ui/panics/panic-set-unset-handler.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:thread 'main' panicked -//@ error-pattern:foobar +//@ check-run-results //@ needs-subprocess use std::panic; diff --git a/tests/ui/panics/panic-take-handler-nop.rs b/tests/ui/panics/panic-take-handler-nop.rs index f10582872df21..30debc219e6bd 100644 --- a/tests/ui/panics/panic-take-handler-nop.rs +++ b/tests/ui/panics/panic-take-handler-nop.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:thread 'main' panicked -//@ error-pattern:foobar +//@ check-run-results //@ needs-subprocess use std::panic; diff --git a/tests/ui/panics/panic-task-name-none.rs b/tests/ui/panics/panic-task-name-none.rs index 8695771ff5eaa..a8075f6efa6c3 100644 --- a/tests/ui/panics/panic-task-name-none.rs +++ b/tests/ui/panics/panic-task-name-none.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:thread '' panicked -//@ error-pattern:test +//@ check-run-results //@ needs-threads use std::thread; diff --git a/tests/ui/panics/panic-task-name-owned.rs b/tests/ui/panics/panic-task-name-owned.rs index 42ae33b5d351b..c3e1ed8fdc478 100644 --- a/tests/ui/panics/panic-task-name-owned.rs +++ b/tests/ui/panics/panic-task-name-owned.rs @@ -1,6 +1,5 @@ //@ run-fail -//@ error-pattern:thread 'owned name' panicked -//@ error-pattern:test +//@ check-run-results //@ needs-threads use std::thread::Builder; diff --git a/tests/ui/panics/panic.rs b/tests/ui/panics/panic.rs index 068f187524d5b..84200d44ca74f 100644 --- a/tests/ui/panics/panic.rs +++ b/tests/ui/panics/panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:1 == 2 +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/panics/result-get-panic.rs b/tests/ui/panics/result-get-panic.rs index b8dc49f9acaa5..88c612f47ef53 100644 --- a/tests/ui/panics/result-get-panic.rs +++ b/tests/ui/panics/result-get-panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:called `Result::unwrap()` on an `Err` value +//@ check-run-results //@ needs-subprocess use std::result::Result::Err; diff --git a/tests/ui/panics/unique-panic.rs b/tests/ui/panics/unique-panic.rs index 63ff38b6d1287..0e0a4dea0f613 100644 --- a/tests/ui/panics/unique-panic.rs +++ b/tests/ui/panics/unique-panic.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern: panic +//@ check-run-results // for some reason, fails to match error string on // wasm32-unknown-unknown with stripped debuginfo and symbols, // so don't strip it diff --git a/tests/ui/panics/while-body-panics.rs b/tests/ui/panics/while-body-panics.rs index 8459a8d63bff3..2e2062aed1a2c 100644 --- a/tests/ui/panics/while-body-panics.rs +++ b/tests/ui/panics/while-body-panics.rs @@ -1,7 +1,7 @@ #![allow(while_true)] //@ run-fail -//@ error-pattern:quux +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/panics/while-panic.rs b/tests/ui/panics/while-panic.rs index 4c8431c71d128..0d944c775d5ed 100644 --- a/tests/ui/panics/while-panic.rs +++ b/tests/ui/panics/while-panic.rs @@ -1,7 +1,7 @@ #![allow(while_true)] //@ run-fail -//@ error-pattern:giraffe +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/precondition-checks/alignment.rs b/tests/ui/precondition-checks/alignment.rs index 92400528fa07f..67597b7c075e4 100644 --- a/tests/ui/precondition-checks/alignment.rs +++ b/tests/ui/precondition-checks/alignment.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: Alignment::new_unchecked requires +//@ check-run-results #![feature(ptr_alignment_type)] diff --git a/tests/ui/precondition-checks/ascii-char-digit_unchecked.rs b/tests/ui/precondition-checks/ascii-char-digit_unchecked.rs index 30c6f79fb08f0..85072c2130ad5 100644 --- a/tests/ui/precondition-checks/ascii-char-digit_unchecked.rs +++ b/tests/ui/precondition-checks/ascii-char-digit_unchecked.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: `ascii::Char::digit_unchecked` input cannot exceed 9 +//@ check-run-results #![feature(ascii_char)] diff --git a/tests/ui/precondition-checks/assert_unchecked.rs b/tests/ui/precondition-checks/assert_unchecked.rs index 22b2b41455021..4cb762e67dcd4 100644 --- a/tests/ui/precondition-checks/assert_unchecked.rs +++ b/tests/ui/precondition-checks/assert_unchecked.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: hint::assert_unchecked must never be called when the condition is false +//@ check-run-results fn main() { unsafe { diff --git a/tests/ui/precondition-checks/char-from_u32_unchecked.rs b/tests/ui/precondition-checks/char-from_u32_unchecked.rs index d950f20c77208..56044044296e7 100644 --- a/tests/ui/precondition-checks/char-from_u32_unchecked.rs +++ b/tests/ui/precondition-checks/char-from_u32_unchecked.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: invalid value for `char` +//@ check-run-results fn main() { unsafe { diff --git a/tests/ui/precondition-checks/copy.rs b/tests/ui/precondition-checks/copy.rs index 1fadd90bf70bd..222ba3e42324c 100644 --- a/tests/ui/precondition-checks/copy.rs +++ b/tests/ui/precondition-checks/copy.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: ptr::copy requires +//@ check-run-results //@ revisions: null_src null_dst misaligned_src misaligned_dst #![allow(invalid_null_arguments)] diff --git a/tests/ui/precondition-checks/layout.rs b/tests/ui/precondition-checks/layout.rs index 4ee66cc932886..d53626c61ac67 100644 --- a/tests/ui/precondition-checks/layout.rs +++ b/tests/ui/precondition-checks/layout.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: Layout::from_size_align_unchecked requires +//@ check-run-results //@ revisions: toolarge badalign fn main() { diff --git a/tests/ui/precondition-checks/nonnull.rs b/tests/ui/precondition-checks/nonnull.rs index 6b8edd4e5825e..0c288110b999a 100644 --- a/tests/ui/precondition-checks/nonnull.rs +++ b/tests/ui/precondition-checks/nonnull.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: NonNull::new_unchecked requires +//@ check-run-results fn main() { unsafe { diff --git a/tests/ui/precondition-checks/nonzero-from_mut_unchecked.rs b/tests/ui/precondition-checks/nonzero-from_mut_unchecked.rs index 46ce7dc356fe2..ed62268f6047c 100644 --- a/tests/ui/precondition-checks/nonzero-from_mut_unchecked.rs +++ b/tests/ui/precondition-checks/nonzero-from_mut_unchecked.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: NonZero::from_mut_unchecked requires +//@ check-run-results #![feature(nonzero_from_mut)] diff --git a/tests/ui/precondition-checks/nonzero-new_unchecked.rs b/tests/ui/precondition-checks/nonzero-new_unchecked.rs index 7827a42844fd4..e6f5842af12ed 100644 --- a/tests/ui/precondition-checks/nonzero-new_unchecked.rs +++ b/tests/ui/precondition-checks/nonzero-new_unchecked.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: NonZero::new_unchecked requires +//@ check-run-results fn main() { unsafe { diff --git a/tests/ui/precondition-checks/read.rs b/tests/ui/precondition-checks/read.rs index d5ab7773987fc..22a167b44b5d4 100644 --- a/tests/ui/precondition-checks/read.rs +++ b/tests/ui/precondition-checks/read.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: ptr::read requires +//@ check-run-results //@ revisions: null misaligned //@ ignore-test (unimplemented) diff --git a/tests/ui/precondition-checks/read_volatile.rs b/tests/ui/precondition-checks/read_volatile.rs index ada8932c398ce..41130f46af832 100644 --- a/tests/ui/precondition-checks/read_volatile.rs +++ b/tests/ui/precondition-checks/read_volatile.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: ptr::read_volatile requires +//@ check-run-results //@ revisions: null misaligned #![allow(invalid_null_arguments)] diff --git a/tests/ui/precondition-checks/replace.rs b/tests/ui/precondition-checks/replace.rs index 44afbd8174c03..7bfccb4845c80 100644 --- a/tests/ui/precondition-checks/replace.rs +++ b/tests/ui/precondition-checks/replace.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: ptr::replace requires +//@ check-run-results //@ revisions: null misaligned #![allow(invalid_null_arguments)] diff --git a/tests/ui/precondition-checks/slice-from-raw-parts-mut.rs b/tests/ui/precondition-checks/slice-from-raw-parts-mut.rs index 9b9ded69a83b6..1da52730dd722 100644 --- a/tests/ui/precondition-checks/slice-from-raw-parts-mut.rs +++ b/tests/ui/precondition-checks/slice-from-raw-parts-mut.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: slice::from_raw_parts_mut requires +//@ check-run-results //@ revisions: null misaligned toolarge #![allow(invalid_null_arguments)] diff --git a/tests/ui/precondition-checks/slice-from-raw-parts.rs b/tests/ui/precondition-checks/slice-from-raw-parts.rs index 96578c1eae58b..7955cf2e5d8c0 100644 --- a/tests/ui/precondition-checks/slice-from-raw-parts.rs +++ b/tests/ui/precondition-checks/slice-from-raw-parts.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: slice::from_raw_parts requires +//@ check-run-results //@ revisions: null misaligned toolarge #![allow(invalid_null_arguments)] diff --git a/tests/ui/precondition-checks/slice-get_unchecked.rs b/tests/ui/precondition-checks/slice-get_unchecked.rs index 1d8188fb9531a..1015288bd926b 100644 --- a/tests/ui/precondition-checks/slice-get_unchecked.rs +++ b/tests/ui/precondition-checks/slice-get_unchecked.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: slice::get_unchecked requires +//@ check-run-results //@ revisions: usize range range_to range_from backwards_range fn main() { diff --git a/tests/ui/precondition-checks/slice-get_unchecked_mut.rs b/tests/ui/precondition-checks/slice-get_unchecked_mut.rs index 34c1454af438d..c426aa37218ca 100644 --- a/tests/ui/precondition-checks/slice-get_unchecked_mut.rs +++ b/tests/ui/precondition-checks/slice-get_unchecked_mut.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: slice::get_unchecked_mut requires +//@ check-run-results //@ revisions: usize range range_to range_from backwards_range fn main() { diff --git a/tests/ui/precondition-checks/slice-swap_unchecked.rs b/tests/ui/precondition-checks/slice-swap_unchecked.rs index 227a49091ec22..471941895327e 100644 --- a/tests/ui/precondition-checks/slice-swap_unchecked.rs +++ b/tests/ui/precondition-checks/slice-swap_unchecked.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: index out of bounds: the len is 2 but the index is 2 +//@ check-run-results //@ revisions: oob_a oob_b fn main() { diff --git a/tests/ui/precondition-checks/str-get_unchecked_mut.rs b/tests/ui/precondition-checks/str-get_unchecked_mut.rs index ca1b169005559..b5278202236b0 100644 --- a/tests/ui/precondition-checks/str-get_unchecked_mut.rs +++ b/tests/ui/precondition-checks/str-get_unchecked_mut.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: str::get_unchecked_mut requires +//@ check-run-results //@ revisions: range range_to range_from backwards_range fn main() { diff --git a/tests/ui/precondition-checks/swap-nonoverlapping.rs b/tests/ui/precondition-checks/swap-nonoverlapping.rs index ea1f6f36ad787..5086ce473b99f 100644 --- a/tests/ui/precondition-checks/swap-nonoverlapping.rs +++ b/tests/ui/precondition-checks/swap-nonoverlapping.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: ptr::swap_nonoverlapping requires +//@ check-run-results //@ revisions: null_src null_dst misaligned_src misaligned_dst overlapping #![allow(invalid_null_arguments)] diff --git a/tests/ui/precondition-checks/unchecked_add.rs b/tests/ui/precondition-checks/unchecked_add.rs index f44a6ea32ad8f..af089dea262a7 100644 --- a/tests/ui/precondition-checks/unchecked_add.rs +++ b/tests/ui/precondition-checks/unchecked_add.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: u8::unchecked_add cannot overflow +//@ check-run-results fn main() { unsafe { diff --git a/tests/ui/precondition-checks/unchecked_mul.rs b/tests/ui/precondition-checks/unchecked_mul.rs index 66655dda136e9..e1ad2ecb8a9f4 100644 --- a/tests/ui/precondition-checks/unchecked_mul.rs +++ b/tests/ui/precondition-checks/unchecked_mul.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: u8::unchecked_add cannot overflow +//@ check-run-results fn main() { unsafe { diff --git a/tests/ui/precondition-checks/unchecked_shl.rs b/tests/ui/precondition-checks/unchecked_shl.rs index 1c96db0b1ec71..c8cb87681b604 100644 --- a/tests/ui/precondition-checks/unchecked_shl.rs +++ b/tests/ui/precondition-checks/unchecked_shl.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: u8::unchecked_shl cannot overflow +//@ check-run-results #![feature(unchecked_shifts)] diff --git a/tests/ui/precondition-checks/unchecked_shr.rs b/tests/ui/precondition-checks/unchecked_shr.rs index 4a6d9ffb1d35b..b13479f3e28fe 100644 --- a/tests/ui/precondition-checks/unchecked_shr.rs +++ b/tests/ui/precondition-checks/unchecked_shr.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: u8::unchecked_shr cannot overflow +//@ check-run-results #![feature(unchecked_shifts)] diff --git a/tests/ui/precondition-checks/unchecked_sub.rs b/tests/ui/precondition-checks/unchecked_sub.rs index 545dde0e27809..067ea2ca3abac 100644 --- a/tests/ui/precondition-checks/unchecked_sub.rs +++ b/tests/ui/precondition-checks/unchecked_sub.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: u8::unchecked_sub cannot overflow +//@ check-run-results fn main() { unsafe { diff --git a/tests/ui/precondition-checks/unreachable_unchecked.rs b/tests/ui/precondition-checks/unreachable_unchecked.rs index 2435450c4b5a1..850468f57db30 100644 --- a/tests/ui/precondition-checks/unreachable_unchecked.rs +++ b/tests/ui/precondition-checks/unreachable_unchecked.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: hint::unreachable_unchecked must never be reached +//@ check-run-results fn main() { unsafe { diff --git a/tests/ui/precondition-checks/write.rs b/tests/ui/precondition-checks/write.rs index 5d6b9586fad7d..ef1ed69cff7c5 100644 --- a/tests/ui/precondition-checks/write.rs +++ b/tests/ui/precondition-checks/write.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: ptr::write requires +//@ check-run-results //@ revisions: null misaligned //@ ignore-test (unimplemented) diff --git a/tests/ui/precondition-checks/write_bytes.rs b/tests/ui/precondition-checks/write_bytes.rs index be4f5a089f035..69eb7f347d842 100644 --- a/tests/ui/precondition-checks/write_bytes.rs +++ b/tests/ui/precondition-checks/write_bytes.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: ptr::write requires +//@ check-run-results //@ revisions: null misaligned //@ ignore-test (unimplemented) diff --git a/tests/ui/precondition-checks/write_volatile.rs b/tests/ui/precondition-checks/write_volatile.rs index 0d5ecb014b3d9..d5161ddc520ee 100644 --- a/tests/ui/precondition-checks/write_volatile.rs +++ b/tests/ui/precondition-checks/write_volatile.rs @@ -1,6 +1,6 @@ //@ run-fail //@ compile-flags: -Copt-level=3 -Cdebug-assertions=no -Zub-checks=yes -//@ error-pattern: unsafe precondition(s) violated: ptr::write_volatile requires +//@ check-run-results //@ revisions: null misaligned #![allow(invalid_null_arguments)] diff --git a/tests/ui/process/tls-exit-status.rs b/tests/ui/process/tls-exit-status.rs index 6dd0d71ef356a..19ef48d60a65c 100644 --- a/tests/ui/process/tls-exit-status.rs +++ b/tests/ui/process/tls-exit-status.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:nonzero +//@ check-run-results //@ exec-env:RUST_NEWRT=1 //@ needs-subprocess diff --git a/tests/ui/reachable/issue-948.rs b/tests/ui/reachable/issue-948.rs index 6181e547acc81..fe5e0d04254fe 100644 --- a/tests/ui/reachable/issue-948.rs +++ b/tests/ui/reachable/issue-948.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:beep boop +//@ check-run-results //@ needs-subprocess #![allow(unused_variables)] diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error-err.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error-err.rs index 00a0ea04c0d1d..d72f53a23a0da 100644 --- a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error-err.rs +++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error-err.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:returned Box from main() +//@ check-run-results //@ failure-status: 1 //@ needs-subprocess diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-never.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-never.rs index 3b80c2b49a508..3555293497fa8 100644 --- a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-never.rs +++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-never.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:oh, dear +//@ check-run-results //@ needs-subprocess fn main() -> ! { diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs index 48605309965f7..d1ad94b0a9f40 100644 --- a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs +++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:returned Box from main() +//@ check-run-results //@ failure-status: 1 //@ needs-subprocess diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str-err.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str-err.rs index 8f7b3da31bb4c..b614b30c24a05 100644 --- a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str-err.rs +++ b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str-err.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern: An error message for you +//@ check-run-results //@ failure-status: 1 //@ needs-subprocess diff --git a/tests/ui/sanitizer/address.rs b/tests/ui/sanitizer/address.rs index 7a5e767687cf1..147bd5312b2f3 100644 --- a/tests/ui/sanitizer/address.rs +++ b/tests/ui/sanitizer/address.rs @@ -5,8 +5,7 @@ //@ compile-flags: -Z sanitizer=address -O -g // //@ run-fail -//@ error-pattern: AddressSanitizer: stack-buffer-overflow -//@ error-pattern: 'xs' (line 14) <== Memory access at offset +//@ check-run-results use std::hint::black_box; diff --git a/tests/ui/sanitizer/hwaddress.rs b/tests/ui/sanitizer/hwaddress.rs index e5939eb734b66..ff0156d6c2718 100644 --- a/tests/ui/sanitizer/hwaddress.rs +++ b/tests/ui/sanitizer/hwaddress.rs @@ -8,7 +8,7 @@ //@ compile-flags: -Z sanitizer=hwaddress -O -g -C codegen-units=16 // //@ run-fail -//@ error-pattern: HWAddressSanitizer: tag-mismatch +//@ check-run-results use std::hint::black_box; diff --git a/tests/ui/sanitizer/leak.rs b/tests/ui/sanitizer/leak.rs index 65915ec24b723..7615ca1fba786 100644 --- a/tests/ui/sanitizer/leak.rs +++ b/tests/ui/sanitizer/leak.rs @@ -4,7 +4,7 @@ //@ compile-flags: -Z sanitizer=leak -O // //@ run-fail -//@ error-pattern: LeakSanitizer: detected memory leaks +//@ check-run-results use std::hint::black_box; use std::mem; diff --git a/tests/ui/sanitizer/memory-eager.rs b/tests/ui/sanitizer/memory-eager.rs index 709299f87d49f..bc9745a168180 100644 --- a/tests/ui/sanitizer/memory-eager.rs +++ b/tests/ui/sanitizer/memory-eager.rs @@ -7,7 +7,7 @@ //@ [unoptimized]compile-flags: -Z sanitizer=memory -Zsanitizer-memory-track-origins // //@ run-fail -//@ error-pattern: MemorySanitizer: use-of-uninitialized-value +//@ check-run-results //@ [optimized]error-pattern: Uninitialized value was created by an allocation //@ [optimized]error-pattern: in the stack frame // diff --git a/tests/ui/sanitizer/memory.rs b/tests/ui/sanitizer/memory.rs index a91fefe4d16da..54e9f6e0bc9ce 100644 --- a/tests/ui/sanitizer/memory.rs +++ b/tests/ui/sanitizer/memory.rs @@ -7,9 +7,7 @@ //@ [unoptimized]compile-flags: -Z sanitizer=memory -Zsanitizer-memory-track-origins // //@ run-fail -//@ error-pattern: MemorySanitizer: use-of-uninitialized-value -//@ error-pattern: Uninitialized value was created by an allocation -//@ error-pattern: in the stack frame +//@ check-run-results // // This test case intentionally limits the usage of the std, // since it will be linked with an uninstrumented version of it. diff --git a/tests/ui/sanitizer/new-llvm-pass-manager-thin-lto.rs b/tests/ui/sanitizer/new-llvm-pass-manager-thin-lto.rs index b7dd4a437821a..af87730a03113 100644 --- a/tests/ui/sanitizer/new-llvm-pass-manager-thin-lto.rs +++ b/tests/ui/sanitizer/new-llvm-pass-manager-thin-lto.rs @@ -12,7 +12,7 @@ //@[opt0]compile-flags: -Copt-level=0 //@[opt1]compile-flags: -Copt-level=1 //@ run-fail -//@ error-pattern: ERROR: AddressSanitizer: stack-use-after-scope +//@ check-run-results static mut P: *mut usize = std::ptr::null_mut(); diff --git a/tests/ui/sanitizer/thread.rs b/tests/ui/sanitizer/thread.rs index 566774d6b1d64..4b36c3e8b7375 100644 --- a/tests/ui/sanitizer/thread.rs +++ b/tests/ui/sanitizer/thread.rs @@ -16,9 +16,7 @@ //@ compile-flags: -Z sanitizer=thread -O // //@ run-fail -//@ error-pattern: WARNING: ThreadSanitizer: data race -//@ error-pattern: Location is heap block of size 4 -//@ error-pattern: allocated by main thread +//@ check-run-results #![feature(rustc_private)] extern crate libc; diff --git a/tests/ui/sanitizer/use-after-scope.rs b/tests/ui/sanitizer/use-after-scope.rs index 4d7f6f6c2f2b5..e73259e529990 100644 --- a/tests/ui/sanitizer/use-after-scope.rs +++ b/tests/ui/sanitizer/use-after-scope.rs @@ -4,7 +4,7 @@ // //@ compile-flags: -Zsanitizer=address //@ run-fail -//@ error-pattern: ERROR: AddressSanitizer: stack-use-after-scope +//@ check-run-results static mut P: *mut usize = std::ptr::null_mut(); diff --git a/tests/ui/str/str-overrun.rs b/tests/ui/str/str-overrun.rs index 6d62b837694b0..15e49a04ae3ba 100644 --- a/tests/ui/str/str-overrun.rs +++ b/tests/ui/str/str-overrun.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:index out of bounds: the len is 5 but the index is 5 +//@ check-run-results //@ needs-subprocess fn main() { diff --git a/tests/ui/structs/rhs-type.rs b/tests/ui/structs/rhs-type.rs index 8ce924672cfd1..f04dabb769707 100644 --- a/tests/ui/structs/rhs-type.rs +++ b/tests/ui/structs/rhs-type.rs @@ -2,7 +2,7 @@ // as a _|_-typed thing, not a str-typed thing //@ run-fail -//@ error-pattern:bye +//@ check-run-results //@ needs-subprocess #![allow(unreachable_code)] diff --git a/tests/ui/threads-sendsync/task-spawn-barefn.rs b/tests/ui/threads-sendsync/task-spawn-barefn.rs index a97e92206e206..2412b9d0df835 100644 --- a/tests/ui/threads-sendsync/task-spawn-barefn.rs +++ b/tests/ui/threads-sendsync/task-spawn-barefn.rs @@ -1,5 +1,5 @@ //@ run-fail -//@ error-pattern:Ensure that the child thread runs by panicking +//@ check-run-results //@ needs-threads use std::thread;