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 and Rustfmt #75427

Merged
merged 1 commit into from
Aug 12, 2020
Merged

Update RLS and Rustfmt #75427

merged 1 commit into from
Aug 12, 2020

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented Aug 11, 2020

Closes #74811
Closes #74812

r? @calebcartwright

@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 Aug 11, 2020
@Xanewok
Copy link
Member Author

Xanewok commented Aug 11, 2020

Ran ./x.py test src/tools/{rls,rustfmt} locally and all is green, so hopefully CI will agree as well.

calebcartwright
calebcartwright approved these changes Aug 11, 2020
View reviewed changes
Copy link
Member

@calebcartwright calebcartwright left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@calebcartwright
Copy link
Member

If there's a bors incantation needed from me (and I have requisite rights) please let me know

@Dylan-DPC-zz
Copy link

will take care of it this time :P

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Aug 12, 2020

📌 Commit cb40a1c has been approved by Dylan-DPC

@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 Aug 12, 2020
@calebcartwright
Copy link
Member

Thanks @Dylan-DPC 😄 Can I do a bors r+ with a PR like this that gets assigned to me? Sorry haven't done any reviews here before and not entirely sure how the r+ or r= permissions work

@bors
Copy link
Contributor

bors commented Aug 12, 2020

⌛ Testing commit cb40a1c with merge 840dbe7...

@calebcartwright calebcartwright mentioned this pull request Aug 12, 2020
Closed
@bors
Copy link
Contributor

bors commented Aug 12, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Dylan-DPC
Pushing 840dbe7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 12, 2020
@bors bors merged commit 840dbe7 into rust-lang:master Aug 12, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #75427!

Tested on commit 840dbe7.
Direct link to PR: #75427

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Aug 12, 2020
@rust-highfive
📣 Toolstate changed by rust-lang/rust#75427!
9c987b5 
Tested on commit rust-lang/rust@840dbe7.
Direct link to PR: <rust-lang/rust#75427>

🎉 rls on windows: build-fail → test-pass (cc @Xanewok).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok).
🎉 rustfmt on windows: build-fail → test-pass (cc @topecongiro @calebcartwright).
🎉 rustfmt on linux: build-fail → test-pass (cc @topecongiro @calebcartwright).
@RalfJung RalfJung mentioned this pull request Aug 12, 2020
Closed
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@calebcartwright calebcartwright calebcartwright approved these changes

Assignees

@calebcartwright calebcartwright

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.47.0
Development

Successfully merging this pull request may close these issues.

rustfmt no longer builds after rust-lang/rust#74653 rls no longer builds after rust-lang/rust#74653
6 participants
@Xanewok @rust-highfive @calebcartwright @Dylan-DPC-zz @bors @cuviper