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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Mar 6, 2020
Merged

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

merged 2 commits into from
Mar 6, 2020

Conversation

petrochenkov
Copy link
Contributor

Follow-up to #69194.
r? @Centril

@rust-highfive rust-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
src/librustc_ast_pretty/pprust.rs
@@ -1413,8 +1398,29 @@ impl<'a> State<'a> {
}

crate fn print_assoc_item(&mut self, item: &ast::AssocItem) {
Copy link
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
Copy link
Contributor

Centril commented Feb 29, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Feb 29, 2020

📌 Commit 814067c542f53727a55e11bd17dc3750c0caccb1 has been approved by Centril

@bors bors 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
@bors bors 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
Copy link
Contributor Author

@bors r=Centril

@bors
Copy link
Contributor

bors commented Mar 1, 2020

📌 Commit 9c885d4 has been approved by Centril

@bors bors 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
Copy link
Contributor

bors commented Mar 5, 2020

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

@rust-highfive
Copy link
Collaborator

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
Copy link
Contributor

bors commented Mar 5, 2020

💔 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 Mar 5, 2020
@JohnTitor
Copy link
Member

Seems spurious.
@bors retry

@bors bors 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
Copy link
Contributor

bors commented Mar 6, 2020

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

@bors
Copy link
Contributor

bors commented Mar 6, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 6, 2020
@bors bors merged commit 4a1b69d into rust-lang:master Mar 6, 2020
This was referenced Mar 6, 2020
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Centril Centril Centril left review comments

Assignees

@Centril Centril

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: 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