Commit 4c1b6b5

authored

Rollup merge of rust-lang#101294 - Xiretza:fix-100844-accident, r=davidtwco

Fix rust-lang#100844 rebase accident This undoes the rebase accident in rust-lang#100844, which accidentally caused rust-lang#100970 to be reverted.

2 parents 68d3cfa + d9b874c commit 4c1b6b5Copy full SHA for 4c1b6b5

3 files changed

+777

-343

lines changed

compiler/rustc_macros/src/diagnostics
- subdiagnostic.rs
src/test/ui-fulldeps/session-diagnostic
- subdiagnostic-derive.rs
- subdiagnostic-derive.stderr

+777

-343

lines changed

Comments

(0)