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

Rollup of 5 pull requests #64076

Closed
wants to merge 18 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 1, 2019

Successful merges:

Failed merges:

r? @ghost

estebank and others added 18 commits August 31, 2019 18:34
An initial refactoring before working on rust-lang#61809.

This moves the whole block into a method so that it can be reused in the
annotate-snippet output. It's already used in the new emitter, but
there's no UI tests with suggestions included in this PR.

A first look at some UI tests with suggestions showed that there's some
more work to do in [annotate-snippet-rs][annotate-snippet-rs] before the
new output is closer to the current one.
Emit a single error on if expr with expectation and no else clause

Fix rust-lang#60254.

r? @Centril
…ntril

Account for arbitrary self types in E0599

Fix rust-lang#62373
…bank

librustc_errors: Extract sugg/subst handling into method

An initial refactoring before working on rust-lang#61809.

This moves the whole block into a method so that it can be reused in the
annotate-snippet emitter. The method is already used in the new emitter, but
there's no UI tests with suggestions included in this PR.

A first look at some UI tests with suggestions showed that there's some
more work to do in [annotate-snippet-rs][annotate-snippet-rs] before the new output is closer to the
current one, so I opted to do that in a second step.

r? @estebank

[annotate-snippet-rs]: https://github.com/rust-lang/annotate-snippets-rs
use just one name when parameters and fields are the same
@Centril
Copy link
Contributor Author

Centril commented Sep 1, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Sep 1, 2019

📌 Commit 36282e6 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 1, 2019
@bors
Copy link
Contributor

bors commented Sep 1, 2019

⌛ Testing commit 36282e6 with merge 3fb1229d70551beb25904c501154c66f8571622c...

@rust-highfive
Copy link
Collaborator

The job mingw-check of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Sep 1, 2019

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 1, 2019
@alex
Copy link
Member

alex commented Sep 1, 2019

FYI, this is at least the 3rd, if not more, build I've seen fail on a TLS error.

@Centril
Copy link
Contributor Author

Centril commented Sep 1, 2019

@bors retry

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 1, 2019
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 1, 2019
@bors
Copy link
Contributor

bors commented Sep 2, 2019

⌛ Testing commit 36282e6 with merge 1963d025216789ebb7e3e6e9acd6a7b8df81e0e6...

@bors
Copy link
Contributor

bors commented Sep 2, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job dist-i686-linux of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 2, 2019
@Centril Centril closed this Sep 2, 2019
@Centril Centril deleted the rollup-ayk9u33 branch September 2, 2019 19:56
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants