De-pub resolve.rs
auto merge of #9679 : pnkfelix/rust/de-pub-resolve-code, r=huonw

r? anyone

For context (and the archaeological dig that @huonw did to see how this arose), see:
  https://botbot.me/mozilla/rust-internals/msg/6547222/