Skip to content

run rustfmt on typecheck/coherence folder - #35892

Merged
bors merged 1 commit into
rust-lang:masterfrom
srinivasreddy:typeck/coherence
Sep 29, 2016
Merged

run rustfmt on typecheck/coherence folder#35892
bors merged 1 commit into
rust-lang:masterfrom
srinivasreddy:typeck/coherence

Conversation

@srinivasreddy

@srinivasreddysrinivasreddy commented Aug 22, 2016

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

rust-highfive commented Aug 22, 2016

Copy link
Copy Markdown
Contributor

r? @Aatch

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

@srinivasreddy

srinivasreddy commented Aug 23, 2016

Copy link
Copy Markdown
ContributorAuthor

r? @nikomatsakis

@nikomatsakis

nikomatsakis commented Aug 26, 2016

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Aug 26, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit b9b395a has been approved by nikomatsakis

@bors

bors commented Aug 27, 2016

Copy link
Copy Markdown
Collaborator

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

@srinivasreddy

srinivasreddy commented Aug 27, 2016

Copy link
Copy Markdown
ContributorAuthor

@nikomatsakis rollup pls

@bors

bors commented Aug 30, 2016

Copy link
Copy Markdown
Collaborator

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

@nikomatsakis

nikomatsakis commented Aug 31, 2016

Copy link
Copy Markdown
Contributor

@srinivasreddy

rollup pls

Not sure what you meant by this?

@srinivasreddy

srinivasreddy commented Aug 31, 2016

Copy link
Copy Markdown
ContributorAuthor

This #35892 (comment).

@nikomatsakis

nikomatsakis commented Sep 2, 2016

Copy link
Copy Markdown
Contributor

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

@srinivasreddy

srinivasreddy commented Sep 4, 2016

Copy link
Copy Markdown
ContributorAuthor

@nikomatsakis ping.

@bors

bors commented Sep 5, 2016

Copy link
Copy Markdown
Collaborator

☔ 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
Comment threadsrc/librustc_typeck/coherence/orphan.rs Outdated

@srinivasreddysrinivasreddySep 6, 2016

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.

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

@nrcnrcSep 6, 2016

Copy link
Copy Markdown
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

@nrcnrcSep 6, 2016

Copy link
Copy Markdown
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

bors commented Sep 9, 2016

Copy link
Copy Markdown
Collaborator

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

@nikomatsakis

nikomatsakis commented Sep 13, 2016

Copy link
Copy Markdown
Contributor

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

@bors

bors commented Sep 22, 2016

Copy link
Copy Markdown
Collaborator

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

@nikomatsakis

nikomatsakis commented Sep 23, 2016

Copy link
Copy Markdown
Contributor

Still merge conflicts =(

@srinivasreddy

srinivasreddy commented Sep 26, 2016

Copy link
Copy Markdown
ContributorAuthor

@nikomatsakis Done. 😄

@nikomatsakis

nikomatsakis commented Sep 28, 2016

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Sep 28, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit a33b921 has been approved by nikomatsakis

@sophiajtsophiajt mentioned this pull request Sep 29, 2016
Merged
sophiajt pushed a commit to sophiajt/rust that referenced this pull request Sep 29, 2016
Jonathan Turner
Rollup merge ofrust-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:masterSep 29, 2016
@srinivasreddy
srinivasreddy deleted the typeck/coherence branch September 29, 2016 13:27
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nikomatsakisnikomatsakis

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