Skip to content

Commit 1d5c4e9

Browse files
ZalatharZalathar
committed
Remove the -test suffix from normalize directives
1 parent 71a3575 commit 1d5c4e9

File tree

172 files changed

+300
-300
lines changed

Some content is hidden

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

172 files changed

+300
-300
lines changed

‎src/tools/compiletest/src/directive-list.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
162162
"no-prefer-dynamic",
163163
"normalize-stderr-32bit",
164164
"normalize-stderr-64bit",
165-
"normalize-stderr-test",
166-
"normalize-stdout-test",
165+
"normalize-stderr",
166+
"normalize-stdout",
167167
"only-16bit",
168168
"only-32bit",
169169
"only-64bit",

‎src/tools/compiletest/src/header.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -982,8 +982,8 @@ impl Config {
982982
let directive_name = line.split_once(':')?.0;
983983

984984
let kind = match directive_name {
985-
"normalize-stdout-test" => NormalizeKind::Stdout,
986-
"normalize-stderr-test" => NormalizeKind::Stderr,
985+
"normalize-stdout" => NormalizeKind::Stdout,
986+
"normalize-stderr" => NormalizeKind::Stderr,
987987
"normalize-stderr-32bit" => NormalizeKind::Stderr32bit,
988988
"normalize-stderr-64bit" => NormalizeKind::Stderr64bit,
989989
_ => return None,

‎tests/ui/abi/c-zst.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ normalize-stderr-test: "(abi|pref|unadjusted_abi_align): Align\([1-8] bytes\)" -> "$1: $$SOME_ALIGN"
1+
//@ normalize-stderr: "(abi|pref|unadjusted_abi_align): Align\([1-8] bytes\)" -> "$1: $$SOME_ALIGN"
22
/*!
33
C doesn't have zero-sized types... except it does.
44

‎tests/ui/abi/debug.rs

+5-5
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: "(abi|pref|unadjusted_abi_align): Align\([1-8] bytes\)" -> "$1: $$SOME_ALIGN"
2+
//@ normalize-stderr: "(size): Size\([48] bytes\)" -> "$1: $$SOME_SIZE"
3+
//@ normalize-stderr: "(can_unwind): (true|false)" -> "$1: $$SOME_BOOL"
4+
//@ normalize-stderr: "(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: "(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/abi/sysv64-zst.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//@ only-x86_64
2-
//@ normalize-stderr-test: "(abi|pref|unadjusted_abi_align): Align\([1-8] bytes\)" -> "$1: $$SOME_ALIGN"
2+
//@ normalize-stderr: "(abi|pref|unadjusted_abi_align): Align\([1-8] bytes\)" -> "$1: $$SOME_ALIGN"
33

44
#![feature(rustc_attrs)]
55
#![crate_type = "lib"]

‎tests/ui/abi/win64-zst.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ normalize-stderr-test: "(abi|pref|unadjusted_abi_align): Align\([1-8] bytes\)" -> "$1: $$SOME_ALIGN"
1+
//@ normalize-stderr: "(abi|pref|unadjusted_abi_align): Align\([1-8] bytes\)" -> "$1: $$SOME_ALIGN"
22
//@ only-x86_64
33

44
//@ revisions: x86_64-linux

‎tests/ui/argfile/commandline-argfile-missing-windows.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// line arguments and is only run on windows.
66
//
77
//@ only-windows
8-
//@ normalize-stderr-test: "os error \d+" -> "os error $$ERR"
9-
//@ normalize-stderr-test: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
8+
//@ normalize-stderr: "os error \d+" -> "os error $$ERR"
9+
//@ normalize-stderr: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
1010
//@ compile-flags: --cfg cmdline_set @{{src-base}}\argfile\commandline-argfile-missing.args
1111

1212
#[cfg(not(cmdline_set))]

‎tests/ui/argfile/commandline-argfile-missing.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
// windows.
77
//
88
//@ ignore-windows
9-
//@ normalize-stderr-test: "os error \d+" -> "os error $$ERR"
10-
//@ normalize-stderr-test: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
9+
//@ normalize-stderr: "os error \d+" -> "os error $$ERR"
10+
//@ normalize-stderr: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
1111
//@ compile-flags: --cfg cmdline_set @{{src-base}}/argfile/commandline-argfile-missing.args
1212

1313
#[cfg(not(cmdline_set))]

‎tests/ui/argfile/commandline-argfile-multiple-windows.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
// line arguments and is only run on windows.
66
//
77
//@ only-windows
8-
//@ normalize-stderr-test: "os error \d+" -> "os error $$ERR"
9-
//@ normalize-stderr-test: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
10-
//@ normalize-stderr-test: "commandline-argfile-missing2.args:[^(]*" -> "commandline-argfile-missing2.args: $$FILE_MISSING "
8+
//@ normalize-stderr: "os error \d+" -> "os error $$ERR"
9+
//@ normalize-stderr: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
10+
//@ normalize-stderr: "commandline-argfile-missing2.args:[^(]*" -> "commandline-argfile-missing2.args: $$FILE_MISSING "
1111
//@ compile-flags: --cfg cmdline_set @{{src-base}}\argfile\commandline-argfile-missing.args @{{src-base}}\argfile\commandline-argfile-badutf8.args @{{src-base}}\argfile\commandline-argfile-missing2.args
1212

1313
#[cfg(not(cmdline_set))]

‎tests/ui/argfile/commandline-argfile-multiple.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
// windows.
77
//
88
//@ ignore-windows
9-
//@ normalize-stderr-test: "os error \d+" -> "os error $$ERR"
10-
//@ normalize-stderr-test: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
11-
//@ normalize-stderr-test: "commandline-argfile-missing2.args:[^(]*" -> "commandline-argfile-missing2.args: $$FILE_MISSING "
9+
//@ normalize-stderr: "os error \d+" -> "os error $$ERR"
10+
//@ normalize-stderr: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
11+
//@ normalize-stderr: "commandline-argfile-missing2.args:[^(]*" -> "commandline-argfile-missing2.args: $$FILE_MISSING "
1212
//@ compile-flags: --cfg cmdline_set @{{src-base}}/argfile/commandline-argfile-missing.args @{{src-base}}/argfile/commandline-argfile-badutf8.args @{{src-base}}/argfile/commandline-argfile-missing2.args
1313

1414
#[cfg(not(cmdline_set))]

‎tests/ui/associated-types/associated-types-in-ambiguous-context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ normalize-stderr-test: "and \d+ other candidates" -> "and N other candidates"
1+
//@ normalize-stderr: "and \d+ other candidates" -> "and N other candidates"
22

33
trait Get {
44
type Value;

‎tests/ui/attributes/dump-preds.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ normalize-stderr-test: "DefId\(.+?\)" -> "DefId(..)"
1+
//@ normalize-stderr: "DefId\(.+?\)" -> "DefId(..)"
22

33
#![feature(rustc_attrs)]
44

‎tests/ui/attributes/dump_def_parents.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ normalize-stderr-test: "DefId\(.+?\)" -> "DefId(..)"
1+
//@ normalize-stderr: "DefId\(.+?\)" -> "DefId(..)"
22
#![feature(rustc_attrs)]
33

44
fn bar() {

‎tests/ui/attributes/extented-attribute-macro-error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ normalize-stderr-test: "couldn't read.*" -> "couldn't read the file"
1+
//@ normalize-stderr: "couldn't read.*" -> "couldn't read the file"
22

33
#![doc = include_str!("../not_existing_file.md")]
44
struct Documented {}

‎tests/ui/check-cfg/and-more-diagnostic.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
//@ check-pass
55
//@ no-auto-check-cfg
66
//@ compile-flags: --check-cfg=cfg()
7-
//@ normalize-stderr-test: "and \d+ more" -> "and X more"
8-
//@ normalize-stderr-test: "`[a-zA-Z0-9_-]+`" -> "`xxx`"
7+
//@ normalize-stderr: "and \d+ more" -> "and X more"
8+
//@ normalize-stderr: "`[a-zA-Z0-9_-]+`" -> "`xxx`"
99

1010
fn main() {
1111
cfg!(target_feature = "zebra");

‎tests/ui/check-cfg/target_feature.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//@ check-pass
1111
//@ no-auto-check-cfg
1212
//@ compile-flags: --check-cfg=cfg() -Zcheck-cfg-all-expected
13-
//@ normalize-stderr-test: "`, `" -> "`\n`"
13+
//@ normalize-stderr: "`, `" -> "`\n`"
1414

1515
fn main() {
1616
cfg!(target_feature = "_UNEXPECTED_VALUE");

‎tests/ui/codegen/mismatched-data-layouts.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
//@ needs-llvm-components: x86
55
//@ compile-flags: --crate-type=lib --target={{src-base}}/codegen/mismatched-data-layout.json -Z unstable-options
66
//@ error-pattern: differs from LLVM target's
7-
//@ normalize-stderr-test: "`, `[A-Za-z0-9-:]*`" -> "`, `normalized data layout`"
8-
//@ normalize-stderr-test: "layout, `[A-Za-z0-9-:]*`" -> "layout, `normalized data layout`"
7+
//@ normalize-stderr: "`, `[A-Za-z0-9-:]*`" -> "`, `normalized data layout`"
8+
//@ normalize-stderr: "layout, `[A-Za-z0-9-:]*`" -> "layout, `normalized data layout`"
99

1010
#![feature(lang_items, no_core, auto_traits)]
1111
#![no_core]

‎tests/ui/codegen/target-cpus.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
// output so that the stdout with LLVM-at-HEAD matches the output of the LLVM
77
// versions currently used by default.
88
// FIXME(#133919): Once Rust upgrades to LLVM 20, remove this.
9-
//@ normalize-stdout-test: "(?m)^ *lime1\n" -> ""
9+
//@ normalize-stdout: "(?m)^ *lime1\n" -> ""

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

+3-3
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: "note: .*\n\n" -> ""
5+
//@ normalize-stderr: "thread 'rustc' panicked.*\n" -> ""
6+
//@ normalize-stderr: "(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-generics/transmute-fail.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// ignore-tidy-linelength
2-
//@ normalize-stderr-test: "values of the type `[^`]+` are too big" -> "values of the type $$REALLY_TOO_BIG are too big"
2+
//@ normalize-stderr: "values of the type `[^`]+` are too big" -> "values of the type $$REALLY_TOO_BIG are too big"
33

44

55
#![feature(transmute_generic_consts)]

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

+2-2
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: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
3+
//@ normalize-stderr: "([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

+10-10
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: "\nerror: .*unexpectedly panicked.*\n\n" -> ""
5+
//@ normalize-stderr: "note: we would appreciate a bug report.*\n\n" -> ""
6+
//@ normalize-stderr: "note: compiler flags.*\n\n" -> ""
7+
//@ normalize-stderr: "note: rustc.*running on.*\n\n" -> ""
8+
//@ normalize-stderr: "thread.*panicked.*:\n.*\n" -> ""
9+
//@ normalize-stderr: "stack backtrace:\n" -> ""
10+
//@ normalize-stderr: "\s\d{1,}: .*\n" -> ""
11+
//@ normalize-stderr: "\s at .*\n" -> ""
12+
//@ normalize-stderr: ".*note: Some details.*\n" -> ""
13+
//@ normalize-stderr: ".*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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#![feature(const_heap)]
33

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

99
use std::intrinsics;
1010

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

+1-1
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: "╾─*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

+3-3
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: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
3+
//@ normalize-stderr: "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
4+
//@ normalize-stderr: "0x0+" -> "0x0"
55
#![feature(never_type)]
66
#![allow(invalid_value)]
77

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

+2-2
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: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
3+
//@ normalize-stderr: "([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

+2-2
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: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
4+
//@ normalize-stderr: "([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

+2-2
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: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
3+
//@ normalize-stderr: "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
44
#![feature(core_intrinsics)]
55
#![feature(never_type)]
66

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
use std::{ptr, mem};
66

77
// Strip out raw byte dumps to make comparison platform-independent:
8-
//@ normalize-stderr-test: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
9-
//@ normalize-stderr-test: "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
10-
//@ normalize-stderr-test: "offset \d+" -> "offset N"
11-
//@ normalize-stderr-test: "size \d+" -> "size N"
8+
//@ normalize-stderr: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
9+
//@ normalize-stderr: "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
10+
//@ normalize-stderr: "offset \d+" -> "offset N"
11+
//@ normalize-stderr: "size \d+" -> "size N"
1212

1313

1414
/// A newtype wrapper to prevent MIR generation from inserting reborrows that would affect the error

‎tests/ui/consts/const-mut-refs/mut_ref_in_final.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
//@ normalize-stderr-test: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
2-
//@ normalize-stderr-test: "( 0x[0-9a-f][0-9a-f] │)? ([0-9a-f][0-9a-f] |__ |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> " HEX_DUMP"
3-
//@ normalize-stderr-test: "HEX_DUMP\s*\n\s*HEX_DUMP" -> "HEX_DUMP"
1+
//@ normalize-stderr: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
2+
//@ normalize-stderr: "( 0x[0-9a-f][0-9a-f] │)? ([0-9a-f][0-9a-f] |__ |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> " HEX_DUMP"
3+
//@ normalize-stderr: "HEX_DUMP\s*\n\s*HEX_DUMP" -> "HEX_DUMP"
44

55
use std::cell::UnsafeCell;
66
use std::mem;

‎tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
//@ normalize-stderr-test: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
2-
//@ normalize-stderr-test: "( 0x[0-9a-f][0-9a-f] │)? ([0-9a-f][0-9a-f] |__ |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> " HEX_DUMP"
3-
//@ normalize-stderr-test: "HEX_DUMP\s*\n\s*HEX_DUMP" -> "HEX_DUMP"
1+
//@ normalize-stderr: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
2+
//@ normalize-stderr: "( 0x[0-9a-f][0-9a-f] │)? ([0-9a-f][0-9a-f] |__ |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> " HEX_DUMP"
3+
//@ normalize-stderr: "HEX_DUMP\s*\n\s*HEX_DUMP" -> "HEX_DUMP"
44

55
use std::sync::Mutex;
66

‎tests/ui/consts/const_refs_to_static_fail.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//@ normalize-stderr-test: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
2-
//@ normalize-stderr-test: "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
1+
//@ normalize-stderr: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
2+
//@ normalize-stderr: "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
33

44
#![feature(sync_unsafe_cell)]
55

‎tests/ui/consts/const_refs_to_static_fail_invalid.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//@ normalize-stderr-test: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
2-
//@ normalize-stderr-test: "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
1+
//@ normalize-stderr: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
2+
//@ normalize-stderr: "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
33
#![allow(static_mut_refs)]
44

55
fn invalid() {

‎tests/ui/consts/dangling-alloc-id-ice.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// https://github.com/rust-lang/rust/issues/55223
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] |╾─*A(LLOC)?[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
5-
//@ normalize-stderr-test: "HEX_DUMP\s*\n\s*HEX_DUMP" -> "HEX_DUMP"
3+
//@ normalize-stderr: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
4+
//@ normalize-stderr: "([0-9a-f][0-9a-f] |╾─*A(LLOC)?[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
5+
//@ normalize-stderr: "HEX_DUMP\s*\n\s*HEX_DUMP" -> "HEX_DUMP"
66

77
union Foo<'a> {
88
y: &'a (),

‎tests/ui/consts/dangling-zst-ice-issue-126393.rs

+3-3
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] |╾─*A(LLOC)?[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
4-
//@ normalize-stderr-test: "HEX_DUMP\s*\n\s*HEX_DUMP" -> "HEX_DUMP"
2+
//@ normalize-stderr: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
3+
//@ normalize-stderr: "([0-9a-f][0-9a-f] |╾─*A(LLOC)?[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
4+
//@ normalize-stderr: "HEX_DUMP\s*\n\s*HEX_DUMP" -> "HEX_DUMP"
55

66
pub struct Wrapper;
77
pub static MAGIC_FFI_REF: &'static Wrapper = unsafe {

0 commit comments

Comments
 (0)