From: bors <bors@rust-lang.org>
Date: Fri, 4 May 2018 14:37:41 +0000 (+0000)
Subject: Auto merge of #5476 - dwijnand:Registry-vs-Source-confusion, r=matklad
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~17
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1ca44da30b6e4190b6fc0b92a97e4c7e82ceee26;p=cargo.git

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).
---

1ca44da30b6e4190b6fc0b92a97e4c7e82ceee26