Rollup merge of #105806 - mejrs:eager2, r=davidtwco

Support eager subdiagnostics again

See rust-lang/rust#104941 (comment)

I'm not sure how to add a test for this. But I did pick some of the diagnostic structs in the mentioned PR and it works with them.