Skip to content

ast: Unmerge structures for associated items and foreign items - #69586

Merged
bors merged 2 commits into
rust-lang:masterfrom
petrochenkov:unmerge
Mar 6, 2020
Merged

ast: Unmerge structures for associated items and foreign items#69586
bors merged 2 commits into
rust-lang:masterfrom
petrochenkov:unmerge

Conversation

@petrochenkov

@petrochenkovpetrochenkov commented Feb 29, 2020

Copy link
Copy Markdown
Contributor

Follow-up to #69194.
r? @Centril

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 29, 2020
Centril
Centril reviewed Feb 29, 2020
View reviewed changes
Comment threadsrc/librustc_ast_pretty/pprust.rs Outdated

@CentrilCentrilFeb 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm; the duplication here and in visit.rs isn't great. Let's follow up with the common structs to get some more code reuse.

@Centril

Centril commented Feb 29, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 29, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 814067c542f53727a55e11bd17dc3750c0caccb1 has been approved by Centril

@borsbors 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 Feb 29, 2020
@bors

This comment has been minimized.

Sign in to view
@borsbors 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 Mar 1, 2020
@petrochenkov

petrochenkov commented Mar 1, 2020

Copy link
Copy Markdown
ContributorAuthor

@bors r=Centril

@bors

bors commented Mar 1, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 9c885d4 has been approved by Centril

@borsbors 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 Mar 1, 2020
@bors

bors commented Mar 5, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 9c885d4 with merge 1e1911f08ee5046975e3acbbabd1f62a60ab53c0...

@rust-highfive

rust-highfive commented Mar 5, 2020

Copy link
Copy Markdown
Contributor

Your PR failed (pretty log, 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 @rust-lang/infra. (Feature Requests)

@bors

bors commented Mar 5, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-azure

@borsbors 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 Mar 5, 2020
@JohnTitor

JohnTitor commented Mar 5, 2020

Copy link
Copy Markdown
Member

Seems spurious.
@bors retry

@borsbors 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 Mar 5, 2020
@bors

bors commented Mar 6, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 9c885d4 with merge 4a1b69d...

@bors

bors commented Mar 6, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 4a1b69d to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Mar 6, 2020
@bors
bors merged commit 4a1b69d into rust-lang:masterMar 6, 2020
This was referenced Mar 6, 2020
Merged
Merged
@petrochenkov
petrochenkov deleted the unmerge branch February 22, 2025 18:33
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@CentrilCentrilCentril left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@CentrilCentril

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: 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.

5 participants

@petrochenkov@Centril@bors@rust-highfive@JohnTitor