diff options
| author | Dustin Speckhals <dustin1114@gmail.com> | 2017-10-28 13:46:43 -0400 |
|---|---|---|
| committer | Dustin Speckhals <dustin1114@gmail.com> | 2017-10-28 13:46:43 -0400 |
| commit | 1156455d4278b2d19910b0e198dfcc4560eadcb7 (patch) | |
| tree | d491965785785348b666516b3e76c22a63083628 | |
| parent | 7da9a5e178e28b2e387e6296aa1b0289acdf5781 (diff) | |
| download | rust-1156455d4278b2d19910b0e198dfcc4560eadcb7.tar.gz rust-1156455d4278b2d19910b0e198dfcc4560eadcb7.zip | |
Update rustfmt
This allows rustfmt and the RLS to test and compile again.
| -rw-r--r-- | src/Cargo.lock | 4 | ||||
| m--------- | src/tools/rustfmt | 13 | ||||
| -rw-r--r-- | src/tools/toolstate.toml | 4 |
3 files changed, 9 insertions, 12 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock index d762b96d05c..555ce38517d 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -1460,7 +1460,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.12", "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)", @@ -1944,7 +1944,7 @@ dependencies = [ [[package]] name = "rustfmt-nightly" -version = "0.2.9" +version = "0.2.12" 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)", diff --git a/src/tools/rustfmt b/src/tools/rustfmt -Subproject 9754bcb535fa84c000fe78cb91b30c3f661fc84 +Subproject 485ef93e4912f80aed68867f7dfc163f5662d3a diff --git a/src/tools/toolstate.toml b/src/tools/toolstate.toml index 9dd420c1458..f1684f4c5ac 100644 --- a/src/tools/toolstate.toml +++ b/src/tools/toolstate.toml @@ -29,7 +29,7 @@ miri = "Broken" clippy = "Broken" # ping @nrc -rls = "Broken" +rls = "Testing" # ping @nrc -rustfmt = "Broken" +rustfmt = "Testing" |