More accurate spans#6208

bors merged 2 commits intorust-lang:incomingrust-lang/rust:incomingfrom

sanxiyn:accurate-spansanxiyn/rust:accurate-spanCopy head branch name to clipboard