Auto merge of #45597 - DSpeckhals:rustfmt-update, r=nrc

tools: Update rustfmt and re-enable testing

This allows rustfmt and the RLS to test and compile again.
This commit is contained in:
bors 2017-10-29 21:25:12 +00:00
commit 90ef3372e8
3 changed files with 5 additions and 5 deletions

4
src/Cargo.lock generated
View File

@ -1466,7 +1466,7 @@ dependencies = [
"rls-rustc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rustfmt-nightly 0.2.9",
"rustfmt-nightly 0.2.13",
"serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1950,7 +1950,7 @@ dependencies = [
[[package]]
name = "rustfmt-nightly"
version = "0.2.9"
version = "0.2.13"
dependencies = [
"diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",

@ -1 +1 @@
Subproject commit 9754bcb535fa84c000fe78cb91b30c3f661fc849
Subproject commit cf0d494dda7447bacaab743a70c47e28bea55c6f

View File

@ -29,7 +29,7 @@ miri = "Broken"
clippy = "Compiling"
# ping @nrc
rls = "Broken"
rls = "Testing"
# ping @nrc
rustfmt = "Broken"
rustfmt = "Testing"