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

Select projections over impls in case of ambiguity. Fixes #23336. #23424

Merged
merged 1 commit into from
May 12, 2015
Merged

Select projections over impls in case of ambiguity. Fixes #23336. #23424

merged 1 commit into from
May 12, 2015

Conversation

arielb1
Copy link
Contributor

@arielb1 arielb1 commented Mar 16, 2015

@nikomatsakis
Copy link
Contributor

@arielb1 this looks good to me, modulo the nits in the comments.

@arielb1 arielb1 force-pushed the ambiguous-project branch from eeace7c to dfa094a Compare March 22, 2015 13:54
@bors
Copy link
Collaborator

bors commented Apr 2, 2015

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

@arielb1 arielb1 force-pushed the ambiguous-project branch from 5cc5121 to 2a12e51 Compare May 7, 2015 19:22
@arielb1
Copy link
Contributor Author

arielb1 commented May 7, 2015

Rebased and updated comment to be more correct.

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented May 11, 2015

📌 Commit 2a12e51 has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented May 11, 2015

⌛ Testing commit 2a12e51 with merge 8e4527e...

@tamird
Copy link
Contributor

tamird commented May 12, 2015

does this close #20297?

@alexcrichton
Copy link
Member

@bors: retry force

@bors
Copy link
Collaborator

bors commented May 12, 2015

⌛ Testing commit 2a12e51 with merge f2e1a1b...

bors added a commit that referenced this pull request May 12, 2015
@bors
Auto merge of #23424 - arielb1:ambiguous-project, r=nikomatsakis
f2e1a1b 
r? @nikomatsakis
@bors
Copy link
Collaborator

bors commented May 12, 2015

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-32-nopt-t, auto-win-32-opt, auto-win-64-nopt-t, auto-win-64-opt

@bors bors merged commit 2a12e51 into rust-lang:master May 12, 2015
@arielb1
Copy link
Contributor Author

arielb1 commented May 12, 2015

@tamird

No it doesn't

@arielb1 arielb1 mentioned this pull request May 20, 2015
Closed
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.
5 participants
@arielb1 @nikomatsakis @bors @tamird @alexcrichton