Skip to content

Commit 7024c63

Browse files
ZalatharZalathar
committed
Always use a colon in //@ normalize-*: headers
1 parent 7a08f84 commit 7024c63

File tree

90 files changed

+177
-177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+177
-177
lines changed

‎tests/ui/abi/debug.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
//@ normalize-stderr-test "(abi|pref|unadjusted_abi_align): Align\([1-8] bytes\)" -> "$1: $$SOME_ALIGN"
2-
//@ normalize-stderr-test "(size): Size\([48] bytes\)" -> "$1: $$SOME_SIZE"
3-
//@ normalize-stderr-test "(can_unwind): (true|false)" -> "$1: $$SOME_BOOL"
4-
//@ normalize-stderr-test "(valid_range): 0\.\.=(4294967295|18446744073709551615)" -> "$1: $$FULL"
1+
//@ normalize-stderr-test: "(abi|pref|unadjusted_abi_align): Align\([1-8] bytes\)" -> "$1: $$SOME_ALIGN"
2+
//@ normalize-stderr-test: "(size): Size\([48] bytes\)" -> "$1: $$SOME_SIZE"
3+
//@ normalize-stderr-test: "(can_unwind): (true|false)" -> "$1: $$SOME_BOOL"
4+
//@ normalize-stderr-test: "(valid_range): 0\.\.=(4294967295|18446744073709551615)" -> "$1: $$FULL"
55
// This pattern is prepared for when we account for alignment in the niche.
6-
//@ normalize-stderr-test "(valid_range): [1-9]\.\.=(429496729[0-9]|1844674407370955161[0-9])" -> "$1: $$NON_NULL"
6+
//@ normalize-stderr-test: "(valid_range): [1-9]\.\.=(429496729[0-9]|1844674407370955161[0-9])" -> "$1: $$NON_NULL"
77
// Some attributes are only computed for release builds:
88
//@ compile-flags: -O
99
#![feature(rustc_attrs)]

‎tests/ui/const-generics/generic_const_exprs/issue-80742.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//@ check-fail
22
//@ known-bug: #97477
33
//@ failure-status: 101
4-
//@ normalize-stderr-test "note: .*\n\n" -> ""
5-
//@ normalize-stderr-test "thread 'rustc' panicked.*\n" -> ""
6-
//@ normalize-stderr-test "(error: internal compiler error: [^:]+):\d+:\d+: " -> "$1:LL:CC: "
4+
//@ normalize-stderr-test: "note: .*\n\n" -> ""
5+
//@ normalize-stderr-test: "thread 'rustc' panicked.*\n" -> ""
6+
//@ normalize-stderr-test: "(error: internal compiler error: [^:]+):\d+:\d+: " -> "$1:LL:CC: "
77
//@ rustc-env:RUST_BACKTRACE=0
88

99
// This test used to cause an ICE in rustc_mir::interpret::step::eval_rvalue_into_place

‎tests/ui/const-ptr/forbidden_slices.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Strip out raw byte dumps to make comparison platform-independent:
2-
//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
3-
//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*A(LLOC)?[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
2+
//@ normalize-stderr-test: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
3+
//@ normalize-stderr-test: "([0-9a-f][0-9a-f] |╾─*A(LLOC)?[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
44

55
#![feature(
66
slice_from_ptr_range,

