From 69ba6738eb6bf9b6d11ebb81af2599648eb0bc04 Mon Sep 17 00:00:00 2001
From: Dustin Speckhals <dustin1114@gmail.com>
Date: Fri, 20 Oct 2017 17:11:50 -0400
Subject: [PATCH] Use newest version of RLS and rustfmt

---
 src/Cargo.lock    | 8 ++++++--
 src/Cargo.toml    | 1 +
 src/tools/rls     | 2 +-
 src/tools/rustfmt | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Cargo.lock b/src/Cargo.lock
index 7cd6619285d..934f5d6eed9 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -506,6 +506,10 @@ dependencies = [
  "rustdoc 0.0.0",
 ]
 
+[[package]]
+name = "features"
+version = "0.1.0"
+
 [[package]]
 name = "filetime"
 version = "0.1.12"
@@ -1330,7 +1334,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.8",
+ "rustfmt-nightly 0.2.9",
  "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.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1812,7 +1816,7 @@ dependencies = [
 
 [[package]]
 name = "rustfmt-nightly"
-version = "0.2.8"
+version = "0.2.9"
 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/Cargo.toml b/src/Cargo.toml
index 9a9590dc44b..b703b2d7d29 100644
--- a/src/Cargo.toml
+++ b/src/Cargo.toml
@@ -22,6 +22,7 @@ members = [
   # FIXME(https://github.com/rust-lang/cargo/issues/4089): move these to exclude
   "tools/rls/test_data/borrow_error",
   "tools/rls/test_data/common",
+  "tools/rls/test_data/features",
   "tools/rls/test_data/find_all_refs_no_cfg_test",
   "tools/rls/test_data/reformat",
   "tools/rls/test_data/multiple_bins",
diff --git a/src/tools/rls b/src/tools/rls
index 96d7461403f..78175cfde1e 160000
--- a/src/tools/rls
+++ b/src/tools/rls
@@ -1 +1 @@
-Subproject commit 96d7461403fb738040635f466441abb633726d39
+Subproject commit 78175cfde1e2ee2125ec7d0d2c7c966a8730e026
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
index 505439048f7..9754bcb535f 160000
--- a/src/tools/rustfmt
+++ b/src/tools/rustfmt
@@ -1 +1 @@
-Subproject commit 505439048f749769ba41500ce180a25ff982469e
+Subproject commit 9754bcb535fa84c000fe78cb91b30c3f661fc849