Rollup merge of rust-lang#64935 - AnthonyMikh:librustc_errors/emmiter__code-clarity, r=estebank

Improve code clarity

No commit except 55b5428 address performance, just making the existing code more clear.

r? @estebank

Author: Centril