Auto merge of #3037 - RalfJung:test, r=RalfJung

fix some bad regex capture group references in test normalization

Author: bors

tests/fail/function_calls/exported_symbol_bad_unwind2.rs

@@ -1,8 +1,8 @@
 //@revisions: extern_block definition both
 //@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
-//@normalize-stderr-test: "\n  +[0-9]+:[^\n]+" -> "$1"
-//@normalize-stderr-test: "\n at [^\n]+" -> "$1"
+//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
+//@normalize-stderr-test: "\n +at [^\n]+" -> ""
 //@[definition,both]error-in-other-file: aborted execution
 #![feature(rustc_attrs, c_unwind)]
 

tests/fail/intrinsics/uninit_uninhabited_type.rs

@@ -1,7 +1,7 @@
 //@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
-//@normalize-stderr-test: "\n  +[0-9]+:[^\n]+" -> "$1"
-//@normalize-stderr-test: "\n at [^\n]+" -> "$1"
+//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
+//@normalize-stderr-test: "\n +at [^\n]+" -> ""
 //@error-in-other-file: aborted execution
 #![feature(never_type)]
 

tests/fail/intrinsics/zero_fn_ptr.rs

@@ -1,7 +1,7 @@
 //@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
-//@normalize-stderr-test: "\n  +[0-9]+:[^\n]+" -> "$1"
-//@normalize-stderr-test: "\n at [^\n]+" -> "$1"
+//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
+//@normalize-stderr-test: "\n +at [^\n]+" -> ""
 //@error-in-other-file: aborted execution
 
 #[allow(deprecated, invalid_value)]

tests/fail/panic/double_panic.rs

@@ -1,7 +1,7 @@
 //@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
-//@normalize-stderr-test: "\n  +[0-9]+:[^\n]+" -> "$1"
-//@normalize-stderr-test: "\n at [^\n]+" -> "$1"
+//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
+//@normalize-stderr-test: "\n +at [^\n]+" -> ""
 //@error-in-other-file: aborted execution
 
 struct Foo;

tests/fail/terminate-terminator.rs

@@ -1,8 +1,8 @@
 //@compile-flags: -Zmir-opt-level=3 -Zinline-mir-hint-threshold=1000
 //@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
-//@normalize-stderr-test: "\n  +[0-9]+:[^\n]+" -> "$1"
-//@normalize-stderr-test: "\n at [^\n]+" -> "$1"
+//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
+//@normalize-stderr-test: "\n +at [^\n]+" -> ""
 //@error-in-other-file: aborted execution
 // Enable MIR inlining to ensure that `TerminatorKind::UnwindTerminate` is generated
 // instead of just `UnwindAction::Terminate`.

tests/fail/unwind-action-terminate.rs

@@ -1,8 +1,8 @@
 //@error-in-other-file: aborted execution
 //@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
-//@normalize-stderr-test: "\n  +[0-9]+:[^\n]+" -> "$1"
-//@normalize-stderr-test: "\n at [^\n]+" -> "$1"
+//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
+//@normalize-stderr-test: "\n +at [^\n]+" -> ""
 #![feature(c_unwind)]
 
 extern "C" fn panic_abort() {

tests/pass/panic/nested_panic_caught.rs

@@ -1,6 +1,6 @@
 //@normalize-stderr-test: "\| +\^+" -> "| ^"
-//@normalize-stderr-test: "\n  +[0-9]+:[^\n]+" -> "$1"
-//@normalize-stderr-test: "\n at [^\n]+" -> "$1"
+//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
+//@normalize-stderr-test: "\n +at [^\n]+" -> ""
 
 // Checks that nested panics work correctly.