Auto merge of #42146 - nrc:rls-rust, r=alexcrichton

More Rust/RLS integration r? @alexcrichton cc rust-lang/rls#310 closes #41199 closes #41197
rust-lang · Jul 17, 2017 · 88cf76a · 88cf76a
2 parents 08652ec + 04415dc
commit 88cf76a
Show file tree

Hide file tree

Showing 7 changed files with 135 additions and 47 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/Cargo.toml b/src/Cargo.toml
@@ -17,6 +17,20 @@ members = [
   "tools/rust-installer",
   "tools/cargo",
   "tools/rls",
+  # FIXME(https://github.com/rust-lang/cargo/issues/4089): move these to exclude
+  "tools/rls/test_data/borrow_error",
+  "tools/rls/test_data/completion",
+  "tools/rls/test_data/find_all_refs",
+  "tools/rls/test_data/find_all_refs_no_cfg_test",
+  "tools/rls/test_data/goto_def",
+  "tools/rls/test_data/highlight",
+  "tools/rls/test_data/hover",
+  "tools/rls/test_data/rename",
+  "tools/rls/test_data/reformat",
+  "tools/rls/test_data/bin_lib_no_cfg_test",
+  "tools/rls/test_data/multiple_bins",
+  "tools/rls/test_data/bin_lib",
+  "tools/rls/test_data/reformat_with_range",
 ]
 
 # Curiously, compiletest will segfault if compiled with opt-level=3 on 64-bit