about summary refs log tree commit diff
path: root/src/doc/rustc-dev-guide
diff options
context:
space:
mode:
authorThe rustc-dev-guide Cronjob Bot <github-actions@github.com>2025-05-01 04:05:49 +0000
committerThe rustc-dev-guide Cronjob Bot <github-actions@github.com>2025-05-01 04:05:49 +0000
commit560de7e51225559aa329d296f5ff0e9f95cbdf48 (patch)
treee0389ca43c9774070bd6259df2f482f863e6a243 /src/doc/rustc-dev-guide
parent27eb27423382738ae8f6d3d40a96396c7c541a37 (diff)
parent0c33fe2c3d3eecadd17a84b110bb067288a64f1c (diff)
downloadrust-560de7e51225559aa329d296f5ff0e9f95cbdf48.tar.gz
rust-560de7e51225559aa329d296f5ff0e9f95cbdf48.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