Skip to content

Commit 9aaa0c5

Browse files
ZalatharZalathar
committed
Always use a colon in //@ normalize-*: headers
1 parent 3ad5f45 commit 9aaa0c5

File tree

132 files changed

+228
-228
lines changed

Some content is hidden

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

132 files changed

+228
-228
lines changed

‎tests/rustdoc-ui/doctest/block-doc-comment.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ check-pass
22
//@ compile-flags:--test
3-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
3+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
44

55
// This test ensures that no code block is detected in the doc comments.
66

‎tests/rustdoc-ui/doctest/cfg-test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ check-pass
22
//@ compile-flags:--test --test-args --test-threads=1
33
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
4-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
4+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
55

66
// Crates like core have doctests gated on `cfg(not(test))` so we need to make
77
// sure `cfg(test)` is not active when running `rustdoc --test`.

‎tests/rustdoc-ui/doctest/check-cfg-test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//@ compile-flags: --test --nocapture --check-cfg=cfg(feature,values("test")) -Z unstable-options
33
//@ normalize-stderr-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
44
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
5-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
5+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
66

77
/// The doctest will produce a warning because feature invalid is unexpected
88
/// ```

‎tests/rustdoc-ui/doctest/display-output.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//@ edition:2018
55
//@ compile-flags:--test --test-args=--show-output
66
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
7-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
7+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
88

99
/// ```
1010
/// #![warn(unused)]

‎tests/rustdoc-ui/doctest/doc-comment-multi-line-attr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Regression test for #97440: Multiline inner attribute triggers ICE during doctest
22
//@ compile-flags:--test
33
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
4-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
4+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
55
//@ check-pass
66

77
//! ```rust

‎tests/rustdoc-ui/doctest/doc-comment-multi-line-cfg-attr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ compile-flags:--test
22
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
3-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
3+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
44
//@ check-pass
55

66
/// ```

‎tests/rustdoc-ui/doctest/doc-test-doctest-feature.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ check-pass
22
//@ compile-flags:--test
33
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
4-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
4+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
55

66
// Make sure `cfg(doctest)` is set when finding doctests but not inside
77
// the doctests.

‎tests/rustdoc-ui/doctest/doc-test-rustdoc-feature.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ check-pass
22
//@ compile-flags:--test
33
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
4-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
4+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
55

66
#![feature(doc_cfg)]
77

‎tests/rustdoc-ui/doctest/doctest-multiline-crate-attribute.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ compile-flags:--test --test-args=--test-threads=1
22
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
3-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
3+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
44
//@ check-pass
55

66
/// ```

‎tests/rustdoc-ui/doctest/doctest-output.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//@ aux-build:extern_macros.rs
33
//@ compile-flags:--test --test-args=--test-threads=1
44
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
5-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
5+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
66
//@ check-pass
77

88
//! ```

‎tests/rustdoc-ui/doctest/failed-doctest-compile-fail.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
//@ compile-flags:--test
55
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
6-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
6+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
77
//@ failure-status: 101
88

99
/// ```compile_fail

‎tests/rustdoc-ui/doctest/failed-doctest-extra-semicolon-on-item.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
//@ compile-flags:--test
55
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
6-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
6+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
77
//@ failure-status: 101
88

99
/// <https://github.com/rust-lang/rust/issues/91014>

‎tests/rustdoc-ui/doctest/failed-doctest-missing-codes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
//@ compile-flags:--test
55
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
6-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
6+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
77
//@ failure-status: 101
88

99
/// ```compile_fail,E0004

‎tests/rustdoc-ui/doctest/failed-doctest-output-windows.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//@ compile-flags:--test --test-args --test-threads=1
99
//@ rustc-env:RUST_BACKTRACE=0
1010
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
11-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
11+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
1212
//@ failure-status: 101
1313

1414
// doctest fails at runtime

‎tests/rustdoc-ui/doctest/failed-doctest-output.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//@ compile-flags:--test --test-args --test-threads=1
99
//@ rustc-env:RUST_BACKTRACE=0
1010
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
11-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
11+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
1212
//@ failure-status: 101
1313

1414
// doctest fails at runtime

‎tests/rustdoc-ui/doctest/failed-doctest-should-panic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
//@ compile-flags:--test
55
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
6-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
6+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
77
//@ failure-status: 101
88

99
/// ```should_panic

‎tests/rustdoc-ui/doctest/no-run-flag.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//@ check-pass
44
//@ compile-flags:-Z unstable-options --test --no-run --test-args=--test-threads=1
55
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
6-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
6+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
77

88
/// ```
99
/// let a = true;

