compiletest: Require `//~` annotations even if `error-pattern` is specified

8 files changed, 21 insertions, 18 deletions

diff --git a/tests/ui/parser/issues/circular-module-with-doc-comment-issue-97589/circular-module-with-doc-comment-issue-97589.rs b/tests/ui/parser/issues/circular-module-with-doc-comment-issue-97589/circular-module-with-doc-comment-issue-97589.rs
index ff28548b795..9c164813de2 100644
--- a/tests/ui/parser/issues/circular-module-with-doc-comment-issue-97589/circular-module-with-doc-comment-issue-97589.rs
+++ b/tests/ui/parser/issues/circular-module-with-doc-comment-issue-97589/circular-module-with-doc-comment-issue-97589.rs
@@ -1,6 +1,7 @@
-//@ error-pattern: circular modules
 // Regression test for #97589: a doc-comment on a circular module bypassed cycle detection
 
 #![crate_type = "lib"]
 
 pub mod recursive;
+
+//~? ERROR circular modules: $DIR/recursive.rs -> $DIR/recursive.rs
diff --git a/tests/ui/parser/issues/issue-21146.rs b/tests/ui/parser/issues/issue-21146.rs
index 81112808b21..95cae47939f 100644
--- a/tests/ui/parser/issues/issue-21146.rs
+++ b/tests/ui/parser/issues/issue-21146.rs
@@ -1,3 +1,4 @@
-//@ error-pattern: expected one of `!` or `::`, found `<eof>`
 include!("auxiliary/issue-21146-inc.rs");
 fn main() {}
+
+//~? ERROR expected one of `!` or `::`, found `<eof>`
diff --git a/tests/ui/parser/issues/issue-66473.rs b/tests/ui/parser/issues/issue-66473.rs
index baa00f95e12..d0786add1af 100644
--- a/tests/ui/parser/issues/issue-66473.rs
+++ b/tests/ui/parser/issues/issue-66473.rs
Binary files differdiff --git a/tests/ui/parser/issues/issue-66473.stderr b/tests/ui/parser/issues/issue-66473.stderr
index ba38c4fa1b7..65b2d5a34ee 100644
--- a/tests/ui/parser/issues/issue-66473.stderr
+++ b/tests/ui/parser/issues/issue-66473.stderr
@@ -1,11 +1,11 @@
 error: unknown start of token: \u{348}
-  --> $DIR/issue-66473.rs:4:2
+  --> $DIR/issue-66473.rs:1:2
    |
 LL | #͈␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀
    |  ^
 
 error: unknown start of token: \u{0}
-  --> $DIR/issue-66473.rs:4:3
+  --> $DIR/issue-66473.rs:1:3
    |
 LL | #͈␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀
    |  ^^^^^^^^^^^^^^^^^^
@@ -14,19 +14,19 @@ LL | #͈␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀
    = note: character appears 17 more times
 
 error: unknown start of token: \u{1d}
-  --> $DIR/issue-66473.rs:5:2
+  --> $DIR/issue-66473.rs:4:2
    |
 LL | ␋␝6␝␀␀
    |  ^
 
 error: unknown start of token: \u{1d}
-  --> $DIR/issue-66473.rs:5:4
+  --> $DIR/issue-66473.rs:4:4
    |
 LL | ␋␝6␝␀␀
    |    ^
 
 error: unknown start of token: \u{0}
-  --> $DIR/issue-66473.rs:5:5
+  --> $DIR/issue-66473.rs:4:5
    |
 LL | ␋␝6␝␀␀
    |     ^^
@@ -35,10 +35,11 @@ LL | ␋␝6␝␀␀
    = note: character appears once more
 
 error: expected one of `!` or `[`, found `6`
-  --> $DIR/issue-66473.rs:5:3
+  --> $DIR/issue-66473.rs:4:3
    |
 LL | #͈␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀␀
    |  - expected one of `!` or `[`
+...
 LL | ␋␝6␝␀␀
    |   ^ unexpected token
 
diff --git a/tests/ui/parser/issues/issue-68629.rs b/tests/ui/parser/issues/issue-68629.rs
index d353d1f56ce..d1ea4ca8b03 100644
--- a/tests/ui/parser/issues/issue-68629.rs
+++ b/tests/ui/parser/issues/issue-68629.rs
Binary files differdiff --git a/tests/ui/parser/issues/issue-68629.stderr b/tests/ui/parser/issues/issue-68629.stderr
index f003f378179..373ad142778 100644
--- a/tests/ui/parser/issues/issue-68629.stderr
+++ b/tests/ui/parser/issues/issue-68629.stderr
@@ -1,17 +1,17 @@
 error: unknown start of token: \u{1c}
-  --> $DIR/issue-68629.rs:4:1
+  --> $DIR/issue-68629.rs:6:1
    |
 LL | ␜␟ts␀![{i
    | ^
 
 error: unknown start of token: \u{1f}
-  --> $DIR/issue-68629.rs:4:2
+  --> $DIR/issue-68629.rs:6:2
    |
 LL | ␜␟ts␀![{i
    |  ^
 
 error: unknown start of token: \u{0}
-  --> $DIR/issue-68629.rs:4:5
+  --> $DIR/issue-68629.rs:6:5
    |
 LL | ␜␟ts␀![{i
    |     ^
@@ -19,7 +19,7 @@ LL | ␜␟ts␀![{i
    = help: source files must contain UTF-8 encoded text, unexpected null bytes might occur when a different encoding is used
 
 error: unknown start of token: \u{0}
-  --> $DIR/issue-68629.rs:5:1
+  --> $DIR/issue-68629.rs:7:1
    |
 LL | ␀␀  fn rݻoa>rݻm
    | ^^
@@ -28,7 +28,7 @@ LL | ␀␀  fn rݻoa>rݻm
    = note: character appears once more
 
 error: this file contains an unclosed delimiter
-  --> $DIR/issue-68629.rs:5:17
+  --> $DIR/issue-68629.rs:7:17
    |
 LL | ␜␟ts␀![{i
    |       -- unclosed delimiter
diff --git a/tests/ui/parser/issues/issue-68730.rs b/tests/ui/parser/issues/issue-68730.rs
index f7f11cbc98b..9cf51b720eb 100644
--- a/tests/ui/parser/issues/issue-68730.rs
+++ b/tests/ui/parser/issues/issue-68730.rs
Binary files differdiff --git a/tests/ui/parser/issues/issue-68730.stderr b/tests/ui/parser/issues/issue-68730.stderr
index 838a6569bdc..1e01e02bdb7 100644
--- a/tests/ui/parser/issues/issue-68730.stderr
+++ b/tests/ui/parser/issues/issue-68730.stderr
@@ -1,5 +1,5 @@
 error: unknown start of token: \u{0}
-  --> $DIR/issue-68730.rs:5:5
+  --> $DIR/issue-68730.rs:8:5
    |
 LL | enum␀em␀˂˂
    |     ^
@@ -7,7 +7,7 @@ LL | enum␀em␀˂˂
    = help: source files must contain UTF-8 encoded text, unexpected null bytes might occur when a different encoding is used
 
 error: unknown start of token: \u{0}
-  --> $DIR/issue-68730.rs:5:8
+  --> $DIR/issue-68730.rs:8:8
    |
 LL | enum␀em␀˂˂
    |        ^
@@ -15,7 +15,7 @@ LL | enum␀em␀˂˂
    = help: source files must contain UTF-8 encoded text, unexpected null bytes might occur when a different encoding is used
 
 error: unknown start of token: \u{2c2}
-  --> $DIR/issue-68730.rs:5:9
+  --> $DIR/issue-68730.rs:8:9
    |
 LL | enum␀em␀˂˂
    |         ^^
@@ -28,7 +28,7 @@ LL + enum␀em␀<<
    |
 
 error: unknown start of token: \u{2c2}
-  --> $DIR/issue-68730.rs:5:10
+  --> $DIR/issue-68730.rs:8:10
    |
 LL | enum␀em␀˂˂
    |          ^
@@ -40,7 +40,7 @@ LL + enum␀em␀˂<
    |
 
 error: expected one of `#`, `>`, `const`, identifier, or lifetime, found `<`
-  --> $DIR/issue-68730.rs:5:10
+  --> $DIR/issue-68730.rs:8:10
    |
 LL | enum␀em␀˂˂
    |          ^ expected one of `#`, `>`, `const`, identifier, or lifetime