diff options
| author | Zalathar <Zalathar@users.noreply.github.com> | 2024-12-25 22:12:17 +1100 |
|---|---|---|
| committer | Zalathar <Zalathar@users.noreply.github.com> | 2024-12-27 19:58:16 +1100 |
| commit | 835fbcbcab82ce728a7233de6c32a2d206e3336c (patch) | |
| tree | e06ec1d1eff7f79075b4ee3fdce920c8c5e01658 /src | |
| parent | 5ba0dd4ef669ca7512031f1f7ee2ae19f1fd099b (diff) | |
| download | rust-835fbcbcab82ce728a7233de6c32a2d206e3336c.tar.gz rust-835fbcbcab82ce728a7233de6c32a2d206e3336c.zip | |
Remove the `-test` suffix from normalize directives
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/compiletest/src/directive-list.rs | 4 | ||||
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 4 | ||||
| -rw-r--r-- | src/tools/tidy/src/style.rs | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/tools/compiletest/src/directive-list.rs b/src/tools/compiletest/src/directive-list.rs index 5638d471890..01068af3e8c 100644 --- a/src/tools/compiletest/src/directive-list.rs +++ b/src/tools/compiletest/src/directive-list.rs @@ -160,10 +160,10 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[ "needs-xray", "no-auto-check-cfg", "no-prefer-dynamic", + "normalize-stderr", "normalize-stderr-32bit", "normalize-stderr-64bit", - "normalize-stderr-test", - "normalize-stdout-test", + "normalize-stdout", "only-16bit", "only-32bit", "only-64bit", diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index f2a944e78cc..67ecdaf9e5e 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -984,8 +984,8 @@ impl Config { let (directive_name, _value) = line.split_once(':')?; let kind = match directive_name { - "normalize-stdout-test" => NormalizeKind::Stdout, - "normalize-stderr-test" => NormalizeKind::Stderr, + "normalize-stdout" => NormalizeKind::Stdout, + "normalize-stderr" => NormalizeKind::Stderr, "normalize-stderr-32bit" => NormalizeKind::Stderr32bit, "normalize-stderr-64bit" => NormalizeKind::Stderr64bit, _ => return None, diff --git a/src/tools/tidy/src/style.rs b/src/tools/tidy/src/style.rs index 35cda17e168..aefcd2bb0cc 100644 --- a/src/tools/tidy/src/style.rs +++ b/src/tools/tidy/src/style.rs @@ -69,8 +69,7 @@ const ANNOTATIONS_TO_IGNORE: &[&str] = &[ "// gdb", "// lldb", "// cdb", - "// normalize-stderr-test", - "//@ normalize-stderr-test", + "//@ normalize-stderr", ]; fn generate_problems<'a>( @@ -198,8 +197,8 @@ fn should_ignore(line: &str) -> bool { // For `ui_test`-style UI test directives, also ignore // - `//@[rev] compile-flags` - // - `//@[rev] normalize-stderr-test` - || static_regex!("\\s*//@(\\[.*\\]) (compile-flags|normalize-stderr-test|error-pattern).*") + // - `//@[rev] normalize-stderr` + || static_regex!("\\s*//@(\\[.*\\]) (compile-flags|normalize-stderr|error-pattern).*") .is_match(line) // Matching for rustdoc tests commands. // It allows to prevent them emitting warnings like `line longer than 100 chars`. |