From: bors <bors@rust-lang.org>
Date: Fri, 2 Dec 2016 03:20:54 +0000 (+0000)
Subject: Auto merge of #3336 - alexcrichton:fix-warning, r=brson
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~101
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c99ae7e82cfe06a80712ad071c71a43bbc966728;p=cargo.git

Auto merge of #3336 - alexcrichton:fix-warning, r=brson

Test for bad path overrides with summaries

Bad path overrides are currently detected to issue warnings in cases where path
overrides are not suitable and have exhibited buggy behavior in the past.
Unfortunately though it looks like some false positives are being issued,
causing unnecessary confusion about `paths` overrides.

This commit fixes the detection of these "bad path overrides" by comparing
`Summary` dependencies (what's written down in `Cargo.toml`) rather than
comparing the `Cargo.toml` of the override with `Cargo.lock`. We're guaranteed
that the package we're overridding has already been resolved into `Cargo.lock`,
so we know that if the two `Cargo.toml` files are equivalent we'll continue
with the same crate graph.

I'm not actually entirely sure why I originally thought it'd be better to go
through the `Cargo.lock` comparison route. Unfortunately that doesn't take into
account optional deps which aren't in `Cargo.lock` but are in `Cargo.toml` of
the override, causing the false positive. This method, however, simply ensures
that the two dependency lists are the same.

Closes #3313
---

c99ae7e82cfe06a80712ad071c71a43bbc966728