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 #85352

Merged
merged 1 commit into from May 17, 2021
Merged

Update RLS #85352

merged 1 commit into from May 17, 2021

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented May 15, 2021

Contains rust-lang/rls#1736. With #82208 merged, this should now close #85225. Tested locally with ./x.py test src/tools/rls and seems to be working as expected.

I noticed the rustfmt merge didn't trigger toolstate upgrade (because we pruned most but not all of the related machinery?), so I'd rather get this rubber-stamped by someone more knowledgeable with infra/the merged changes in case I missed something and need to include something else here to unbreak the RLS toolstate.

r? @Mark-Simulacrum

@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 May 15, 2021
@calebcartwright
Copy link
Member

I had some similar questions about rustfmt after I checked the toolstate page earlier (admittedly a bit prematurely) and noticed that it hadn't been updated in a while either. Not sure if that's expected or related, but sharing in case it is

@jyn514
Copy link
Member

jyn514 commented May 16, 2021

I noticed the rustfmt merge didn't trigger toolstate upgrade

What is toolstate upgrade?

@Xanewok
Copy link
Member Author

Xanewok commented May 16, 2021

I meant "Toolstate changed!" notifications such as #84886 (comment)

@Xanewok
Copy link
Member Author

Xanewok commented May 17, 2021

I guess there's no harm in pushing this further and I believe chances of this needing a follow-up are slim

@bors r+ p=1

@bors
Copy link
Contributor

bors commented May 17, 2021

📌 Commit 9235446 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 May 17, 2021
@bors
Copy link
Contributor

bors commented May 17, 2021

⌛ Testing commit 9235446 with merge fa72878...

@bors
Copy link
Contributor

bors commented May 17, 2021

☀️ Test successful - checks-actions
Approved by: Xanewok
Pushing fa72878 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 17, 2021
@bors bors merged commit fa72878 into rust-lang:master May 17, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 17, 2021
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #85352!

Tested on commit fa72878.
Direct link to PR: #85352

🎉 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 May 17, 2021
Tested on commit rust-lang/rust@fa72878.
Direct link to PR: <rust-lang/rust#85352>

🎉 rls on windows: build-fail → test-pass (cc @Xanewok).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok).
@Xanewok Xanewok deleted the update-rls branch May 18, 2021 08:20
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.

rls no longer builds after rust-lang/rust#83813
7 participants