Tweak output of type mismatch between "then" and `else` `if` arms#57381

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

estebank:if-else-308estebank/rust:if-else-308Copy head branch name to clipboard