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 4 pull requests #61309

Closed
wants to merge 12 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented May 29, 2019

Successful merges:

Failed merges:

r? @ghost

estebank and others added 12 commits May 25, 2019 13:13
Extracted from work on rust-lang#59346. This moves the annotation collection to
the `FileWithAnnotatedLines` impl to allow re-use in a separate
EmitterWriter.
…gs1, r=estebank

librustc_errors: Move annotation collection to own impl

Extracted from work on rust-lang#59346. This moves the annotation collection to
the `FileWithAnnotatedLines` impl to allow easier re-use in a separate
EmitterWriter. Even without that new EmitterWriter present, I think it makes
sense to have this as an associated function.
Do not ICE on missing access place description during mutability error reporting

Fix rust-lang#61187.
Account for short-hand init structs when suggesting conversion

Fix rust-lang#52820.
…i-obk

is_union returns ty to avoid computing it twice

r? @oli-obk
@Centril
Copy link
Contributor Author

Centril commented May 29, 2019

@bors r+ p=4 rollup=never

@bors
Copy link
Contributor

bors commented May 29, 2019

📌 Commit 60c8d20 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 May 29, 2019
@Centril Centril closed this May 29, 2019
@Centril Centril deleted the rollup-fptrauj branch May 29, 2019 10:49
@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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants