Auto merge of #5476 - dwijnand:Registry-vs-Source-confusion, r=matklad
authorbors <bors@rust-lang.org>
Fri, 4 May 2018 14:37:41 +0000 (14:37 +0000)
committerbors <bors@rust-lang.org>
Fri, 4 May 2018 14:37:41 +0000 (14:37 +0000)
commit1ca44da30b6e4190b6fc0b92a97e4c7e82ceee26
tree622da2ce9e6abab46079da96bdcdd5c1bacffdf7
parent0dd53841d30816ec0d79d879de71d7adc360bdc5
parent05e819427c64cbbda5bc8f8d752980afaf0abae8
Auto merge of #5476 - dwijnand:Registry-vs-Source-confusion, r=matklad

Try & simplify Registry vs Source confusion

Refs #3006.

I tried to go further and replace references of `Registry` with `PackageRegistry`, but I ran into lifetime issue in `ops::resolve_with_previous` which I think has to do with no longer passing `PackageRegistry` as a `Registry` trait object (with a new and distinct lifetime).