about summary refs log tree commit diff
path: root/src/doc/rustc-dev-guide
diff options
context:
space:
mode:
authorThe Miri Cronjob Bot <miri@cron.bot>2025-05-01 05:01:02 +0000
committerThe Miri Cronjob Bot <miri@cron.bot>2025-05-01 05:01:02 +0000
commit326d77516d2c93fcbb0d2a83949f08c50059f148 (patch)
treeb822e3cb76d25b7c01e93431ed6f2796b23509ff /src/doc/rustc-dev-guide
parent589200ea5ed1d83d8680bc3db6dd6bc559a25539 (diff)
parent28deaa6e0e7993f963b3bb44bb235c7682ce0cf3 (diff)
downloadrust-326d77516d2c93fcbb0d2a83949f08c50059f148.tar.gz
rust-326d77516d2c93fcbb0d2a83949f08c50059f148.zip
Merge from rustc
Diffstat (limited to 'src/doc/rustc-dev-guide')
-rw-r--r--src/doc/rustc-dev-guide/src/tests/ui.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/rustc-dev-guide/src/tests/ui.md b/src/doc/rustc-dev-guide/src/tests/ui.md
index 6232c8bcc0a..b31c861c947 100644
--- a/src/doc/rustc-dev-guide/src/tests/ui.md
+++ b/src/doc/rustc-dev-guide/src/tests/ui.md
@@ -372,9 +372,9 @@ E.g. use `//@ dont-require-annotations: NOTE` to annotate notes selectively.
 Avoid using this directive for `ERROR`s and `WARN`ings, unless there's a serious reason, like
 target-dependent compiler output.
 
-Missing diagnostic kinds (`//~ message`) are currently accepted, but are being phased away.
-They will match any compiler output kind, but will not force exhaustive annotations for that kind.
-Prefer explicit kind and `//@ dont-require-annotations` to achieve the same effect.
+Some diagnostics are never required to be line-annotated, regardless of their kind or directives,
+for example secondary lines of multiline diagnostics,
+or ubiquitous diagnostics like `aborting due to N previous errors`.
 
 UI tests use the `-A unused` flag by default to ignore all unused warnings, as
 unused warnings are usually not the focus of a test. However, simple code