Merge pull request #2291 from rust-lang/rustc-pull

Rustc pull update
2025-04-07 12:37:32 +08:00 · 2025-04-07 12:37:32 +08:00 · 5f6d843eef
parent ff6719eac2 216eb512fb
commit 5f6d843eef
2 changed files with 4 additions and 1 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-ae9173d7dd4a31806c950c90dcc331f1508b4d17
+25a615bf829b9f6d6f22da537e3851043f92e5f2
--- a/src/tests/ui.md
+++ b/src/tests/ui.md
@ -335,6 +335,9 @@ But for strict testing, try to use the `ERROR` annotation as much as possible,
 including `//~?` annotations for diagnostics without span.
 For compile time diagnostics `error-pattern` should very rarely be necessary.

+Per-line annotations (`//~`) are still checked in tests using `error-pattern`,
+to opt out of these checks in exceptional cases use `//@ compile-flags: --error-format=human`.
+
 ### Error levels

 The error levels that you can have are: