Skip to content

Commit 1c82dbe

Browse files
committed
fix some bad regex capture group references in test normalization
1 parent 63c5542 commit 1c82dbe

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

tests/fail/function_calls/exported_symbol_bad_unwind2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//@revisions: extern_block definition both
22
//@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
33
//@normalize-stderr-test: "\| +\^+" -> "| ^"
4-
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> "$1"
5-
//@normalize-stderr-test: "\n at [^\n]+" -> "$1"
4+
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
5+
//@normalize-stderr-test: "\n +at [^\n]+" -> ""
66
//@[definition,both]error-in-other-file: aborted execution
77
#![feature(rustc_attrs, c_unwind)]
88

tests/fail/intrinsics/uninit_uninhabited_type.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
22
//@normalize-stderr-test: "\| +\^+" -> "| ^"
3-
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> "$1"
4-
//@normalize-stderr-test: "\n at [^\n]+" -> "$1"
3+
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
4+
//@normalize-stderr-test: "\n +at [^\n]+" -> ""
55
//@error-in-other-file: aborted execution
66
#![feature(never_type)]
77

tests/fail/intrinsics/zero_fn_ptr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
22
//@normalize-stderr-test: "\| +\^+" -> "| ^"
3-
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> "$1"
4-
//@normalize-stderr-test: "\n at [^\n]+" -> "$1"
3+
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
4+
//@normalize-stderr-test: "\n +at [^\n]+" -> ""
55
//@error-in-other-file: aborted execution
66

77
#[allow(deprecated, invalid_value)]

tests/fail/panic/double_panic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
22
//@normalize-stderr-test: "\| +\^+" -> "| ^"
3-
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> "$1"
4-
//@normalize-stderr-test: "\n at [^\n]+" -> "$1"
3+
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
4+
//@normalize-stderr-test: "\n +at [^\n]+" -> ""
55
//@error-in-other-file: aborted execution
66

77
struct Foo;

tests/fail/terminate-terminator.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//@compile-flags: -Zmir-opt-level=3 -Zinline-mir-hint-threshold=1000
22
//@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
33
//@normalize-stderr-test: "\| +\^+" -> "| ^"
4-
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> "$1"
5-
//@normalize-stderr-test: "\n at [^\n]+" -> "$1"
4+
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
5+
//@normalize-stderr-test: "\n +at [^\n]+" -> ""
66
//@error-in-other-file: aborted execution
77
// Enable MIR inlining to ensure that `TerminatorKind::UnwindTerminate` is generated
88
// instead of just `UnwindAction::Terminate`.

tests/fail/unwind-action-terminate.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//@error-in-other-file: aborted execution
22
//@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\);" -> "ABORT();"
33
//@normalize-stderr-test: "\| +\^+" -> "| ^"
4-
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> "$1"
5-
//@normalize-stderr-test: "\n at [^\n]+" -> "$1"
4+
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
5+
//@normalize-stderr-test: "\n +at [^\n]+" -> ""
66
#![feature(c_unwind)]
77

88
extern "C" fn panic_abort() {

tests/pass/panic/nested_panic_caught.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@normalize-stderr-test: "\| +\^+" -> "| ^"
2-
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> "$1"
3-
//@normalize-stderr-test: "\n at [^\n]+" -> "$1"
2+
//@normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
3+
//@normalize-stderr-test: "\n +at [^\n]+" -> ""
44

55
// Checks that nested panics work correctly.
66

0 commit comments

Comments
 (0)