Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
b824d36
Merge ref 'ffb9d94dcf4a' from rust-lang/rust
invalid-email-address Aug 9, 2025
3651fab
Merge ref 'd36f96412516' from rust-lang/rust
invalid-email-address Aug 28, 2025
5152f9a
Merge ref '9385c64c95d9' from rust-lang/rust
invalid-email-address Sep 4, 2025
66bedb7
Merge ref 'caccb4d0368b' from rust-lang/rust
invalid-email-address Sep 25, 2025
f649b14
Merge ref '47cd7120d9b4' from rust-lang/rust
invalid-email-address Dec 2, 2025
cb850bd
Merge ref '2dc30247c5d8' from rust-lang/rust
invalid-email-address Dec 17, 2025
df464e1
Merge ref '23d01cd24125' from rust-lang/rust
invalid-email-address Dec 28, 2025
ebb1290
Auto merge of #151764 - weihanglo:update-cargo, r=weihanglo
bors Jan 31, 2026
398f33c
Merge ref '44e34e1ac6d7' from rust-lang/rust
invalid-email-address Jan 31, 2026
e4f1992
Auto merge of #151881 - Zoxc:index_to_node_ptr, r=eholk
bors Jan 31, 2026
10275a5
Auto merge of #151622 - scottmcm:elide-more-transmutes, r=cjgillot
bors Jan 31, 2026
8d0f3e3
Auto merge of #151543 - GuillaumeGomez:more-proc-macro-literal-method…
bors Feb 1, 2026
705dbfd
Auto merge of #138405 - Zoxc:vec-cache-tweaks, r=Mark-Simulacrum
bors Feb 1, 2026
224f526
Auto merge of #150428 - kouhe3:win-af-unix-2, r=Mark-Simulacrum
bors Feb 1, 2026
8210f8e
Rollup merge of #151378 - ferrocene:add-cortexr82-testing, r=jdonszel…
jhpratt Feb 3, 2026
89723fc
Rollup merge of #151958 - chahar-ritik:add-slp-vectorization-test, r=…
jhpratt Feb 3, 2026
74e4c0e
Rollup merge of #152022 - tshepang:rdg-sync, r=tshepang
jhpratt Feb 3, 2026
57d5864
Auto merge of #152025 - jhpratt:rollup-Kxb6k3Y, r=jhpratt
bors Feb 3, 2026
95809aa
Auto merge of #151853 - Zalathar:feed-vtable, r=oli-obk
bors Feb 3, 2026
d4b2797
Auto merge of #151929 - camsteffen:lengg, r=BoxyUwU
bors Feb 3, 2026
b180c20
Auto merge of #151546 - Zoxc:feedable-macro-fix, r=Zalathar
bors Feb 4, 2026
6e0ecff
Auto merge of #150605 - RalfJung:fallback-intrinsic-skip, r=mati865
bors Feb 4, 2026
3cee5c8
Hard code the error code registry for custom drivers
bjorn3 Feb 4, 2026
bf3e3de
Merge ref 'db3e99bbab28' from rust-lang/rust
invalid-email-address Feb 5, 2026
817dcce
Rollup merge of #149329 - Jarcho:for_question_ctxt, r=davidtwco
JonathanBrouwer Feb 6, 2026
5d1ae59
Rollup merge of #151474 - nnethercote:circ-deps, r=davidtwco
JonathanBrouwer Feb 6, 2026
57633b2
Rollup merge of #152140 - bjorn3:driver_fixed_error_codes, r=jdonszel…
JonathanBrouwer Feb 6, 2026
42c945a
Rollup merge of #152155 - wolfv:patch-1, r=wesleywiser
JonathanBrouwer Feb 6, 2026
76c4dea
Rollup merge of #152170 - jdonszelmann:port-rustc-effective-visibilit…
JonathanBrouwer Feb 6, 2026
a7feb6f
Rollup merge of #152182 - apiraino:update-compiler-stable-backport-zu…
JonathanBrouwer Feb 6, 2026
4583a97
Rollup merge of #152184 - Ozzy1423:attrs3, r=jdonszelmann
JonathanBrouwer Feb 6, 2026
2d8f427
Rollup merge of #152195 - ZuseZ4:update-offload-llvm22-A, r=jieyouxu
JonathanBrouwer Feb 6, 2026
3a3ee8c
Rollup merge of #152202 - nyurik:better-msg, r=jieyouxu
JonathanBrouwer Feb 6, 2026
63cc785
Auto merge of #152213 - JonathanBrouwer:rollup-trjCgZZ, r=JonathanBro…
bors Feb 6, 2026
f862a61
Auto merge of #152183 - alexcrichton:update-wasi-sdk, r=jieyouxu
bors Feb 6, 2026
756425f
Auto merge of #150485 - dianqk:gvn-ssa-borrow, r=cjgillot
bors Feb 8, 2026
9d2a8c3
Remove SubdiagMessage in favour of the identical DiagMessage
JonathanBrouwer Feb 10, 2026
a40243d
Rollup merge of #151954 - Muhtasim-Rasheed:issue-109829-help-message,…
JonathanBrouwer Feb 10, 2026
84a468c
Rollup merge of #152226 - fmease:modernize-indeterminate-object-lifet…
JonathanBrouwer Feb 10, 2026
b30abb5
Rollup merge of #152351 - JonathanBrouwer:remove_subdiag, r=nnethercote
JonathanBrouwer Feb 10, 2026
ad6f6b0
Rollup merge of #152417 - Zalathar:arena-alloc, r=nnethercote
JonathanBrouwer Feb 10, 2026
3849e35
Rollup merge of #150688 - Zalathar:check-pat-lit, r=petrochenkov
JonathanBrouwer Feb 10, 2026
3f75e7e
Rollup merge of #152293 - ia0:try_blocks_heterogeneous, r=ytmimi
JonathanBrouwer Feb 10, 2026
18121df
Rollup merge of #152355 - JonathanBrouwer:update-macro-doc, r=nnether…
JonathanBrouwer Feb 10, 2026
711a547
Rollup merge of #152396 - ShoyuVanilla:uplift-allow-normalize, r=lcnr
JonathanBrouwer Feb 10, 2026
e57f119
Auto merge of #152437 - JonathanBrouwer:rollup-bWpnWOz, r=JonathanBro…
bors Feb 10, 2026
ca5e141
Auto merge of #151509 - Zoxc:gen-color-race, r=zetanumbers,petrochenkov
bors Feb 10, 2026
3ba1d11
Auto merge of #151943 - Zalathar:cache-on-disk, r=TaKO8Ki
bors Feb 10, 2026
0697647
Auto merge of #152420 - tgross35:update-builtins, r=tgross35
bors Feb 11, 2026
dbea7ea
Auto merge of #152240 - weihanglo:update-cargo, r=weihanglo
bors Feb 11, 2026
7593da7
Auto merge of #152428 - nikic:llvm-22-rc3, r=dianqk
bors Feb 11, 2026
c8db3e5
Rollup merge of #152281 - JohnTitor:sugg-mut-deref-borrows, r=estebank
Urgau Feb 11, 2026
f1b686f
Rollup merge of #151142 - SpriteOvO:type-info-adt, r=oli-obk
Urgau Feb 11, 2026
4a8b360
Rollup merge of #152477 - tshepang:rdg-sync, r=tshepang
Urgau Feb 11, 2026
c30c27e
Rollup merge of #152488 - cyrgani:deprecation-staged-api, r=JonathanB…
Urgau Feb 11, 2026
87c3138
Rollup merge of #152491 - JonathanBrouwer:remove-fluent-from-tidy, r=…
Urgau Feb 11, 2026
d592fa4
Auto merge of #152506 - Urgau:rollup-MlGAszj, r=Urgau
bors Feb 12, 2026
c203b47
Rollup merge of #142415 - xizheyin:141679, r=estebank
jhpratt Feb 12, 2026
3197dff
Rollup merge of #142680 - beetrees:sparc64-float-struct-abi, r=tgross35
jhpratt Feb 12, 2026
e842c14
Rollup merge of #150768 - bjorn3:llvm_intrinsic_no_fn_abi, r=wesleywiser
jhpratt Feb 12, 2026
1f599d1
Rollup merge of #151814 - lcnr:silent-layout-error, r=jackh726
jhpratt Feb 12, 2026
a12ebb0
Rollup merge of #151863 - amandasystems:streamline-borrow-error-handl…
jhpratt Feb 12, 2026
f3a7af0
Rollup merge of #152159 - JohnTitor:issue-74756, r=estebank
jhpratt Feb 12, 2026
94c2381
Rollup merge of #152316 - cuiweixie:bugfix-continue, r=petrochenkov
jhpratt Feb 12, 2026
827c7f6
Rollup merge of #152394 - GuillaumeGomez:macro-call, r=lolbinarycat
jhpratt Feb 12, 2026
7427a3d
Rollup merge of #152485 - ban-xiu:fix-issue-152482, r=jieyouxu
jhpratt Feb 12, 2026
1614dfc
Auto merge of #152517 - jhpratt:rollup-fGRcId6, r=jhpratt
bors Feb 12, 2026
4003ba3
Auto merge of #148537 - oli-obk:push-yxuttqrqqyvu, r=dianqk
bors Feb 12, 2026
886a6db
Auto merge of #150681 - meithecatte:always-discriminate, r=JonathanBr…
bors Feb 14, 2026
891335c
Auto merge of #151380 - ShoyuVanilla:shallow-resolve-to-root-var, r=lcnr
bors Feb 15, 2026
30addec
Auto merge of #152375 - Zoxc:rayon-scope-loops, r=jieyouxu,lqd
bors Feb 15, 2026
47dcaf9
Prepare for merging from rust-lang/rust
invalid-email-address Feb 16, 2026
e33795a
Merge ref '139651428df8' from rust-lang/rust
invalid-email-address Feb 16, 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 @@
44e34e1ac6d7e69b40856cf1403d3da145319c30
139651428df86cf88443295542c12ea617cbb587
12 changes: 2 additions & 10 deletions src/diagnostics/translation.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,7 @@ translation.
### Messages

All of rustc's traditional diagnostic APIs (e.g. `struct_span_err` or `note`)
take any message that can be converted into a `DiagMessage` (or
`SubdiagMessage`).
take any message that can be converted into a `DiagMessage`.

[`rustc_error_messages::DiagMessage`] can represent legacy non-translatable
diagnostic messages and translatable messages. Non-translatable messages are
Expand All @@ -138,14 +137,7 @@ with an attribute).
Fluent resource (described in more detail below), or `DiagMessage`s will
either be created in the macro-generated code of a diagnostic derive.

`rustc_error_messages::SubdiagMessage` is similar, it can correspond to a
legacy non-translatable diagnostic message or the name of an attribute to a
Fluent message. Translatable `SubdiagMessage`s must be combined with a
`DiagMessage` (using `DiagMessage::with_subdiagnostic_message`) to
be emitted (an attribute name on its own is meaningless without a corresponding
message identifier, which is what `DiagMessage` provides).

Both `DiagMessage` and `SubdiagMessage` implement `Into` for any
`DiagMessage` implements `Into` for any
type that can be converted into a string, and converts these into
non-translatable diagnostics - this keeps all existing diagnostic calls
working.
Expand Down
Loading