Skip to content

Commit ba11cf7

Browse files
committed
Prepare to use Rust with save-analysis invocation PR
rust-lang/rust#54356
1 parent f9948a9 commit ba11cf7

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ categories = ["development-tools"]
1212

1313
build = "build.rs"
1414

15-
[patch.crates-io]
16-
#rls-data = { git = "https://github.com/Xanewok/rls-data", branch = "compilation-options" }
17-
#rls-data = { path = "../rls-data" }
1815

1916
[dependencies]
2017
cargo = { git = "https://github.com/rust-lang/cargo", rev = "9311f6d439e09da3ab918397a425be57da13f04a" }
@@ -33,7 +30,7 @@ rand = "0.5.5"
3330
rayon = "1"
3431
rls-analysis = "0.16"
3532
rls-blacklist = "0.1.2"
36-
rls-data = { version = "0.18", features = ["serialize-serde", "serialize-rustc"] }
33+
rls-data = { version = "0.18.1", features = ["serialize-serde", "serialize-rustc"] }
3734
rls-rustc = "0.5.0"
3835
rls-span = { version = "0.4", features = ["serialize-serde"] }
3936
rls-vfs = "0.4.6"

src/build/rustc.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ impl<'a> CompilerCalls<'a> for RlsRustcCalls {
287287
// state.expanded_crate.unwrap(),
288288
// state.analysis.unwrap(),
289289
// state.crate_name.unwrap(),
290+
// state.input,
290291
// None,
291292
// save::DumpHandler::new(state.out_dir,
292293
// state.crate_name.unwrap()));
@@ -296,6 +297,7 @@ impl<'a> CompilerCalls<'a> for RlsRustcCalls {
296297
state.expanded_crate.expect("missing crate"),
297298
state.analysis.expect("missing analysis"),
298299
state.crate_name.expect("missing crate name"),
300+
state.input,
299301
None,
300302
CallbackHandler {
301303
callback: &mut |a| {

0 commit comments

Comments
 (0)