‎tests/rustdoc-ui/doctest/nocapture-fail.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//@ compile-flags:--test -Zunstable-options --nocapture
33
//@ normalize-stderr-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
44
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
5-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
5+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
66

77
/// ```compile_fail
88
/// fn foo() {

‎tests/rustdoc-ui/doctest/nocapture.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ check-pass
22
//@ compile-flags:--test -Zunstable-options --nocapture
33
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
4-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
4+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
55

66
/// ```
77
/// println!("hello!");

‎tests/rustdoc-ui/doctest/non-local-defs-impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//@ aux-build:pub_trait.rs
55
//@ compile-flags: --test --test-args --test-threads=1
66
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
7-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
7+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
88

99
#![doc(test(attr(deny(non_local_definitions))))]
1010
#![doc(test(attr(allow(dead_code))))]

‎tests/rustdoc-ui/doctest/non_local_defs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//@ compile-flags:--test --test-args --test-threads=1 --nocapture -Zunstable-options
33
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
44
//@ normalize-stderr-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
5-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
5+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
66

77
#![doc(test(attr(warn(non_local_definitions))))]
88

‎tests/rustdoc-ui/doctest/run-directory.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//@ [correct]compile-flags:--test --test-run-directory={{src-base}}
66
//@ [incorrect]compile-flags:--test --test-run-directory={{src-base}}/coverage
77
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
8-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
8+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
99

1010
/// ```
1111
/// assert_eq!(

‎tests/rustdoc-ui/doctest/test-no_std.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ compile-flags:--test
22
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
3-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
3+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
44
//@ check-pass
55

66
#![no_std]

‎tests/rustdoc-ui/doctest/test-type.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ compile-flags: --test --test-args=--test-threads=1
22
//@ check-pass
33
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
4-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
4+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
55

66
/// ```
77
/// let a = true;

‎tests/rustdoc-ui/doctest/unparseable-doc-test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ compile-flags: --test
22
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
3-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
3+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
44
//@ failure-status: 101
55
//@ rustc-env: RUST_BACKTRACE=0
66

‎tests/rustdoc-ui/ice-bug-report-url.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
//@ error-pattern: aborting due to
55
//@ error-pattern: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-rustdoc&template=ice.md
66

7-
//@ normalize-stderr-test "note: compiler flags.*\n\n" -> ""
8-
//@ normalize-stderr-test "note: rustc.*running on.*" -> "note: rustc {version} running on {platform}"
9-
//@ normalize-stderr-test "thread.*panicked at compiler.*" -> ""
10-
//@ normalize-stderr-test " +\d{1,}: .*\n" -> ""
11-
//@ normalize-stderr-test " + at .*\n" -> ""
12-
//@ normalize-stderr-test ".*note: Some details are omitted.*\n" -> ""
7+
//@ normalize-stderr-test: "note: compiler flags.*\n\n" -> ""
8+
//@ normalize-stderr-test: "note: rustc.*running on.*" -> "note: rustc {version} running on {platform}"
9+
//@ normalize-stderr-test: "thread.*panicked at compiler.*" -> ""
10+
//@ normalize-stderr-test: " +\d{1,}: .*\n" -> ""
11+
//@ normalize-stderr-test: " + at .*\n" -> ""
12+
//@ normalize-stderr-test: ".*note: Some details are omitted.*\n" -> ""
1313

1414
fn wrong()
1515
//~^ ERROR expected one of

‎tests/rustdoc-ui/issues/issue-80992.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ check-pass
22
//@ compile-flags:--test
33
//@ normalize-stdout-test: "tests/rustdoc-ui/issues" -> "$$DIR"
4-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
4+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
55

