More updates for recent diagnostics changes.#1936

fmease merged 1 commit intorust-lang:masterrust-lang/rustc-dev-guide:masterfrom

nnethercote:more-diag-updatesnnethercote/rustc-dev-guide:more-diag-updatesCopy head branch name to clipboard