Avoid ICE in macro's diagnostics#68633

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

JohnTitor:avoid-ice-in-diagnosticsJohnTitor/rust:avoid-ice-in-diagnosticsCopy head branch name to clipboard