Skip to content

Refactor pretty printing slightly - #42897

Merged
bors merged 4 commits into
rust-lang:masterfrom
Mark-Simulacrum:pretty-print-refactor
Jul 12, 2017
Merged

Refactor pretty printing slightly#42897
bors merged 4 commits into
rust-lang:masterfrom
Mark-Simulacrum:pretty-print-refactor

Conversation

@Mark-Simulacrum

Copy link
Copy Markdown
Member

This doesn't introduce any functional changes (that I'm aware of). The primary intention here is to clean up the code a little. Each commit is intended to stand alone, reviewing commit-by-commit may be easiest.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @pnkfelix

(rust_highfive has picked a reviewer for you, use r? to override)

@carols10cents

Copy link
Copy Markdown
Member

Aaaand one of the osx builds did that thing where it doesn't start :( Restarting it...

@carols10centscarols10cents added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 26, 2017
@bors

bors commented Jun 30, 2017

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #42902) made this pull request unmergeable. Please resolve the merge conflicts.

@aidanhsaidanhs 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 5, 2017
@aidanhs

Copy link
Copy Markdown
Contributor

@Mark-Simulacrum looks like this has conflicts that need resolving

@Mark-Simulacrum

Copy link
Copy Markdown
MemberAuthor

Okay, well, I resolved the conflicts but still need to rebase the branch -- I'll leave it as-is until I get a chance to do that...

@Mark-SimulacrumMark-Simulacrum added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 5, 2017
@bors

bors commented Jul 9, 2017

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #43115) made this pull request unmergeable. Please resolve the merge conflicts.

@arielb1arielb1 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 11, 2017
No (intentional) changes to behavior. This is intended to avoid the
anti-pattern of having to import individual methods throughout code.
The literal index was increased in only next_lit, so it isn't
necessary: code now uses an iterator. The cur_cmnt field is also moved
to be increased in print_comment instead of after each call to
print_comment.
This is needless noise; the closure we take is FnOnce, so move || {} is
fine to pass other parameters necessary.
@Mark-Simulacrum

Copy link
Copy Markdown
MemberAuthor

Rebased.

@Mark-SimulacrumMark-Simulacrum added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 11, 2017
@jseyfried

Copy link
Copy Markdown
Contributor

r? @jseyfried

@jseyfriedjseyfried assigned jseyfried and unassigned pnkfelixJul 11, 2017
@jseyfried

Copy link
Copy Markdown
Contributor

Nice!
@bors r+

@bors

bors commented Jul 12, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 40f03a1 has been approved by jseyfried

@bors

bors commented Jul 12, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 40f03a1 with merge b2b19ec...

bors added a commit that referenced this pull request Jul 12, 2017
…ried
Refactor pretty printing slightly
This doesn't introduce any functional changes (that I'm aware of). The primary intention here is to clean up the code a little. Each commit is intended to stand alone, reviewing commit-by-commit may be easiest.
@bors

bors commented Jul 12, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: jseyfried
Pushing b2b19ec to master...

@bors
bors merged commit 40f03a1 into rust-lang:masterJul 12, 2017
@Mark-Simulacrum
Mark-Simulacrum deleted the pretty-print-refactor branch June 8, 2019 13:51
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@Mark-Simulacrum@rust-highfive@carols10cents@bors@aidanhs@jseyfried@pnkfelix@arielb1