Auto merge of #47051 - Xanewok:update-rls, r=kennytm

bors · bors · commit f0e5c953e4be · 2017-12-29T14:02:32.000Z
Update RLS and Rustfmt Essentially #46929 with only RLS update that fixes the build. The rls wasn't included in the recent nightlies and a lot of people have been wondering what to do about it, so it'd be good to include the RLS back with the nightly builds as soon as we can. r? @alexcrichton
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/tools/rls b/src/tools/rls
@@ -1 +1 @@
-Subproject commit 9782aa4c3c5b203732b9a1a4f3c9d7fbc912e437
+Subproject commit 299a6a91089af06b3b515450fece3c45a059dbbf
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
@@ -1 +1 @@
-Subproject commit 8db33ff0f74c64bd4ddfbcb0eda0c8277ff9980a
+Subproject commit 6714a447d063b079de8fb2884ded2c8c3e96bc1d
