Skip to content

Commit aaa9d58

Browse files
authored
Unrolled build for rust-lang#124414
Rollup merge of rust-lang#124414 - lqd:subdiagnostics, r=davidtwco remove extraneous note on `UnableToRunDsymutil` diagnostic If I understand [this FIXME](https://github.com/rust-lang/rust/blob/1367827eac3d813a261a4c444037af9736996daa/compiler/rustc_macros/src/diagnostics/diagnostic.rs#L205) correctly, it seems we don't yet validate subdiagnostics, so `#[note]` and co in the `#[derive(Diagnostic]` item could be out-of-sync with the fluent message, without causing compile errors. It was the case for `rustc_codegen_ssa::errors::UnableToRunDsymutil`, causing the ICE in rust-lang#124392. I've grepped and scripted my way through most of our diagnostics structs and fluent bundles and the above was the only such extraneous `#[note]`/`#[note(name)]`/`#[help]`/`#[warning]` I could find, so hopefully there aren't many others like it. I haven't checked if the opposite can happen, a `.note = ` in a fluent message that is lacking a corresponding `#[note]` on the struct and not causing an error, but maybe it's possible? r? ``@davidtwco`` fixes rust-lang#124392
2 parents a8773d5 + 1367827 commit aaa9d58

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

compiler/rustc_codegen_ssa/src/errors.rs

-1
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@ pub struct ProcessingDymutilFailed {
431431

432432
#[derive(Diagnostic)]
433433
#[diag(codegen_ssa_unable_to_run_dsymutil)]
434-
#[note]
435434
pub struct UnableToRunDsymutil {
436435
pub error: Error,
437436
}

0 commit comments

Comments
 (0)