[beta] resolve: Fix some stable-to-beta regressions#56206

Merged

bors merged 2 commits intorust-lang:betafrom

petrochenkov:betaregr

Nov 25, 2018

Commits on Nov 25, 2018

resolve: Fix bad span arithmetics in import conflict diagnostics
petrochenkov
committed
resolve: Fix some more asserts in import validation
petrochenkov
committed