Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit 042a7ed

Browse files
committed
;
1 parent b88eca2 commit 042a7ed

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
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
@@ -25,7 +25,7 @@ rayon = "1"
2525
rls-analysis = "0.13"
2626
rls-blacklist = "0.1.2"
2727
rls-data = { version = "0.16", features = ["serialize-serde"] }
28-
rls-rustc = "0.2.1"
28+
rls-rustc = "0.3.0"
2929
rls-span = { version = "0.4", features = ["serialize-serde"] }
3030
rls-vfs = { version = "0.4.5", features = ["racer-impls"] }
3131
rustfmt-nightly = "0.7"
@@ -41,6 +41,3 @@ json = "0.11"
4141
[features]
4242
default = []
4343
clippy = ["clippy_lints"]
44-
45-
[patch.crates-io]
46-
rls-rustc = { git = 'https://github.com/alexcrichton/rls-rustc', branch = 'fix' }

src/build/rustc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ impl<'a> CompilerCalls<'a> for RlsRustcCalls {
215215

216216
fn late_callback(
217217
&mut self,
218-
trans_crate: &CodegenBackend,
218+
codegen_backend: &CodegenBackend,
219219
matches: &getopts::Matches,
220220
sess: &Session,
221221
cstore: &CrateStore,
@@ -224,7 +224,7 @@ impl<'a> CompilerCalls<'a> for RlsRustcCalls {
224224
ofile: &Option<PathBuf>,
225225
) -> Compilation {
226226
self.default_calls
227-
.late_callback(trans_crate, matches, sess, cstore, input, odir, ofile)
227+
.late_callback(codegen_backend, matches, sess, cstore, input, odir, ofile)
228228
}
229229

230230
fn build_controller(

0 commit comments

Comments
 (0)