diff options
| author | bors <bors@rust-lang.org> | 2017-10-29 21:25:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-10-29 21:25:12 +0000 |
| commit | 90ef3372e8ad74517eafa61e9494688c258b15ce (patch) | |
| tree | 02d64dd5cd5857f178b6326b07702156604329f3 | |
| parent | 2d3afa683386cffc7be381eb3bf8ad6e9f440649 (diff) | |
| parent | e3bf19d8d4d6a8263618ec6acab83d9ecabd6404 (diff) | |
| download | rust-90ef3372e8ad74517eafa61e9494688c258b15ce.tar.gz rust-90ef3372e8ad74517eafa61e9494688c258b15ce.zip | |
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.
| -rw-r--r-- | src/Cargo.lock | 4 | ||||
| m--------- | src/tools/rustfmt | 25 | ||||
| -rw-r--r-- | src/tools/toolstate.toml | 4 |
3 files changed, 22 insertions, 11 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock index 3df5b74c30e..69c3789f337 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -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)", diff --git a/src/tools/rustfmt b/src/tools/rustfmt -Subproject 9754bcb535fa84c000fe78cb91b30c3f661fc84 +Subproject cf0d494dda7447bacaab743a70c47e28bea55c6 diff --git a/src/tools/toolstate.toml b/src/tools/toolstate.toml index da4d26d78da..e62597c5216 100644 --- a/src/tools/toolstate.toml +++ b/src/tools/toolstate.toml @@ -29,7 +29,7 @@ miri = "Broken" clippy = "Compiling" # ping @nrc -rls = "Broken" +rls = "Testing" # ping @nrc -rustfmt = "Broken" +rustfmt = "Testing" |