Resolve: fix scoping bug (fixes #31845) and improve unused import detection#31857

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

jseyfried:fix_scopingjseyfried/rust:fix_scopingCopy head branch name to clipboard