From 1156455d4278b2d19910b0e198dfcc4560eadcb7 Mon Sep 17 00:00:00 2001 From: Dustin Speckhals Date: Sat, 28 Oct 2017 13:46:43 -0400 Subject: [PATCH 1/2] Update rustfmt This allows rustfmt and the RLS to test and compile again. --- src/Cargo.lock | 4 ++-- src/tools/rustfmt | 2 +- src/tools/toolstate.toml | 4 ++-- 3 files changed, 5 insertions(+), 5 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 index 9754bcb535f..485ef93e491 160000 --- a/src/tools/rustfmt +++ b/src/tools/rustfmt @@ -1 +1 @@ -Subproject commit 9754bcb535fa84c000fe78cb91b30c3f661fc849 +Subproject commit 485ef93e4912f80aed68867f7dfc163f5662d3a4 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" From e3bf19d8d4d6a8263618ec6acab83d9ecabd6404 Mon Sep 17 00:00:00 2001 From: Dustin Speckhals Date: Sun, 29 Oct 2017 15:16:02 -0400 Subject: [PATCH 2/2] Update rustfmt again --- src/Cargo.lock | 4 ++-- src/tools/rustfmt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Cargo.lock b/src/Cargo.lock index 555ce38517d..7b64633802d 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.12", + "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)", @@ -1944,7 +1944,7 @@ dependencies = [ [[package]] name = "rustfmt-nightly" -version = "0.2.12" +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 index 485ef93e491..cf0d494dda7 160000 --- a/src/tools/rustfmt +++ b/src/tools/rustfmt @@ -1 +1 @@ -Subproject commit 485ef93e4912f80aed68867f7dfc163f5662d3a4 +Subproject commit cf0d494dda7447bacaab743a70c47e28bea55c6f