Don't ICE if HIR and middle types disagree in borrowck error reporting#128172

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

compiler-errors:non-self-argcompiler-errors/rust:non-self-argCopy head branch name to clipboard