Librustc_resolve diagnostics fixes#33493

bors merged 2 commits intorust-lang:masterrust-lang/rust:masterfrom

Manishearth:more-diagManishearth/rust:more-diagCopy head branch name to clipboard