From: bors <bors@rust-lang.org>
Date: Wed, 5 Oct 2016 23:22:25 +0000 (-0700)
Subject: Auto merge of #3144 - alexcrichton:less-update-registry, r=brson
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~13^2~56
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=80d20e90d6666a8efed0224d9b3b82a6636da98d;p=cargo.git

Auto merge of #3144 - alexcrichton:less-update-registry, r=brson

Avoid updating registry when adding existing deps

Cargo previously erroneously updated the registry whenever a new dependency was
added on a crate which already exists in the DAG. This commit fixes this
behavior by ensuring that if the new dependency matches a previously locked
version it uses that instead.

This commit involved a bit of refactoring around this logic to be a bit more
clear how the locking and "falling back to the registry" is happening.

Closes #2895
---

80d20e90d6666a8efed0224d9b3b82a6636da98d