resolve: Preserve binding scopes in ambiguity errors#150445

bors merged 2 commits intorust-lang:mainrust-lang/rust:mainfrom

petrochenkov:keepscopepetrochenkov/rust:keepscopeCopy head branch name to clipboard