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

Merged
merged 3 commits into from
Dec 6, 2020
Merged

Update RLS and Rustfmt #79737

merged 3 commits into from
Dec 6, 2020
+66 −58

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented Dec 5, 2020

Fixes #79406 Fixes #79407

This does pull 1.4.28 version of Rustfmt. Do you want me to pull the 1.4.29 while we're at it?

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

Xanewok commented Dec 5, 2020

Hopefully this works, not sure if you have approval rights

@bors delegate=calebcartwright

@bors
Copy link
Contributor

bors commented Dec 5, 2020

✌️ @calebcartwright can now approve this pull request

@calebcartwright
Copy link
Member

Thanks!

This does pull 1.4.28 version of Rustfmt. Do you want me to pull the 1.4.29 while we're at it?

Yeah let's go ahead and do so 👍

Hopefully this works, not sure if you have approval rights

Correct, Bors and I aren't friends yet but that should to the trick

@calebcartwright
Copy link
Member

r=me with update to 1.4.29

@calebcartwright
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 6, 2020

📌 Commit 7da967c has been approved by calebcartwright

@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 Dec 6, 2020
@bors
Copy link
Contributor

bors commented Dec 6, 2020

⌛ Testing commit 7da967c with merge 5957f20...

@bors
Copy link
Contributor

bors commented Dec 6, 2020

☀️ Test successful - checks-actions
Approved by: calebcartwright
Pushing 5957f20 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 6, 2020
@bors bors merged commit 5957f20 into rust-lang:master Dec 6, 2020
@rustbot rustbot added this to the 1.50.0 milestone Dec 6, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #79737!

Tested on commit 5957f20.
Direct link to PR: #79737

🎉 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 Dec 6, 2020
@rust-highfive
📣 Toolstate changed by rust-lang/rust#79737!
9bd2eec 
Tested on commit rust-lang/rust@5957f20.
Direct link to PR: <rust-lang/rust#79737>

🎉 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).
@bors bors mentioned this pull request Dec 6, 2020
Closed
@Xanewok Xanewok deleted the update-rls branch December 6, 2020 10:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@calebcartwright calebcartwright Awaiting requested review from calebcartwright

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

Successfully merging this pull request may close these issues.

rustfmt no longer builds after rust-lang/rust#79336 rls no longer builds after rust-lang/rust#79336
5 participants
@Xanewok @rust-highfive @bors @calebcartwright @rustbot