some fixes for clashing_extern_declarations lint#130301

bors merged 1 commit intorust-lang:masterrust-lang/rust:masterfrom

RalfJung:clashing_extern_declarationsRalfJung/rust:clashing_extern_declarationsCopy head branch name to clipboard