66
pub fn test() -> Result<(), ()> {
77
//! ```compile_fail

‎tests/rustdoc-ui/issues/issue-81662-shortness.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//@ check-stdout
33
//@ error-pattern:cannot find function `foo` in this scope
44
//@ normalize-stdout-test: "tests/rustdoc-ui/issues" -> "$$DIR"
5-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
5+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
66
//@ failure-status: 101
77

88
/// ```rust

‎tests/rustdoc-ui/issues/issue-91134.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//@ aux-build:empty-fn.rs
33
//@ check-pass
44
//@ normalize-stdout-test: "tests/rustdoc-ui/issues" -> "$$DIR"
5-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
5+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
66
//@ edition:2021
77

88
/// <https://github.com/rust-lang/rust/issues/91134>

‎tests/rustdoc-ui/remap-path-prefix-failed-doctest-output.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
//@ failure-status: 101
55
//@ compile-flags:--test -Z unstable-options --remap-path-prefix={{src-base}}=remapped_path --test-args --test-threads=1
66
//@ rustc-env:RUST_BACKTRACE=0
7-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
8-
//@ normalize-stdout-test "exit (status|code): 101" -> "exit status: 101"
7+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
8+
//@ normalize-stdout-test: "exit (status|code): 101" -> "exit status: 101"
99

1010
// doctest fails at runtime
1111
/// ```

‎tests/rustdoc-ui/remap-path-prefix-invalid-doctest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//@ failure-status: 101
55
//@ compile-flags:--test -Z unstable-options --remap-path-prefix={{src-base}}=remapped_path --test-args --test-threads=1
66
//@ rustc-env:RUST_BACKTRACE=0
7-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
7+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
88

99
// doctest fails to compile
1010
/// ```

‎tests/rustdoc-ui/remap-path-prefix-passed-doctest-output.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// adapted to use that, and that normalize line can go away
66

77
//@ compile-flags:--test -Z unstable-options --remap-path-prefix={{src-base}}=remapped_path --test-args --test-threads=1
8-
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
8+
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
99

1010
// doctest passes at runtime
1111
/// ```

‎tests/rustdoc-ui/track-diagnostics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// Normalize the emitted location so this doesn't need
55
// updating everytime someone adds or removes a line.
6-
//@ normalize-stderr-test ".rs:\d+:\d+" -> ".rs:LL:CC"
6+
//@ normalize-stderr-test: ".rs:\d+:\d+" -> ".rs:LL:CC"
77

88
struct A;
99
struct B;

‎tests/ui-fulldeps/fluent-messages/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ normalize-stderr-test "could not open Fluent resource:.*" -> "could not open Fluent resource: os-specific message"
1+
//@ normalize-stderr-test: "could not open Fluent resource:.*" -> "could not open Fluent resource: os-specific message"
22

33
#![feature(rustc_private)]
44
#![crate_type = "lib"]

‎tests/ui-fulldeps/missing-rustc-driver-error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Test that we get the following hint when trying to use a compiler crate without rustc_driver.
22
//@ error-pattern: try adding `extern crate rustc_driver;` at the top level of this crate
33
//@ compile-flags: --emit link
4-
//@ normalize-stderr-test ".*crate .* required.*\n\n" -> ""
4+
//@ normalize-stderr-test: ".*crate .* required.*\n\n" -> ""
55
//@ normalize-stderr-test: "aborting due to [0-9]+" -> "aborting due to NUMBER"
66

77
#![feature(rustc_private)]

‎tests/ui-fulldeps/session-diagnostic/diagnostic-derive-doc-comment-field.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ check-fail
22
// Tests that a doc comment will not preclude a field from being considered a diagnostic argument
3-
//@ normalize-stderr-test "the following other types implement trait `IntoDiagArg`:(?:.*\n){0,9}\s+and \d+ others" -> "normalized in stderr"
4-
//@ normalize-stderr-test "(COMPILER_DIR/.*\.rs):[0-9]+:[0-9]+" -> "$1:LL:CC"
3+
//@ normalize-stderr-test: "the following other types implement trait `IntoDiagArg`:(?:.*\n){0,9}\s+and \d+ others" -> "normalized in stderr"
4+
//@ normalize-stderr-test: "(COMPILER_DIR/.*\.rs):[0-9]+:[0-9]+" -> "$1:LL:CC"
55

66
// The proc_macro2 crate handles spans differently when on beta/stable release rather than nightly,
77
// changing the output of this test. Since Subdiagnostic is strictly internal to the compiler

‎tests/ui-fulldeps/session-diagnostic/diagnostic-derive.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ check-fail
22
// Tests error conditions for specifying diagnostics using #[derive(Diagnostic)]
3-
//@ normalize-stderr-test "the following other types implement trait `IntoDiagArg`:(?:.*\n){0,9}\s+and \d+ others" -> "normalized in stderr"
4-
//@ normalize-stderr-test "(COMPILER_DIR/.*\.rs):[0-9]+:[0-9]+" -> "$1:LL:CC"
3+
//@ normalize-stderr-test: "the following other types implement trait `IntoDiagArg`:(?:.*\n){0,9}\s+and \d+ others" -> "normalized in stderr"
4+
//@ normalize-stderr-test: "(COMPILER_DIR/.*\.rs):[0-9]+:[0-9]+" -> "$1:LL:CC"
55

66
// The proc_macro2 crate handles spans differently when on beta/stable release rather than nightly,
77
// changing the output of this test. Since Diagnostic is strictly internal to the compiler

‎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-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/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-test: "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-test: "DefId\(.+?\)" -> "DefId(..)"
22
#![feature(rustc_attrs)]
33

44
fn bar() {

‎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-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

+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-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,

0 commit comments

Comments
 (0)