Skip to content

Commit 88cf76a

Browse files
committed
Auto merge of #42146 - nrc:rls-rust, r=alexcrichton
More Rust/RLS integration r? @alexcrichton cc rust-lang/rls#310 closes #41199 closes #41197
2 parents 08652ec + 04415dc commit 88cf76a

File tree

7 files changed

+135
-47
lines changed

7 files changed

+135
-47
lines changed

src/Cargo.lock

+86-34
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cargo.toml

+14
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,20 @@ members = [
1717
"tools/rust-installer",
1818
"tools/cargo",
1919
"tools/rls",
20+
# FIXME(https://github.com/rust-lang/cargo/issues/4089): move these to exclude
21+
"tools/rls/test_data/borrow_error",
22+
"tools/rls/test_data/completion",
23+
"tools/rls/test_data/find_all_refs",
24+
"tools/rls/test_data/find_all_refs_no_cfg_test",
25+
"tools/rls/test_data/goto_def",
26+
"tools/rls/test_data/highlight",
27+
"tools/rls/test_data/hover",
28+
"tools/rls/test_data/rename",
29+
"tools/rls/test_data/reformat",
30+
"tools/rls/test_data/bin_lib_no_cfg_test",
31+
"tools/rls/test_data/multiple_bins",
32+
"tools/rls/test_data/bin_lib",
33+
"tools/rls/test_data/reformat_with_range",
2034
]
2135

2236
# Curiously, compiletest will segfault if compiled with opt-level=3 on 64-bit

0 commit comments

Comments
 (0)