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 Rustfmt #49957

Merged
merged 1 commit into from
Apr 14, 2018
Merged

Update Rustfmt #49957

merged 1 commit into from
Apr 14, 2018

Conversation

nrc
Copy link
Member

@nrc nrc commented Apr 13, 2018

Should fix broken RLS/nightlies

r? @alexcrichton

@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 Apr 13, 2018
@nrc nrc mentioned this pull request Apr 13, 2018
Merged
@Mark-Simulacrum
Copy link
Member

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Apr 14, 2018

📌 Commit a64f323 has been approved by Mark-Simulacrum

@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 Apr 14, 2018
@nrc
Copy link
Member Author

nrc commented Apr 14, 2018

@bors: p=10 (fixes nightly)

@bors
Copy link
Contributor

bors commented Apr 14, 2018

🔒 Merge conflict

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 14, 2018
@nrc
Copy link
Member Author

nrc commented Apr 14, 2018

@bors: r=simulacrum p=10

@bors
Copy link
Contributor

bors commented Apr 14, 2018

📌 Commit eb1b502 has been approved by simulacrum

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 14, 2018
@bors
Copy link
Contributor

bors commented Apr 14, 2018

⌛ Testing commit eb1b502 with merge 410e895...

bors added a commit that referenced this pull request Apr 14, 2018
@bors
Auto merge of #49957 - nrc:update, r=simulacrum
410e895 
Update Rustfmt

Should fix broken RLS/nightlies

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Apr 14, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: simulacrum
Pushing 410e895 to master...

@bors bors merged commit eb1b502 into rust-lang:master Apr 14, 2018
@kennytm-githubbot
Copy link

📣 Toolstate changed by #49957!

Tested on commit 410e895.
Direct link to PR: #49957

🎉 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.

kennytm-githubbot added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 14, 2018
@kennytm-githubbot
📣 Toolstate changed by rust-lang/rust#49957!
3535266 
Tested on commit rust-lang/rust@410e895.
Direct link to PR: <rust-lang/rust#49957>

🎉 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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

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.
6 participants
@nrc @rust-highfive @Mark-Simulacrum @bors @kennytm-githubbot @alexcrichton