Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
2bf18a6
Merge ref '7fb284d9037f' from rust-lang/rust
invalid-email-address Jun 29, 2026
2232521
Merge ref 'f73951df0a55' from rust-lang/rust
invalid-email-address Aug 6, 2026
85470ae
Merge ref '2c39ff499469' from rust-lang/rust
invalid-email-address Aug 17, 2026
2b295da
Merge ref '2c39ff499469' from rust-lang/rust
tgross35 Aug 17, 2026
2d37589
Merge pull request #23164 from rust-lang/rustc-pull
lnicola Aug 17, 2026
c3058bb
Merge pull request #23166 from lnicola/download-faster
lnicola Aug 17, 2026
a41a250
Merge pull request #23168 from lnicola/rm-zig
lnicola Aug 17, 2026
0172e04
Merge pull request #23147 from kivancgnlp/e0600-unary-op-not-defined
ChayimFriedman2 Aug 17, 2026
713dec3
Merge pull request #23171 from A4-Tacks/skip-iter-no-intoiter
A4-Tacks Aug 18, 2026
c79fd4b
Merge pull request #23186 from MannXo/fix/23143-asm-label-diverges
ChayimFriedman2 Aug 19, 2026
cb80659
Merge ref 'f7d782a3be46' from rust-lang/rust
invalid-email-address Aug 20, 2026
4bb7fe9
Merge ref 'f7d782a3be46' from rust-lang/rust
invalid-email-address Aug 20, 2026
36da84f
Merge pull request #23198 from rust-lang/rustc-pull
lnicola Aug 20, 2026
5a5f089
Merge pull request #23205 from ChayimFriedman2/fix-clippy
ChayimFriedman2 Aug 20, 2026
62aeb25
Merge pull request #23079 from ChayimFriedman2/optimize-tts
ChayimFriedman2 Aug 21, 2026
f004aef
Merge pull request #23201 from YUZHEthefool/fix/recursive-layout-stac…
ChayimFriedman2 Aug 21, 2026
3b96948
Merge pull request #23184 from ChayimFriedman2/raw-ref-deref-twice
ShoyuVanilla Aug 26, 2026
fe59014
Merge pull request #23162 from ChayimFriedman2/trait-fn-param
ShoyuVanilla Aug 26, 2026
0f18d31
Merge pull request #23176 from ChayimFriedman2/const-is-type-owner
ShoyuVanilla Aug 26, 2026
590c264
Auto merge of #160007 - Bryanskiy:load-injected, r=petrochenkov
bors Aug 26, 2026
797dd96
`BUILTIN_ATTRIBUTE_MAP` improvements
nnethercote Aug 31, 2026
d32f518
remove `_{style}` recovery for diagnostic structs
mejrs Aug 31, 2026
a12a7f3
Merge ref '45f215f136e0' from rust-lang/rust
folkertdev Aug 31, 2026
f3657bd
Auto merge of #162045 - lnicola:sync-from-ra, r=lnicola
bors Aug 31, 2026
43e782d
Rollup merge of #160551 - Zalathar:inter-pat, r=Nadrieril
JonathanBrouwer Sep 1, 2026
8b35178
Rollup merge of #161353 - aerooneqq:static-muts-repr-build-test, r=pe…
JonathanBrouwer Sep 1, 2026
0e0e54c
Rollup merge of #162051 - nnethercote:rustc_feature-cleanups, r=Jonat…
JonathanBrouwer Sep 1, 2026
33f0e34
Rollup merge of #162055 - mejrs:_style, r=JonathanBrouwer
JonathanBrouwer Sep 1, 2026
60d8d15
Rollup merge of #162075 - mejrs:track_caller_closure_gating, r=Jonath…
JonathanBrouwer Sep 1, 2026
44bb110
Rollup merge of #162079 - stlankes:sync, r=joboet
JonathanBrouwer Sep 1, 2026
ef60633
Rollup merge of #162097 - mejrs:instrumentfnattr, r=JonathanBrouwer
JonathanBrouwer Sep 1, 2026
a61f48f
Rollup merge of #162115 - BenjaminBrienen:typos, r=JonathanBrouwer
JonathanBrouwer Sep 1, 2026
5d0d292
Auto merge of #162117 - JonathanBrouwer:rollup-vMnIfR5, r=JonathanBro…
bors Sep 1, 2026
aa6e744
Auto merge of #162128 - clarfonthey:revert-drop-guard, r=clarfonthey
bors Sep 2, 2026
5566fa2
Auto merge of #162119 - tgross35:update-builtins, r=folkertdev
bors Sep 2, 2026
41044e3
Auto merge of #162133 - nikic:llvm-23.1.0, r=cuviper
bors Sep 2, 2026
fcf97db
Auto merge of #161290 - Kobzol:bootstrap-llvm-4, r=jieyouxu
bors Sep 3, 2026
1cf0a36
Auto merge of #161716 - notriddle:remake-bootstrap-doc-mergeable, r=K…
bors Sep 3, 2026
a592e12
Prepare for merging from rust-lang/rust
invalid-email-address Sep 4, 2026
a452e7b
Merge ref '71238e21fc55' from rust-lang/rust
invalid-email-address Sep 4, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
da5114692c9ebe46b869488c5f34f92eb10b98c1
71238e21fc55e73ab3aad8c9f79fed7a47a179e1
20 changes: 16 additions & 4 deletions src/diagnostics/diagnostic-structs.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ tcx.dcx().emit_err(FieldAlreadyDeclared {
- _Applied to struct or struct fields of type `Span`, `Option<()>`, `bool`, or `()`._
- Adds a warning subdiagnostic.
- Value is the warning's message.
- `#[suggestion{,_hidden,_short,_verbose}("message", code = "...", applicability = "...")]`
- `#[suggestion("message", code = "...", applicability = "...", style = "...")]`
(_Optional_)
- _Applied to `(Span, MachineApplicability)` or `Span` fields._
- Adds a suggestion subdiagnostic.
Expand All @@ -165,6 +165,9 @@ tcx.dcx().emit_err(FieldAlreadyDeclared {
- `applicability = "..."` (_Optional_)
- String which must be one of `machine-applicable`, `maybe-incorrect`,
`has-placeholders` or `unspecified`.
- `style = "..."` (_Optional_)
- Value is the style of the suggestion.
- String which must be one of `normal`, `short`, `hidden`, `verbose` or `tool-only`.
- `#[subdiagnostic]`
- _Applied to a type that implements `Subdiagnostic` (from `#[derive(Subdiagnostic)]`)._
- Adds the subdiagnostic represented by the subdiagnostic struct.
Expand Down Expand Up @@ -209,7 +212,7 @@ Each `Subdiagnostic` should have one attribute applied to the struct or each var
- `#[note(..)]` for defining a note
- `#[help(..)]` for defining a help
- `#[warning(..)]` for defining a warning
- `#[suggestion{,_hidden,_short,_verbose}(..)]` for defining a suggestion
- `#[suggestion(..)]` for defining a suggestion

All of the above must provide a diagnostic message as the first positional argument.
See [translation documentation](./translation.md) to learn more about how
Expand Down Expand Up @@ -305,7 +308,7 @@ Additionally, subdiagnostics can access arguments from the main diagnostic with
- Message (_Mandatory_)
- The diagnostic message that will be shown to the user.
- See [translation documentation](./translation.md).
- `#[suggestion{,_hidden,_short,_verbose}("message", code = "...", applicability = "...")]`
- `#[suggestion("message", code = "...", applicability = "...", style = "...")]`
- _Applied to struct or enum variant.
Mutually exclusive with struct/enum variant attributes._
- _Mandatory_
Expand All @@ -324,13 +327,22 @@ Additionally, subdiagnostics can access arguments from the main diagnostic with
- `maybe-incorrect`
- `has-placeholders`
- `unspecified`
- `#[multipart_suggestion{,_hidden,_short,_verbose}("message", applicability = "...")]`
- `style = "..."` (_Optional_)
- Value is the style of the suggestion.
- String which must be one of:
- `normal` (the default)
- `short`
- `hidden`
- `verbose`
- `tool-only`
- `#[multipart_suggestion("message", applicability = "...", style = "...")]`
- _Applied to struct or enum variant.
Mutually exclusive with struct/enum variant attributes._
- _Mandatory_
- Defines the type to be representing a multipart suggestion.
- Message (_Mandatory_): see `#[suggestion]`
- `applicability = "..."` (_Optional_): see `#[suggestion]`
- `style = "..."` (_Optional_): see `#[suggestion]`
- `#[primary_span]` (_Mandatory_ for labels and suggestions; _optional_ otherwise; not applicable
to multipart suggestions)
- _Applied to `Span` fields._
Expand Down
2 changes: 1 addition & 1 deletion src/feature-gate-check.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Beyond syntax, rustc also gates attributes and `cfg` options.

### Built-in attributes

- [`rustc_ast_passes::check_attribute`] inspects attributes against `BUILTIN_ATTRIBUTE_MAP`.
- [`rustc_ast_passes::check_attribute`] inspects attributes against `BUILTIN_ATTRIBUTE_SET`.
- If the attribute is `AttributeGate::Gated` and the feature isn’t enabled,
`feature_err` is emitted.

Expand Down
Loading