‎tests/ui/consts/const-eval/const-eval-query-stack.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
//@ compile-flags: -Ztreat-err-as-bug=1
22
//@ failure-status: 101
33
//@ rustc-env:RUST_BACKTRACE=1
4-
//@ normalize-stderr-test "\nerror: .*unexpectedly panicked.*\n\n" -> ""
5-
//@ normalize-stderr-test "note: we would appreciate a bug report.*\n\n" -> ""
6-
//@ normalize-stderr-test "note: compiler flags.*\n\n" -> ""
7-
//@ normalize-stderr-test "note: rustc.*running on.*\n\n" -> ""
8-
//@ normalize-stderr-test "thread.*panicked.*:\n.*\n" -> ""
9-
//@ normalize-stderr-test "stack backtrace:\n" -> ""
10-
//@ normalize-stderr-test "\s\d{1,}: .*\n" -> ""
11-
//@ normalize-stderr-test "\s at .*\n" -> ""
12-
//@ normalize-stderr-test ".*note: Some details.*\n" -> ""
13-
//@ normalize-stderr-test ".*omitted \d{1,} frame.*\n" -> ""
4+
//@ normalize-stderr-test: "\nerror: .*unexpectedly panicked.*\n\n" -> ""
5+
//@ normalize-stderr-test: "note: we would appreciate a bug report.*\n\n" -> ""
6+
//@ normalize-stderr-test: "note: compiler flags.*\n\n" -> ""
7+
//@ normalize-stderr-test: "note: rustc.*running on.*\n\n" -> ""
8+
//@ normalize-stderr-test: "thread.*panicked.*:\n.*\n" -> ""
9+
//@ normalize-stderr-test: "stack backtrace:\n" -> ""
10+
//@ normalize-stderr-test: "\s\d{1,}: .*\n" -> ""
11+
//@ normalize-stderr-test: "\s at .*\n" -> ""
12+
//@ normalize-stderr-test: ".*note: Some details.*\n" -> ""
13+
//@ normalize-stderr-test: ".*omitted \d{1,} frame.*\n" -> ""
1414
#![allow(unconditional_panic)]
1515

1616
const X: i32 = 1 / 0; //~ERROR constant

‎tests/ui/consts/const-eval/heap/dealloc_intrinsic_dangling.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#![feature(const_mut_refs)]
44

55
// Strip out raw byte dumps to make comparison platform-independent:
6-
//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
7-
//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*A(LLOC)?[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
8-
//@ normalize-stderr-test "HEX_DUMP\s*\n\s*HEX_DUMP" -> "HEX_DUMP"
6+
//@ normalize-stderr-test: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
7+
//@ normalize-stderr-test: "([0-9a-f][0-9a-f] |╾─*A(LLOC)?[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
8+
//@ normalize-stderr-test: "HEX_DUMP\s*\n\s*HEX_DUMP" -> "HEX_DUMP"
99

1010
use std::intrinsics;
1111

‎tests/ui/consts/const-eval/raw-bytes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ stderr-per-bitwidth
22
//@ ignore-endian-big
33
// ignore-tidy-linelength
4-
//@ normalize-stderr-test "╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼" -> "╾ALLOC_ID$1╼"
4+
//@ normalize-stderr-test: "╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼" -> "╾ALLOC_ID$1╼"
55
#![allow(invalid_value)]
66
#![feature(never_type, rustc_attrs, ptr_metadata, slice_from_ptr_range, const_slice_from_ptr_range)]
77

‎tests/ui/consts/const-eval/ub-enum.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Strip out raw byte dumps to make comparison platform-independent:
2-
//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
3-
//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
4-
//@ normalize-stderr-test "0x0+" -> "0x0"
2+
//@ normalize-stderr-test: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
3+
//@ normalize-stderr-test: "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
4+
//@ normalize-stderr-test: "0x0+" -> "0x0"
55
#![feature(never_type)]
66
#![allow(invalid_value)]
77

‎tests/ui/consts/const-eval/ub-nonnull.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Strip out raw byte dumps to make comparison platform-independent:
2-
//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
3-
//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
2+
//@ normalize-stderr-test: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
3+
//@ normalize-stderr-test: "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
44
#![allow(invalid_value)] // make sure we cannot allow away the errors tested here
55
#![feature(rustc_attrs, ptr_metadata)]
66

‎tests/ui/consts/const-eval/ub-ref-ptr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-tidy-linelength
22
// Strip out raw byte dumps to make comparison platform-independent:
3-
//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
4-
//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
3+
//@ normalize-stderr-test: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
4+
//@ normalize-stderr-test: "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
55
#![allow(invalid_value)]
66

77
use std::mem;

‎tests/ui/consts/const-eval/ub-uninhabit.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Strip out raw byte dumps to make comparison platform-independent:
2-
//@ normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
3-
//@ normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
2+
//@ normalize-stderr-test: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
3+
//@ normalize-stderr-test: "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
44
#![feature(core_intrinsics)]
55
#![feature(never_type)]
66

0 commit comments

Comments
 (0)