Unrolled build for #146120

Rollup merge of #146120 - smoelius:patch-3, r=lqd

Correct typo in `rustc_errors` comment

Author: rust-timer

compiler/rustc_errors/src/lib.rs

@@ -1160,7 +1160,7 @@ impl<'a> DiagCtxtHandle<'a> {
         // - It's only produce with JSON output.
         // - It's not emitted the usual way, via `emit_diagnostic`.
         // - The `$message_type` field is "unused_externs" rather than the usual
-        //   "diagnosic".
+        //   "diagnostic".
         //
         // We count it as a lint error because it has a lint level. The value
         // of `loud` (which comes from "unused-externs" or