Skip to content

Rollup of 4 pull requests - #61309

Closed
Centril wants to merge 12 commits into
rust-lang:masterfrom
Centril:rollup-fptrauj
Closed

Rollup of 4 pull requests#61309
Centril wants to merge 12 commits into
rust-lang:masterfrom
Centril:rollup-fptrauj

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

estebankand 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
Fixrust-lang#61187.
Account for short-hand init structs when suggesting conversion
Fixrust-lang#52820.
…i-obk
is_union returns ty to avoid computing it twice
r? @oli-obk
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=4 rollup=never

@bors

bors commented May 29, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 60c8d20 has been approved by Centril

@borsbors 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
@CentrilCentril closed this May 29, 2019
@Centril
Centril deleted the rollup-fptrauj branch May 29, 2019 10:49
@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-borsStatus: 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

@Centril@bors@estebank@phansch@spastorino