Auto merge of #149442 - chenyukang:yukang-fix-mark-span-note-144304, r=estebank

Fix span note for question mark expression

Fixes rust-lang/rust#144304

Seems it's better to fix the note instead of modifying the span to cover the whole expression.

r? `@estebank`

Author: bors