diff options
| author | Tshepang Mbambo <tshepang@gmail.com> | 2025-05-01 07:01:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-01 07:01:46 +0200 |
| commit | bf06eaf7a2e8ad08c23a3d8da1255cdcc4174c55 (patch) | |
| tree | a974f5bc634539b226397f38dd8f69c35fbee719 /src/doc/rustc-dev-guide | |
| parent | 9ce6c52c707b8d0dba9c0d5c4828cc9443dd8f4c (diff) | |
| parent | 560de7e51225559aa329d296f5ff0e9f95cbdf48 (diff) | |
| download | rust-bf06eaf7a2e8ad08c23a3d8da1255cdcc4174c55.tar.gz rust-bf06eaf7a2e8ad08c23a3d8da1255cdcc4174c55.zip | |
Merge pull request #2367 from rust-lang/rustc-pull
Rustc pull update
Diffstat (limited to 'src/doc/rustc-dev-guide')
| -rw-r--r-- | src/doc/rustc-dev-guide/rust-version | 2 | ||||
| -rw-r--r-- | src/doc/rustc-dev-guide/src/tests/ui.md | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/doc/rustc-dev-guide/rust-version b/src/doc/rustc-dev-guide/rust-version index 67fa25f2228..66b4fe2bf3b 100644 --- a/src/doc/rustc-dev-guide/rust-version +++ b/src/doc/rustc-dev-guide/rust-version @@ -1 +1 @@ -deb947971c8748f5c6203548ce4af9022f21eaf0 +0c33fe2c3d3eecadd17a84b110bb067288a64f1c 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 |