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

Adjust for upstream changes #1700

Merged
merged 2 commits into from
Oct 1, 2020
Merged

Conversation

Mark-Simulacrum
Copy link
Member

r? @Xanewok -- I think this should fix rust-lang/rust master

@Xanewok
Copy link
Member

Xanewok commented Oct 1, 2020

Thank you for taking care of this! If the run_compiler API changed then I believe we also need to update

rls/rls/src/build/rustc.rs

Lines 189 to 194 in 50d825e

run_compiler(
&args,
&mut callbacks,
Some(Box::new(ReplacedFileLoader::new(changed))),
Some(Box::new(BufWriter(stderr))),
)
(in-process variant) as well.

@Mark-Simulacrum
Copy link
Member Author

I've confirmed this seems to fix things locally (after the latest force push), or at least RLS builds.

@Mark-Simulacrum
Copy link
Member Author

Hm, test failure looks unrelated to this PR at least, do you think it's reliable? I don't really know where to start investigating it.

@calebcartwright
Copy link
Member

The tooltip test failures are unrelated. I updated them a few weeks ago to reflect the upstream changes, but they're failing again due to subsequent changes.

@Mark-Simulacrum
Copy link
Member Author

Tried to push up a commit fixing tooltip failures -- seems to be passing tests now too.

@Mark-Simulacrum
Copy link
Member Author

CI here is now passing. I can handle the submodule update if someone wants to merge this?

@Xanewok Xanewok merged commit 4d5e9df into rust-lang:master Oct 1, 2020
@Xanewok
Copy link
Member

Xanewok commented Oct 1, 2020

Thanks!

@Mark-Simulacrum Mark-Simulacrum deleted the fix-76474 branch October 1, 2020 17:08
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Oct 1, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 1, 2020
Update rls

Includes rust-lang/rls#1700, just fixing compilation and test failures.

Fixes rust-lang#77311.
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants