Fix weird rustdoc output when single and glob reexport conflict on a name#143590

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

GuillaumeGomez:reexport-shadowingGuillaumeGomez/rust:reexport-shadowingCopy head branch name to clipboard