DiagnosticBuilder
Diag
Much better! Note that this involves renaming (and updating the value of) `DIAGNOSTIC_BUILDER` in clippy.
rustc_*/Cargo.toml