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

[beta] Update RLS to include 100% CPU on hover bugfix #57300

Merged
merged 1 commit into from
Jan 4, 2019

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented Jan 3, 2019

Beta backport of a fix that already was backported to stable, see #56726 and rust-lang/rls#1170 for the underlying RLS issue.

Also includes the fix for rust-lang/rls#1154 (respecting target-dir specified in .cargo/config for RLS artifacts), which was just a commit in between and IMO makes sense to also land in beta.

r? @pietroalbini

Beta backport of a fix that already was backported to stable,
see rust-lang#56726 and
rust-lang/rls#1170 for the underlying RLS issue.

Also includes the fix for rust-lang/rls#1154
(respecting target-dir specified in .cargo/config for RLS artifacts).
@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • 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 Jan 3, 2019
@pietroalbini
Copy link
Member

@bors r+

Thanks!

@bors
Copy link
Contributor

bors commented Jan 3, 2019

📌 Commit 4c4ea59 has been approved by pietroalbini

@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 Jan 3, 2019
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Jan 3, 2019
bors added a commit that referenced this pull request Jan 4, 2019
[beta] Rollup backports

Cherry-picked:

* #57053: Fix alignment for array indexing
* #57181: resolve: Fix another ICE in import validation
* #57185: resolve: Fix one more ICE in import validation
* #57282: Wf-check the output type of a function in MIR-typeck
* #55318: Ensure that Rustdoc discovers all necessary auto trait bounds
* #56838: Call poly_project_and_unify_type on types that contain inference types

Rolled up:

* #57300: [beta] Update RLS to include 100% CPU on hover bugfix
* #57301: beta: bootstrap from latest stable (1.31.1)
* #57292: [BETA] Update cargo

r? @ghost
@bors bors merged commit 4c4ea59 into rust-lang:beta Jan 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

4 participants