Diagnostic renaming 2 A sequel to #121489. r? `@davidtwco`
For more information about how rustc works, see the rustc dev guide.
