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, Rustfmt, and Cargo #51118

Merged
merged 1 commit into from
May 28, 2018
Merged

Update RLS, Rustfmt, and Cargo #51118

merged 1 commit into from
May 28, 2018

Conversation

nrc
Copy link
Member

@nrc nrc commented May 28, 2018

r? @Mark-Simulacrum

Should fix broken rustfmt and RLS builds - Cargo update is needed for compatibility with RLS

@rust-highfive
Copy link
Collaborator

warning Warning 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 28, 2018
@oli-obk
Copy link
Contributor

oli-obk commented May 28, 2018

@bors r+ p=42

@bors
Copy link
Contributor

bors commented May 28, 2018

📌 Commit 0e6fff8 has been approved by oli-obk

@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 28, 2018
@bors
Copy link
Contributor

bors commented May 28, 2018

⌛ Testing commit 0e6fff8 with merge 2b1d69d...

bors added a commit that referenced this pull request May 28, 2018
@bors
Auto merge of #51118 - nrc:update, r=oli-obk
2b1d69d 
Update RLS, Rustfmt, and Cargo

r? @Mark-Simulacrum

Should fix broken rustfmt and RLS builds - Cargo update is needed for compatibility with RLS
@bors
Copy link
Contributor

bors commented May 28, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 2b1d69d to master...

@bors bors merged commit 0e6fff8 into rust-lang:master May 28, 2018
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #51118!

Tested on commit 2b1d69d.
Direct link to PR: #51118

🎉 rls on windows: build-fail → test-pass.
🎉 rls on linux: build-fail → test-pass.
🎉 rustfmt on windows: build-fail → test-pass.
🎉 rustfmt on linux: build-fail → test-pass.

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request May 28, 2018
@rust-highfive
📣 Toolstate changed by rust-lang/rust#51118!
468ec08 
Tested on commit rust-lang/rust@2b1d69d.
Direct link to PR: <rust-lang/rust#51118>

🎉 rls on windows: build-fail → test-pass.
🎉 rls on linux: build-fail → test-pass.
🎉 rustfmt on windows: build-fail → test-pass.
🎉 rustfmt on linux: build-fail → test-pass.
This was referenced May 28, 2018
Merged
Merged
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
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nrc @rust-highfive @oli-obk @bors @Mark-Simulacrum