Auto merge of #32240 - jseyfried:cleanup_resolve, r=nikomatsakis

Cleanup resolve

This is a collection of small refactorings and improvements in `resolve`, most of which could stand alone.
r? @nikomatsakis

Author: bors