From: bors <bors@rust-lang.org>
Date: Fri, 4 May 2018 21:07:15 +0000 (+0000)
Subject: Auto merge of #5480 - alexcrichton:fix-regr, r=matklad
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5986492773e6de61cced57f457da3700607f4a3a;p=cargo.git

Auto merge of #5480 - alexcrichton:fix-regr, r=matklad

Fix optional deps in multiple sections

This commit fixes an issue where an optional dependency was listed multiple
times in a manifest (multiple sections). This regression was introduced by #5415
and happened because in the resolver we didn't record a `Dependency` as it was
accidentally deduplicated too soon.

The fix here was to ensure that all `Dependency` annotations make their way into
`Resolve` now that we rely on the listed `Dependency` values for correctness.

Closes #5475
---

5986492773e6de61cced57f457da3700607f4a3a