Skip to content

Run rustfmt on librustc_typeck/check/ folder#36737

Merged
bors merged 1 commit into
rust-lang:masterfrom
srinivasreddy:check
Oct 12, 2016
Merged

Run rustfmt on librustc_typeck/check/ folder#36737
bors merged 1 commit into
rust-lang:masterfrom
srinivasreddy:check

Conversation

@srinivasreddy

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @Aatch

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

Comment thread src/librustc_typeck/check/writeback.rs Outdated

@Aatch Aatch Sep 26, 2016

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 isn't correct. It isn't supposed to be a doc comment.

Comment thread src/librustc_typeck/check/cast.rs Outdated

@jseyfried jseyfried Sep 26, 2016

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 misaligned -- rustfmt bug?

@bors

bors commented Sep 26, 2016

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Sep 29, 2016

Copy link
Copy Markdown
Collaborator

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

@srinivasreddy

Copy link
Copy Markdown
Contributor Author

r? @nrc

@rust-highfive rust-highfive assigned nrc and unassigned Aatch Oct 7, 2016
@nrc

nrc commented Oct 12, 2016

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Oct 12, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 4ef3f59 has been approved by nrc

a: Ty<'tcx>,
b: Ty<'tcx>)
-> CoerceResult<'tcx>
// FIXME(eddyb) use copyable iterators when that becomes ergonomic.

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.

Was this FIXME removed on purpose?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ooops. rustfmt removed it.

@bors

bors commented Oct 12, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 4ef3f59 with merge acb50e3...

bors added a commit that referenced this pull request Oct 12, 2016
Run rustfmt on librustc_typeck/check/ folder
@srinivasreddy

srinivasreddy commented Oct 12, 2016

Copy link
Copy Markdown
Contributor Author

@alexcrichton Can you please stop this merge? I got to keep the FIXME comment

r_b: &'tcx ty::Region,
mt_b: TypeAndMut<'tcx>)
-> CoerceResult<'tcx>
// FIXME(eddyb) use copyable iterators when that becomes ergonomic.

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.

another one

new: &'b hir::Expr,
new_ty: Ty<'tcx>)
-> RelateResult<'tcx, Ty<'tcx>>
// FIXME(eddyb) use copyable iterators when that becomes ergonomic.

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.

another

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants