Cleanup things in and around `Diagnostic`#119763

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

nnethercote:cleanup-Diagnosticnnethercote/rust:cleanup-DiagnosticCopy head branch name to clipboard