Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

run rustfmt on typecheck/coherence folder #35892

Merged
merged 1 commit into from
Sep 29, 2016
Merged

run rustfmt on typecheck/coherence folder #35892

merged 1 commit into from
Sep 29, 2016

Conversation

srinivasreddy
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @Aatch

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

@srinivasreddy
Copy link
Contributor Author

r? @nikomatsakis

@rust-highfive rust-highfive assigned nikomatsakis and unassigned Aatch Aug 23, 2016
@nikomatsakis
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 26, 2016

📌 Commit b9b395a has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Aug 27, 2016

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

@srinivasreddy
Copy link
Contributor Author

@nikomatsakis rollup pls

@bors
Copy link
Contributor

bors commented Aug 30, 2016

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

@nikomatsakis
Copy link
Contributor

@srinivasreddy

rollup pls

Not sure what you meant by this?

@srinivasreddy
Copy link
Contributor Author

This #35892 (comment).

@nikomatsakis
Copy link
Contributor

@srinivasreddy I'm still not sure what you meant by that :)

@srinivasreddy
Copy link
Contributor Author

@nikomatsakis ping.

@bors
Copy link
Contributor

bors commented Sep 5, 2016

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

srinivasreddy
srinivasreddy reviewed Sep 6, 2016
View reviewed changes
src/librustc_typeck/coherence/orphan.rs
@@ -68,7 +77,7 @@ impl<'cx, 'tcx> OrphanChecker<'cx, 'tcx> {
fn check_item(&self, item: &hir::Item) {
let def_id = self.tcx.map.local_def_id(item.id);
match item.node {
hir::ItemImpl(.., None, ref ty, _) => {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Isn't this a bug in rustfmt? cc @nrc

Copy link
Member

Choose a reason for hiding this comment

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

yikes, looks like it

Copy link
Member

Choose a reason for hiding this comment

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

rust-lang/rustfmt#1150

@bors
Copy link
Contributor

bors commented Sep 9, 2016

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

@nikomatsakis
Copy link
Contributor

@srinivasreddy sorry, been AFK due to RustConf prep etc. Seems like we have merge conflicts now =(

@bors
Copy link
Contributor

bors commented Sep 22, 2016

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

@nikomatsakis
Copy link
Contributor

Still merge conflicts =(

@srinivasreddy
Copy link
Contributor Author

@nikomatsakis Done. 😄

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Sep 28, 2016

📌 Commit a33b921 has been approved by nikomatsakis

@sophiajt sophiajt mentioned this pull request Sep 29, 2016
Merged
sophiajt pushed a commit to sophiajt/rust that referenced this pull request Sep 29, 2016
Rollup merge of rust-lang#35892 - srinivasreddy:typeck/coherence, r=n…
55c9bc2 
…ikomatsakis

run rustfmt on typecheck/coherence folder
bors added a commit that referenced this pull request Sep 29, 2016
@bors
Auto merge of #36818 - jonathandturner:rollup, r=jonathandturner
91f34c0 
Rollup of 12 pull requests

- Successful merges: #35286, #35892, #36460, #36704, #36741, #36760, #36787, #36789, #36794, #36803, #36811, #36813
- Failed merges:
@bors bors merged commit a33b921 into rust-lang:master Sep 29, 2016
@srinivasreddy srinivasreddy deleted the typeck/coherence branch September 29, 2016 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@srinivasreddy @rust-highfive @nikomatsakis @bors @nrc @Aatch