resolve: Fix span arithmetics in the import conflict error#57908

Merged

bors merged 2 commits intorust-lang:masterfrom

petrochenkov:errepice

Jan 26, 2019

Commits on Jan 25, 2019

#56411 do not suggest a fix for a import conflict in a macro

mockersf
authored and
petrochenkov
committed
Address review comments and cleanup code
petrochenkov
committed