rustfmt librustc_trans/save #28698

Merged
merged 2 commits into from Oct 6, 2015

Conversation

Projects
None yet
5 participants
@nrc
Member

nrc commented Sep 27, 2015

No description provided.

@rust-highfive

This comment has been minimized.

Show comment
Hide comment
@rust-highfive

rust-highfive Sep 27, 2015

Collaborator

r? @jroesch

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

Collaborator

rust-highfive commented Sep 27, 2015

r? @jroesch

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

}
// Standard string for extents/location.
+ #[rustfmt_skip]

This comment has been minimized.

+ keywords::As) {
+ Some(sub_span) => Some(sub_span),
+ None => sub_span,
+ };

This comment has been minimized.

@nrc

nrc Sep 27, 2015

Member

This is not perfect - https://github.com/nrc/rustfmt/issues/388 - but I don't think it is so bad we should skip the function or block landing

@nrc

nrc Sep 27, 2015

Member

This is not perfect - https://github.com/nrc/rustfmt/issues/388 - but I don't think it is so bad we should skip the function or block landing

@nrc

This comment has been minimized.

Show comment
Hide comment
@nrc

nrc Sep 28, 2015

Member

The fail just needs to allow unknown attributes - an easy fix, so I'll wait for review first

Member

nrc commented Sep 28, 2015

The fail just needs to allow unknown attributes - an easy fix, so I'll wait for review first

@nrc

This comment has been minimized.

Show comment
Hide comment
@nrc

nrc Sep 28, 2015

Member

r? @brson

Member

nrc commented Sep 28, 2015

r? @brson

@rust-highfive rust-highfive assigned brson and unassigned jroesch Sep 28, 2015

@brson

This comment has been minimized.

Show comment
Hide comment
@brson

brson Sep 30, 2015

Contributor

@bors r+

Contributor

brson commented Sep 30, 2015

@bors r+

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Sep 30, 2015

Contributor

📌 Commit 6784c41 has been approved by brson

Contributor

bors commented Sep 30, 2015

📌 Commit 6784c41 has been approved by brson

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

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Sep 30, 2015

Contributor

⌛️ Testing commit 6784c41 with merge d482ed8...

Contributor

bors commented Sep 30, 2015

⌛️ Testing commit 6784c41 with merge d482ed8...

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Sep 30, 2015

Contributor

💔 Test failed - auto-linux-64-x-android-t

Contributor

bors commented Sep 30, 2015

💔 Test failed - auto-linux-64-x-android-t

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Oct 1, 2015

Contributor

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

Contributor

bors commented Oct 1, 2015

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

@nrc

This comment has been minimized.

Show comment
Hide comment
@nrc

nrc Oct 5, 2015

Member

@bors: r=brson

Member

nrc commented Oct 5, 2015

@bors: r=brson

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Oct 5, 2015

Contributor

📌 Commit 970639a has been approved by brson

Contributor

bors commented Oct 5, 2015

📌 Commit 970639a has been approved by brson

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Oct 6, 2015

Contributor

⌛️ Testing commit 970639a with merge ea721d9...

Contributor

bors commented Oct 6, 2015

⌛️ Testing commit 970639a with merge ea721d9...

bors added a commit that referenced this pull request Oct 6, 2015

@nrc

This comment has been minimized.

Show comment
Hide comment
@nrc

nrc Oct 6, 2015

Member

@bors: r=brson

Member

nrc commented Oct 6, 2015

@bors: r=brson

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Oct 6, 2015

Contributor

📌 Commit b22231c has been approved by brson

Contributor

bors commented Oct 6, 2015

📌 Commit b22231c has been approved by brson

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Oct 6, 2015

Contributor

⌛️ Testing commit b22231c with merge 3729b12...

Contributor

bors commented Oct 6, 2015

⌛️ Testing commit b22231c with merge 3729b12...

bors added a commit that referenced this pull request Oct 6, 2015

@bors bors merged commit b22231c into rust-lang:master Oct 6, 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