Fix a regression in import resolution#32097

bors merged 4 commits into

rust-lang:masterrust-lang/rust:masterfrom

jseyfried:fix_resolution_regressionjseyfried/rust:fix_resolution_regressionCopy head branch name to clipboard