about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-04-14 15:21:10 +0800
committerkennytm <kennytm@gmail.com>2018-04-14 15:21:10 +0800
commitfbbc9907b1609dc5be65e658e74ea6aa77366542 (patch)
treed838a52673f66e9c260e777273df3b798abdf7c6 /src/tools
parent410e895bd5f3ca4cb29dd5731cbd75f907e0f41a (diff)
parentd0159453af78f43ea4a10a34954c13047e4b9f97 (diff)
downloadrust-fbbc9907b1609dc5be65e658e74ea6aa77366542.tar.gz
rust-fbbc9907b1609dc5be65e658e74ea6aa77366542.zip
Rollup merge of #49951 - matklad:update-cargo, r=nrc
Update Cargo

This includes https://github.com/rust-lang/cargo/pull/5353, which we  want to test via opt-in in the wild.

This'll break RLS, the fix is https://github.com/rust-lang-nursery/rls/pull/822
Diffstat (limited to 'src/tools')
m---------src/tools/cargo0
m---------src/tools/rls0
2 files changed, 0 insertions, 0 deletions
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject b70ab13b31628e91b05961d55c07abf20ad49de
+Subproject 008c3690846798d678f4a0a45ee46cc9ff6dc90
diff --git a/src/tools/rls b/src/tools/rls
-Subproject faccf0d07cad4c84da20c5c0102a450fca9d0b6
+Subproject 7bda1161a37ff51f254ff0a7862abe6dc54fdb3