From: bors <bors@rust-lang.org>
Date: Fri, 13 Jul 2018 20:44:11 +0000 (+0000)
Subject: Auto merge of #5722 - alexcrichton:beta-next, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=96a2c7d16249cb47c61c887fc95ca8be60e7ef0a;p=cargo.git

Auto merge of #5722 - alexcrichton:beta-next, r=alexcrichton

[beta] Partially revert dep changes in #5651

This is a beta backport of https://github.com/rust-lang/cargo/pull/5711
---

96a2c7d16249cb47c61c887fc95ca8be60e7ef0a