Diagnostic lifetimes cleanups Some diagnostic simplifications. r? `@oli-obk`
For more information about how rustc works, see the rustc dev guide.
