From: bors <bors@rust-lang.org>
Date: Wed, 2 May 2018 15:35:33 +0000 (+0000)
Subject: Auto merge of #5454 - alexcrichton:fix, r=matklad
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~29
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1b26ece291dfcc0ef03ba12c36da0d9779202efe;p=cargo.git

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

Fix optional dependencies and required dev-deps

This fixes an accidental bug introduced in #5300 by ensuring a local map keeps
track of the fact that there can be multiple dependencies for one name

Closes #5453
---

1b26ece291dfcc0ef03ba12c36da0d9779202efe