From: bors <bors@rust-lang.org>
Date: Wed, 16 Nov 2016 15:02:22 +0000 (-0800)
Subject: Auto merge of #3102 - nipunn1313:attempt, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~13^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1877f59d6b2cb057f7ef6c6b34b926fd96a683c1;p=cargo.git

Auto merge of #3102 - nipunn1313:attempt, r=alexcrichton

Mix feature flags into fingerprint/metadata shorthash

Since building dependencies results in different libraries
depending on the feature flags, I added the feature flags into
the short_hash.

This solves an issue when multiple crates share a target directory
or multiple targets share a common library with divergent feature
flag choice.

I'm not sure if this architecturally the best way to solve this problem, but I did confirm that this fixes the issue I was seeing. I can also add a test for this case if this code is taking the right approach (or if it would help illustrate the issue).
---

1877f59d6b2cb057f7ef6c6b34b926fd96a683c1