use ui_test regex capabilities

Author: RalfJung

tests/fail/alloc/global_system_mixup.rs

@@ -1,6 +1,6 @@
 // Make sure we detect when the `Global` and `System` allocators are mixed
 // (even when the default `Global` uses `System`).
-//@error-pattern: which is Rust heap memory, using
+//@error-pattern: /deallocating .*, which is Rust heap memory, using .* heap deallocation operation/
 
 //@normalize-stderr-test: "using [A-Za-z]+ heap deallocation operation" -> "using PLATFORM heap deallocation operation"
 //@normalize-stderr-test: "\| +\^+" -> "| ^"

tests/fail/alloc/stack_free.rs

@@ -1,7 +1,7 @@
 // Validation/SB changes why we fail
 //@compile-flags: -Zmiri-disable-validation -Zmiri-disable-stacked-borrows
 
-//@error-pattern: which is stack variable memory, using Rust heap deallocation operation
+//@error-pattern: /deallocating .*, which is stack variable memory, using Rust heap deallocation operation/
 
 fn main() {
     let x = 42;

tests/fail/provenance/ptr_int_unexposed.rs

@@ -8,5 +8,5 @@ fn main() {
     let x_usize: usize = x_ptr.addr();
     // Cast back an address that did *not* get exposed.
     let ptr = std::ptr::from_exposed_addr::<i32>(x_usize);
-    assert_eq!(unsafe { *ptr }, 3); //~ ERROR: Undefined Behavior: dereferencing pointer failed
+    assert_eq!(unsafe { *ptr }, 3); //~ ERROR: is a dangling pointer
 }

tests/fail/stacked_borrows/alias_through_mutation.rs

@@ -11,5 +11,5 @@ fn main() {
     retarget(&mut target_alias, target);
     // now `target_alias` points to the same thing as `target`
     *target = 13;
-    let _val = *target_alias; //~ ERROR: borrow stack
+    let _val = *target_alias; //~ ERROR: /read access .* tag does not exist in the borrow stack/
 }

tests/fail/stacked_borrows/box_exclusive_violation1.rs

@@ -1,4 +1,4 @@
-fn demo_mut_advanced_unique(mut our: Box<i32>) -> i32 {
+fn demo_box_advanced_unique(mut our: Box<i32>) -> i32 {
     unknown_code_1(&*our);
 
     // This "re-asserts" uniqueness of the reference: After writing, we know
@@ -24,10 +24,10 @@ fn unknown_code_1(x: &i32) {
 
 fn unknown_code_2() {
     unsafe {
-        *LEAK = 7; //~ ERROR: borrow stack
+        *LEAK = 7; //~ ERROR: /write access .* tag does not exist in the borrow stack/
     }
 }
 
 fn main() {
-    demo_mut_advanced_unique(Box::new(0));
+    demo_box_advanced_unique(Box::new(0));
 }

tests/fail/stacked_borrows/box_exclusive_violation1.stderr

@@ -21,15 +21,15 @@ LL |     *our = 5;
    |     ^^^^^^^^
    = note: backtrace:
    = note: inside `unknown_code_2` at $DIR/box_exclusive_violation1.rs:LL:CC
-note: inside `demo_mut_advanced_unique` at $DIR/box_exclusive_violation1.rs:LL:CC
+note: inside `demo_box_advanced_unique` at $DIR/box_exclusive_violation1.rs:LL:CC
   --> $DIR/box_exclusive_violation1.rs:LL:CC
    |
 LL |     unknown_code_2();
    |     ^^^^^^^^^^^^^^^^
 note: inside `main` at $DIR/box_exclusive_violation1.rs:LL:CC
   --> $DIR/box_exclusive_violation1.rs:LL:CC
    |
-LL |     demo_mut_advanced_unique(Box::new(0));
+LL |     demo_box_advanced_unique(Box::new(0));
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

tests/fail/stacked_borrows/buggy_as_mut_slice.rs

@@ -11,5 +11,5 @@ fn main() {
     let v1 = safe::as_mut_slice(&v);
     let _v2 = safe::as_mut_slice(&v);
     v1[1] = 5;
-    //~^ ERROR: borrow stack
+    //~^ ERROR: /write access .* tag does not exist in the borrow stack/
 }

tests/fail/stacked_borrows/buggy_split_at_mut.rs

@@ -19,7 +19,7 @@ mod safe {
 fn main() {
     let mut array = [1, 2, 3, 4];
     let (a, b) = safe::split_at_mut(&mut array, 0);
-    //~^ ERROR: borrow stack
+    //~^ ERROR: /reborrow .* tag does not exist in the borrow stack/
     a[1] = 5;
     b[1] = 6;
 }

tests/fail/stacked_borrows/exposed_only_ro.rs

@@ -8,5 +8,5 @@ fn main() {
     let _fool = &mut x as *mut i32; // this would have fooled the old untagged pointer logic
     let addr = (&x as *const i32).expose_addr();
     let ptr = std::ptr::from_exposed_addr_mut::<i32>(addr);
-    unsafe { *ptr = 0 }; //~ ERROR: borrow stack
+    unsafe { *ptr = 0 }; //~ ERROR: /write access using <wildcard> .* no exposed tags have suitable permission in the borrow stack/
 }

tests/fail/stacked_borrows/illegal_read1.rs

@@ -8,7 +8,7 @@ fn main() {
     let xref = unsafe { &mut *xraw }; // derived from raw, so using raw is still ok...
     callee(xraw);
     let _val = *xref; // ...but any use of raw will invalidate our ref.
-    //~^ ERROR: borrow stack
+    //~^ ERROR: /read access .* tag does not exist in the borrow stack/
 }
 
 fn callee(xraw: *mut i32) {