about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-06-26 22:42:08 +0000
committerbors <bors@rust-lang.org>2017-06-26 22:42:08 +0000
commit77931c2a04fbb41f3cd92435aa5294222bb5db7f (patch)
tree61a4e3cc958990e2f053839e46093a92b5ab9207 /src/liballoc
parent859c3236e5ab974f24a82bbebffc72f58cf43800 (diff)
parent38b468832f34d0f9bfcaa9e3c47a246546f52b0b (diff)
downloadrust-77931c2a04fbb41f3cd92435aa5294222bb5db7f.tar.gz
rust-77931c2a04fbb41f3cd92435aa5294222bb5db7f.zip
Auto merge of #42916 - Mark-Simulacrum:update-cargo, r=alexcrichton
Update Cargo

Haven't run extensive tests locally (not really sure what to test) but this primarily pulls in minor changes: https://github.com/rust-lang/cargo/pull/4215, https://github.com/rust-lang/cargo/pull/4209, and https://github.com/rust-lang/cargo/pull/4218. The last one fixes the flaky cargo test by ignoring it, which should unblock https://github.com/rust-lang/rust/pull/42745 -- that's beta nominated.

r? @alexcrichton
Diffstat (limited to 'src/liballoc')
0 files changed, 0 insertions, 0 deletions