Auto merge of #49285 - nrc:update, r=alexcrichton

bors · bors · commit 55e1104dd918 · 2018-03-23T05:43:00.000Z
Update RLS and Rustfmt Fixes broken RLS tests/build 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 567fb6d74cca9ccbfae2440c688035400b51e3c6
+Subproject commit 974c515493f212a21a55b7370c25bcc231f33535
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
@@ -1 +1 @@
-Subproject commit 87180d9065e7c8070c0ba46eb48ddf8779ef89ac
+Subproject commit 374dba833e22cc8df8e16e19cccbde61c69d9aed
