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.

Sign up for GitHub

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

Jump to bottom

Update rls #77412

Merged
merged 1 commit into from
Oct 2, 2020
Merged

Update rls #77412

merged 1 commit into from
Oct 2, 2020

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Oct 1, 2020 •
edited
Loading

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

Fixes #77311.

@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 Oct 1, 2020
@Xanewok
Copy link
Member

Xanewok commented Oct 1, 2020

r=me after checks pass

@Mark-Simulacrum
Copy link
Member Author

@bors r=Xanewok p=10

We need to get this in before beta branch tomorrow.

@bors
Copy link
Contributor

bors commented Oct 1, 2020

📌 Commit 9a3b9b4 has been approved by Xanewok

@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 Oct 1, 2020
@bors
Copy link
Contributor

bors commented Oct 1, 2020

⌛ Testing commit 9a3b9b4 with merge 66936de...

@bors
Copy link
Contributor

bors commented Oct 2, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Xanewok
Pushing 66936de to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 2, 2020
@bors bors merged commit 66936de into rust-lang:master Oct 2, 2020
@rustbot rustbot added this to the 1.48.0 milestone Oct 2, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #77412!

Tested on commit 66936de.
Direct link to PR: #77412

🎉 rls on windows: build-fail → test-pass (cc @Xanewok).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Oct 2, 2020
@rust-highfive
📣 Toolstate changed by rust-lang/rust#77412!
53cb8c2 
Tested on commit rust-lang/rust@66936de.
Direct link to PR: <rust-lang/rust#77412>

🎉 rls on windows: build-fail → test-pass (cc @Xanewok).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

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
Milestone
1.48.0
Development

Successfully merging this pull request may close these issues.

rls no longer builds after rust-lang/rust#77302
5 participants
@Mark-Simulacrum @rust-highfive @Xanewok @bors @rustbot