Make resolution backtracking smarter#4834

bors merged 4 commits intorust-lang:masterrust-lang/cargo:masterfrom

aidanhs:aphs-better-backtrackaidanhs/cargo:aphs-better-backtrackCopy head branch name to clipboard