Update RLS and Rustfmt

This commit is contained in:
Nick Cameron 2017-09-22 13:58:35 +12:00 committed by Alex Crichton
parent 0e6f4cf51c
commit c5cad5a78d
3 changed files with 201 additions and 193 deletions

387
src/Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -60,10 +60,5 @@ debug-assertions = false
[patch."https://github.com/rust-lang/cargo"]
cargo = { path = "tools/cargo" }
# Override rustfmt dependencies both on the repo and the crate (the RLS
# sometimes uses either).
# FIXME should only need the crates.io patch, long term.
[patch."https://github.com/rust-lang-nursery/rustfmt"]
rustfmt-nightly = { path = "tools/rustfmt" }
[patch.crates-io]
rustfmt-nightly = { path = "tools/rustfmt" }

@ -1 +1 @@
Subproject commit 7221e38023c41ff2532ebbf54a7da296fd488b50
Subproject commit 65e6eb6fdd89bcd5857890477dd7a412f4d78e22