Unrolled build for rust-lang#116625

Rollup merge of rust-lang#116625 - nnethercote:rustc_hir_pretty, r=fee1-dead

`rustc_hir_pretty` cleanups

Just some improvements I found while looking through this code.

r? ``@fee1-dead``

Author: rust-timer