Rollup merge of #35328 - trixnz:update-error-62, r=jonathandturner

Update error format for E0062

Fixes #35217 as part of #35233

There seems to be an issue with the old format ignoring the labels which results in the incorrect line being rendered in the old format. I spoke with @jonathandturner about this and it seems to be a bug. Pertinent information [here](https://gist.github.com/trixnz/ad11e68687529e164427df8f8eb63116).

r? @jonathandturner

diff --cc src/librustc_typeck/check/mod.rs
Simple merge