Auto merge of #5722 - alexcrichton:beta-next, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 13 Jul 2018 20:44:11 +0000 (20:44 +0000)
committerbors <bors@rust-lang.org>
Fri, 13 Jul 2018 20:44:11 +0000 (20:44 +0000)
commit96a2c7d16249cb47c61c887fc95ca8be60e7ef0a
treed0a0cb8bff49a42a8df267a9f45defef9d287a2e
parentcb019b621ba10009f634350337d7456ad75364b9
parentbb9ff3d1c422dea9edd67547c8c8a5b0831b2474
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