Fix more ICEs in `diagnostic::on_unimplemented`#124875

bors merged 2 commits intorust-lang:masterrust-lang/rust:masterfrom

compiler-errors:more-diagnostics-icescompiler-errors/rust:more-diagnostics-icesCopy head branch name to clipboard