resolve: Make disambiguators for underscore bindings module-local (take 2)#144272

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

petrochenkov:disambunder2petrochenkov/rust:disambunder2Copy head branch name to clipboard