Simplify shallow resolver to just fold ty/consts#123537

bors merged 1 commit intorust-lang:masterrust-lang/rust:masterfrom

compiler-errors:shallowcompiler-errors/rust:shallowCopy head branch name to clipboard