Skip to content

Various rustfmt and commenting changes - #49969

Merged
bors merged 3 commits into
rust-lang:masterfrom
mark-i-m:allocator_fmt
Apr 18, 2018
Merged

Various rustfmt and commenting changes#49969
bors merged 3 commits into
rust-lang:masterfrom
mark-i-m:allocator_fmt

Conversation

@mark-i-m

@mark-i-mmark-i-m commented Apr 14, 2018

Copy link
Copy Markdown
Contributor

These are factored out of #49320

There aren't actually any changes in functionality, just rustfmt and doccomments.

@rust-highfive

rust-highfive commented Apr 14, 2018

Copy link
Copy Markdown
Contributor

r? @estebank

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 14, 2018
@mark-i-mmark-i-m mentioned this pull request Apr 14, 2018
Closed
@bors

bors commented Apr 16, 2018

Copy link
Copy Markdown
Collaborator

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

estebank
estebank reviewed Apr 16, 2018
View reviewed changes

@estebankestebank left a comment

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.

LGTM overall, fix the merge conflict and r=me. That being said, I'd lean towards really small rustfmt PRs to minimize the likelihood of causing merge conflicts for open PRs.

Comment threadsrc/librustc_driver/driver.rs Outdated

@estebankestebankApr 15, 2018

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.

this is an odd change

@mark-i-mmark-i-mApr 16, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I just ran rustfmt on the file. I'm guessing it is avoiding >=100 chars per line...

Comment threadsrc/librustc_driver/driver.rs Outdated

@estebankestebankApr 15, 2018

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.

I don't see this change as an improvement :-/

@mark-i-mmark-i-mApr 16, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Eh, I could accept either way...

@mark-i-m

mark-i-m commented Apr 16, 2018

Copy link
Copy Markdown
ContributorAuthor

@estebank Thanks :) Rebased.

@estebank

estebank commented Apr 16, 2018

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Apr 16, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit d984e4a has been approved by estebank

@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 Apr 16, 2018
@bors

bors commented Apr 17, 2018

Copy link
Copy Markdown
Collaborator

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

@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 Apr 17, 2018
@mark-i-m

mark-i-m commented Apr 17, 2018

Copy link
Copy Markdown
ContributorAuthor

@estebank rebased.

@estebank

estebank commented Apr 17, 2018

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Apr 17, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 787b705 has been approved by estebank

@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 Apr 17, 2018
@bors

bors commented Apr 18, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 787b705 with merge dcb44ca...

bors added a commit that referenced this pull request Apr 18, 2018
@bors
Auto merge of#49969- mark-i-m:allocator_fmt, r=estebank
dcb44ca
Various rustfmt and commenting changes
These are factored out of #49320
There aren't actually any changes in functionality, just rustfmt and doccomments.
@bors

bors commented Apr 18, 2018

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 787b705 into rust-lang:masterApr 18, 2018
@borsbors mentioned this pull request Apr 18, 2018
Closed
5 tasks
@mark-i-m
mark-i-m deleted the allocator_fmt branch November 14, 2018 16:40
@pnkfelixpnkfelix mentioned this pull request Dec 3, 2018
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estebankestebankestebank left review comments

Assignees

@estebankestebank

Labels

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.

4 participants

@mark-i-m@rust-highfive@bors@estebank