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

tools: Update rustfmt and re-enable testing #45597

Merged
merged 3 commits into from
Oct 29, 2017
Merged

tools: Update rustfmt and re-enable testing #45597

merged 3 commits into from
Oct 29, 2017

Conversation

DSpeckhals
Copy link
Contributor

This allows rustfmt and the RLS to test and compile again.

This allows rustfmt and the RLS to test and compile again.
@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @aturon (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 28, 2017
@kennytm
Copy link
Member

kennytm commented Oct 29, 2017

@bors r+ p=1

Thanks!

@bors
Copy link
Contributor

bors commented Oct 29, 2017

📌 Commit 1156455 has been approved by kennytm

@kennytm kennytm 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 Oct 29, 2017
@bors
Copy link
Contributor

bors commented Oct 29, 2017

⌛ Testing commit 1156455 with merge d2cdefbbdd19f2df5350987c3ad55f13a4b29fad...

@bors
Copy link
Contributor

bors commented Oct 29, 2017

💔 Test failed - status-appveyor

@kennytm
Copy link
Member

kennytm commented Oct 29, 2017

Legit error. rustfmt needs to be updated again.

error[E0004]: non-exhaustive patterns: `Ty` not covered
    --> src\tools\rustfmt\src\items.rs:2714:30
     |
2714 |         let item_str = match self.node {
     |                              ^^^^^^^^^ pattern `Ty` not covered
error: aborting due to previous error
error: Could not compile `rustfmt-nightly`.

@kennytm kennytm 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 Oct 29, 2017
@DSpeckhals
Copy link
Contributor Author

I will see if I can get rustfmt and then the submodule fixed within the next several hours.

@kennytm
Copy link
Member

kennytm commented Oct 29, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Oct 29, 2017

📌 Commit e3bf19d has been approved by kennytm

@DSpeckhals
Copy link
Contributor Author

This should be ready again. @nrc just merged rust-lang/rustfmt@9656627, which covers the non-exhaustive pattern.

@nrc
Copy link
Member

nrc commented Oct 29, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Oct 29, 2017

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Oct 29, 2017

📌 Commit e3bf19d has been approved by nrc

@bors
Copy link
Contributor

bors commented Oct 29, 2017

⌛ Testing commit e3bf19d with merge 90ef337...

bors added a commit that referenced this pull request Oct 29, 2017
tools: Update rustfmt and re-enable testing

This allows rustfmt and the RLS to test and compile again.
@bors
Copy link
Contributor

bors commented Oct 29, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: nrc
Pushing 90ef337 to master...

@bors bors merged commit e3bf19d into rust-lang:master Oct 29, 2017
@DSpeckhals DSpeckhals deleted the rustfmt-update branch October 30, 2017 02:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants