Correct span for self and ExprStruct
auto merge of #12181 : sanxiyn/rust/accurate-span-4, r=alexcrichton