rustfmt librustc_trans/save #28161

Merged
merged 2 commits into from Sep 5, 2015

Conversation

Projects
None yet
8 participants
@nrc
Member

nrc commented Sep 2, 2015

No description provided.

@rust-highfive

This comment has been minimized.

Show comment
Hide comment
@rust-highfive

rust-highfive Sep 2, 2015

Collaborator

r? @Aatch

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

Collaborator

rust-highfive commented Sep 2, 2015

r? @Aatch

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

@nrc nrc referenced this pull request in rust-lang-nursery/rustfmt Sep 2, 2015

Merged

Fix a bunch of misc. bugs I found #245

@nrc

This comment has been minimized.

Show comment
Hide comment
@nrc

nrc Sep 2, 2015

Member

Addressed bounds issue

Member

nrc commented Sep 2, 2015

Addressed bounds issue

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Sep 3, 2015

Contributor

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

Contributor

bors commented Sep 3, 2015

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

@nrc

This comment has been minimized.

Show comment
Hide comment
@nrc

nrc Sep 4, 2015

Member

r? @brson

Member

nrc commented Sep 4, 2015

r? @brson

@rust-highfive rust-highfive assigned brson and unassigned Aatch Sep 4, 2015

@brson

This comment has been minimized.

Show comment
Hide comment
@brson

brson Sep 4, 2015

Contributor

Damn good formatting, right here!

r=me

Contributor

brson commented Sep 4, 2015

Damn good formatting, right here!

r=me

@jroesch

This comment has been minimized.

Show comment
Hide comment
@jroesch

jroesch Sep 4, 2015

Member

Super excited about being able to run rustfmt on the compiler! 👍 👍

Member

jroesch commented Sep 4, 2015

Super excited about being able to run rustfmt on the compiler! 👍 👍

nrc added some commits Sep 2, 2015

@nrc

This comment has been minimized.

Show comment
Hide comment
@nrc

nrc Sep 4, 2015

Member

@bors: r=brson

Member

nrc commented Sep 4, 2015

@bors: r=brson

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Sep 4, 2015

Contributor

📌 Commit 6a127e9 has been approved by brson

Contributor

bors commented Sep 4, 2015

📌 Commit 6a127e9 has been approved by brson

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Sep 4, 2015

Contributor

⌛️ Testing commit 6a127e9 with merge b508991...

Contributor

bors commented Sep 4, 2015

⌛️ Testing commit 6a127e9 with merge b508991...

bors added a commit that referenced this pull request Sep 4, 2015

@alexcrichton

This comment has been minimized.

Show comment
Hide comment
@alexcrichton

alexcrichton Sep 4, 2015

Member

@bors: retry force

Member

alexcrichton commented Sep 4, 2015

@bors: retry force

bors added a commit that referenced this pull request Sep 4, 2015

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Sep 4, 2015

Contributor

⌛️ Testing commit 6a127e9 with merge 779b2a9...

Contributor

bors commented Sep 4, 2015

⌛️ Testing commit 6a127e9 with merge 779b2a9...

@@ -653,8 +647,8 @@ impl <'l, 'tcx> DumpCsvVisitor<'l, 'tcx> {
}
}
- fn process_mod(&mut self,
- item: &ast::Item) { // The module in question, represented as an item.
+ // `item` is the module in question, represented as an item.

This comment has been minimized.

@cburgdorf

cburgdorf Sep 4, 2015

Contributor

@nrc did you notice that it moved the comment from inside to outside of the function? Is this intentional?

@cburgdorf

cburgdorf Sep 4, 2015

Contributor

@nrc did you notice that it moved the comment from inside to outside of the function? Is this intentional?

This comment has been minimized.

@nrc

nrc Sep 5, 2015

Member

This was actually a manual fixup, so intentional. The comment is on the arg, so it doesn't matter if it is inside or outside the function.

(This is actually due to an interesting bug in rustfmt - we check to see if everything will fit on one line, then deal with 'inner' comments, in this case by appending them, which causes the line to overflow. It's tricky because the only indicator that the comment will start on the same line is the absence of a newline which isn't in anything's span. So I had to patch around the bug for now...).

@nrc

nrc Sep 5, 2015

Member

This was actually a manual fixup, so intentional. The comment is on the arg, so it doesn't matter if it is inside or outside the function.

(This is actually due to an interesting bug in rustfmt - we check to see if everything will fit on one line, then deal with 'inner' comments, in this case by appending them, which causes the line to overflow. It's tricky because the only indicator that the comment will start on the same line is the absence of a newline which isn't in anything's span. So I had to patch around the bug for now...).

@bors bors merged commit 6a127e9 into rust-lang:master Sep 5, 2015

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment