Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update RLS and Clippy due to #56732 (rustc_interface crate) #59073

Merged
merged 2 commits into from
Mar 11, 2019

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented Mar 10, 2019

Closes #59060.

In addition to plain submodule bumps, this also contains update to rls-rustc. The in-tree, from the RLS monorepo, version is used instead of the crates.io one (@nrc I think we might stop publishing rls-rustc altogether, right? It's only there to work around passing -Zsave-analysis to stable rustc and meant to be used only by RLS, IIRC).

@Zoxc also due to how we need to access the expanded AST still from the RLS side in order to pass save analysis data in-memory, I delayed the AST drop after the after_analysis callback if the -Zsave-analysis is passed.

It'd be also good if you could take a look at the changes inside the rls and rls-rustc: rust-lang/rls@6a1b5a9...6840dd6. The rls-rustc is based on your PR but I also had to change some bits in the RLS itself.

r? @Zoxc / @Manishearth

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 10, 2019
@Manishearth
Copy link
Member

r=me for the clippy update

@Zoxc
Copy link
Contributor

Zoxc commented Mar 10, 2019

The changes look good to me, but I wasn't expecting RLS to do code generation.

@bors r+

@bors
Copy link
Contributor

bors commented Mar 10, 2019

📌 Commit 9a6a269 has been approved by Zoxc

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 10, 2019
@Xanewok
Copy link
Member Author

Xanewok commented Mar 10, 2019

Unless I forgot about something, I don't think we should - @Zoxc are you talking about this? To double-check, if we pass false there we shouldn't abort the compilation, just stop and return 0 exit code if everything was successful?

@Xanewok
Copy link
Member Author

Xanewok commented Mar 10, 2019

I'll bump the prio due to lockfile and tools changes:

@bors p=1

@Zoxc
Copy link
Contributor

Zoxc commented Mar 10, 2019

@Zoxc are you talking about this? To double-check, if we pass false there we shouldn't abort the compilation, just stop and return 0 exit code if everything was successful?

Yes. Passing false there will just stop and return Ok or Err, depending on if any errors were emitted. The previous code doesn't seem to stop there either though.

@bors
Copy link
Contributor

bors commented Mar 11, 2019

⌛ Testing commit 9a6a269 with merge de5c3c4...

bors added a commit that referenced this pull request Mar 11, 2019
Update RLS and Clippy due to #56732 (rustc_interface crate)

Closes #59060.

In addition to plain submodule bumps, this also contains update to rls-rustc. The in-tree, from the RLS monorepo, version is used instead of the crates.io one (@nrc I think we might stop publishing `rls-rustc` altogether, right? It's only there to work around passing `-Zsave-analysis` to stable `rustc` and meant to be used only by RLS, IIRC).

@Zoxc also due to how we need to access the expanded AST still from the RLS side in order to pass save analysis data in-memory, I delayed the AST drop after the `after_analysis` callback if the `-Zsave-analysis` is passed.

It'd be also good if you could take a look at the changes inside the `rls` and `rls-rustc`: rust-lang/rls@6a1b5a9...6840dd6. The `rls-rustc` is based on your [PR](rust-dev-tools/rls-rustc#11) but I also had to change some bits in the RLS itself.

r? @Zoxc / @Manishearth
@bors
Copy link
Contributor

bors commented Mar 11, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Zoxc
Pushing de5c3c4 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 11, 2019
@bors bors merged commit 9a6a269 into rust-lang:master Mar 11, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #59073!

Tested on commit de5c3c4.
Direct link to PR: #59073

🎉 rls on windows: build-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 11, 2019
Tested on commit rust-lang/rust@de5c3c4.
Direct link to PR: <rust-lang/rust#59073>

🎉 rls on windows: build-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants