rust-lang · clubby789 · Nov 25, 2024
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
@@ -17,7 +17,7 @@ use ignore::Walk;
 const ENTRY_LIMIT: u32 = 901;
 // FIXME: The following limits should be reduced eventually.
 
-const ISSUES_ENTRY_LIMIT: u32 = 1667;
+const ISSUES_ENTRY_LIMIT: u32 = 1679;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
     "rs",     // test source files

diff --git 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:index out of bounds
 //@ ignore-emscripten no processes
 
 #[allow(unconditional_panic)]

diff --git a/tests/ui/array-slice-vec/dst-raw-slice.run.stderr b/tests/ui/array-slice-vec/dst-raw-slice.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/dst-raw-slice.rs:11:18:
+index out of bounds: the len is 3 but the index is 3
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:index out of bounds: the len is 1 but the index is 2
 //@ ignore-emscripten no processes
 
 fn main() {

diff --git a/tests/ui/array-slice-vec/vec-overrun.run.stderr b/tests/ui/array-slice-vec/vec-overrun.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/vec-overrun.rs:11:17:
+index out of bounds: the len is 1 but the index is 2
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
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
@@ -2,8 +2,8 @@
 // be talking about `async fn`s instead.
 
 //@ run-fail
-//@ error-pattern: thread 'main' panicked
-//@ error-pattern: `async fn` resumed after completion
+//@ check-run-results: thread 'main' panicked
+//@ check-run-results: `async fn` resumed after completion
 //@ edition:2018
 
 #![feature(coroutines, coroutine_trait)]

diff --git a/...ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.run.stderr b/...ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/issue-65419-async-fn-resume-after-completion.rs:11:16:
+`async fn` resumed after completion
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
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
@@ -3,8 +3,8 @@
 
 //@ run-fail
 //@ needs-unwind
-//@ error-pattern: thread 'main' panicked
-//@ error-pattern: `async fn` resumed after panicking
+//@ check-run-results: thread 'main' panicked
+//@ check-run-results: `async fn` resumed after panicking
 //@ edition:2018
 
 #![feature(coroutines, coroutine_trait)]

diff --git a/tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.run.stderr b/tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.run.stderr
@@ -0,0 +1,5 @@
+thread 'main' panicked at $DIR/issue-65419-async-fn-resume-after-panic.rs:15:5:
+explicit panic
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+thread 'main' panicked at $DIR/issue-65419-async-fn-resume-after-panic.rs:14:16:
+`async fn` resumed after panicking
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
@@ -3,7 +3,7 @@
 // panic when resumed after completion.
 
 //@ run-fail
-//@ error-pattern:coroutine resumed after completion
+//@ check-run-results:coroutine resumed after completion
 //@ edition:2018
 
 #![feature(coroutines, coroutine_trait, stmt_expr_attributes)]

diff --git a/...i/async-await/issues/issue-65419/issue-65419-coroutine-resume-after-completion.run.stderr b/...i/async-await/issues/issue-65419/issue-65419-coroutine-resume-after-completion.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/issue-65419-coroutine-resume-after-completion.rs:15:5:
+coroutine resumed after completion
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:quux
 //@ ignore-emscripten no processes
 
 fn foo() -> ! {

diff --git a/tests/ui/binop/binop-fail-3.run.stderr b/tests/ui/binop/binop-fail-3.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/binop-fail-3.rs:6:5:
+quux
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:quux
 //@ ignore-emscripten no processes
 
 fn my_err(s: String) -> ! {

diff --git a/tests/ui/binop/binop-panic.run.stderr b/tests/ui/binop/binop-panic.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/binop-panic.rs:7:5:
+quux
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git a/tests/ui/binop/binop-panic.run.stdout b/tests/ui/binop/binop-panic.run.stdout
@@ -0,0 +1 @@
+bye
diff --git 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:panic 1
 //@ ignore-emscripten no processes
 
 fn main() {

diff --git a/tests/ui/borrowck/borrowck-local-borrow.run.stderr b/tests/ui/borrowck/borrowck-local-borrow.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/borrowck-local-borrow.rs:8:5:
+panic 1
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:explicit panic
 //@ ignore-emscripten no processes
 
 struct Parser<'i: 't, 't>(&'i u8, &'t u8);

diff --git a/tests/ui/borrowck/issue-28934.run.stderr b/tests/ui/borrowck/issue-28934.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/issue-28934.rs:14:9:
+explicit panic
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:oops
 //@ ignore-emscripten no processes
 
 fn main() {

diff --git a/tests/ui/closures/diverging-closure.run.stderr b/tests/ui/closures/diverging-closure.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/diverging-closure.rs:7:9:
+oops
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:index out of bounds: the len is 5 but the index is 5
 //@ ignore-emscripten no processes
 
 const fn test(x: usize) -> i32 {

diff --git a/tests/ui/consts/issue-29798.run.stderr b/tests/ui/consts/issue-29798.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/issue-29798.rs:6:5:
+index out of bounds: the len is 5 but the index is 5
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:coroutine resumed after panicking
 //@ ignore-emscripten no processes
 
 // Test that we get the correct message for resuming a panicked coroutine.

diff --git a/tests/ui/coroutine/coroutine-resume-after-panic.run.stderr b/tests/ui/coroutine/coroutine-resume-after-panic.run.stderr
@@ -0,0 +1,5 @@
+thread 'main' panicked at $DIR/coroutine-resume-after-panic.rs:18:9:
+explicit panic
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+thread 'main' panicked at $DIR/coroutine-resume-after-panic.rs:17:30:
+coroutine resumed after panicking
diff --git 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:explicit panic
 //@ ignore-emscripten no processes
 
 fn f() -> ! {

diff --git a/tests/ui/expr/if/expr-if-panic-fn.run.stderr b/tests/ui/expr/if/expr-if-panic-fn.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/expr-if-panic-fn.rs:6:5:
+explicit panic
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:explicit panic
 //@ ignore-emscripten no processes
 
 fn main() {

diff --git a/tests/ui/expr/if/expr-if-panic.run.stderr b/tests/ui/expr/if/expr-if-panic.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/expr-if-panic.rs:9:9:
+explicit panic
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:Number is odd
 //@ ignore-emscripten no processes
 
 fn even(x: usize) -> bool {

diff --git a/tests/ui/expr/if/if-check-panic.run.stderr b/tests/ui/expr/if/if-check-panic.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/if-check-panic.rs:19:9:
+Number is odd
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:quux
 //@ ignore-emscripten no processes
 
 fn my_err(s: String) -> ! {

diff --git a/tests/ui/expr/if/if-cond-bot.run.stderr b/tests/ui/expr/if/if-cond-bot.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/if-cond-bot.rs:7:5:
+quux
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git a/tests/ui/expr/if/if-cond-bot.run.stdout b/tests/ui/expr/if/if-cond-bot.run.stdout
@@ -0,0 +1 @@
+bye
diff --git 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:stop
 //@ ignore-emscripten no processes
 
 // #18576

diff --git a/tests/ui/extern/issue-18576.run.stderr b/tests/ui/extern/issue-18576.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/issue-18576.rs:11:5:
+stop
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:explicit panic
 //@ ignore-emscripten no processes
 
 fn f() -> ! {

diff --git a/tests/ui/fn/expr-fn-panic.run.stderr b/tests/ui/fn/expr-fn-panic.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/expr-fn-panic.rs:6:5:
+explicit panic
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git a/tests/ui/hashmap/hashmap-capacity-overflow.rs b/tests/ui/hashmap/hashmap-capacity-overflow.rs
@@ -1,6 +1,7 @@
 //@ run-fail
 //@ error-pattern:capacity overflow
 //@ ignore-emscripten no processes
+//@ compile-flags: --remap-path-prefix={{rust-src-base}}=remapped
 
 use std::collections::hash_map::HashMap;
 use std::mem::size_of;

diff --git 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:panic works
 //@ ignore-emscripten no processes
 
 use std::*;

diff --git a/tests/ui/imports/glob-use-std.run.stderr b/tests/ui/imports/glob-use-std.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/glob-use-std.rs:10:5:
+panic works
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:explicit panic
 //@ ignore-emscripten no processes
 
 pub fn main() {

diff --git a/tests/ui/issues/issue-12920.run.stderr b/tests/ui/issues/issue-12920.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/issue-12920.rs:6:5:
+explicit panic
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:bad input
 //@ ignore-emscripten no processes
 
 fn main() {

diff --git a/tests/ui/issues/issue-13202.run.stderr b/tests/ui/issues/issue-13202.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/issue-13202.rs:6:27:
+bad input
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:Hello, world!
 //@ ignore-emscripten no processes
 
 pub trait Parser {

diff --git a/tests/ui/issues/issue-20971.run.stderr b/tests/ui/issues/issue-20971.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/issue-20971.rs:18:5:
+Hello, world!
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:panic evaluated
 //@ ignore-emscripten no processes
 
 #[allow(unused_variables)]

diff --git a/tests/ui/issues/issue-23354-2.run.stderr b/tests/ui/issues/issue-23354-2.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/issue-23354-2.rs:8:14:
+panic evaluated
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:panic evaluated
 //@ ignore-emscripten no processes
 
 #[allow(unused_variables)]

diff --git a/tests/ui/issues/issue-23354.run.stderr b/tests/ui/issues/issue-23354.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/issue-23354.rs:7:14:
+panic evaluated
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:custom message
 //@ ignore-emscripten no processes
 
 fn main() {

diff --git a/tests/ui/issues/issue-2761.run.stderr b/tests/ui/issues/issue-2761.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/issue-2761.rs:6:5:
+custom message
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:so long
 //@ ignore-emscripten no processes
 
 #![allow(unreachable_code)]

diff --git a/tests/ui/issues/issue-3029.run.stderr b/tests/ui/issues/issue-3029.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/issue-3029.rs:10:5:
+so long
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:panicking destructors ftw!
 //@ ignore-emscripten no processes
 
 struct Observer<'a>(&'a mut FilledOnDrop);

diff --git a/tests/ui/issues/issue-30380.run.stderr b/tests/ui/issues/issue-30380.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/issue-30380.rs:17:13:
+panicking destructors ftw!
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:overflow
 
 use std::time::{Duration, Instant};
 

diff --git a/tests/ui/issues/issue-44216-add-instant.run.stderr b/tests/ui/issues/issue-44216-add-instant.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at library/std/src/time.rs:417:33:
+overflow when adding duration to instant
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:overflow
 //@ ignore-emscripten no processes
 
 use std::time::{Duration, SystemTime};

diff --git a/tests/ui/issues/issue-44216-add-system-time.run.stderr b/tests/ui/issues/issue-44216-add-system-time.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at library/std/src/time.rs:601:31:
+overflow when adding duration to instant
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:overflow
 //@ ignore-emscripten no processes
 
 use std::time::{Instant, Duration};

diff --git a/tests/ui/issues/issue-44216-sub-instant.run.stderr b/tests/ui/issues/issue-44216-sub-instant.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at library/std/src/time.rs:433:33:
+overflow when subtracting duration from instant
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:overflow
 //@ ignore-emscripten no processes
 
 use std::time::{Duration, SystemTime};

diff --git a/tests/ui/issues/issue-44216-sub-system-time.run.stderr b/tests/ui/issues/issue-44216-sub-system-time.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at library/std/src/time.rs:617:31:
+overflow when subtracting duration from instant
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
diff --git 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:moop
 //@ ignore-emscripten no processes
 
 fn main() {

diff --git a/tests/ui/loops/for-each-loop-panic.run.stderr b/tests/ui/loops/for-each-loop-panic.run.stderr
@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/for-each-loop-panic.rs:7:9:
+moop
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace