From: bors <bors@rust-lang.org>
Date: Sat, 22 Sep 2018 02:18:17 +0000 (+0000)
Subject: Auto merge of #54334 - steveklabnik:update-cargo, r=alexcrichton
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=c97b60ff3fcf1830e7e19ceeaea4046dc126911d;p=rust.git

Auto merge of #54334 - steveklabnik:update-cargo, r=alexcrichton

update cargo

This pulls in https://github.com/rust-lang/cargo/pull/6052, which is needed for the edition preview, and will be backported to beta as well.
---

c97b60ff3fcf1830e7e19ceeaea4046dc126911d