From: Mark Simulacrum <mark.simulacrum@gmail.com>
Date: Tue, 16 May 2017 23:31:51 +0000 (-0600)
Subject: Rollup merge of #42039 - alexcrichton:update-cargo, r=aturon
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=afb9b2013d0d675f838e06ff96c02c2ceddeadbb;hp=-c;p=rust.git

Rollup merge of #42039 - alexcrichton:update-cargo, r=aturon

Update cargo submodule

This pulls in a fix for #41797 to the master branch, I'll send a separate PR for
the beta branch. Note that the Cargo PR in question to pull in is https://github.com/rust-lang/cargo/pull/4046
---

afb9b2013d0d675f838e06ff96c02c2ceddeadbb