More accurate spans
auto merge of #6208 : sanxiyn/rust/accurate-span, r=thestinger