Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
arielb1:ambiguous-project
May 12, 2015
Merged

Select projections over impls in case of ambiguity. Fixes #23336.#23424
bors merged 1 commit into
rust-lang:masterfrom
arielb1:ambiguous-project

Conversation

@arielb1

Copy link
Copy Markdown
Contributor

@nikomatsakis

Copy link
Copy Markdown
Contributor

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

@bors

bors commented Apr 2, 2015

Copy link
Copy Markdown
Collaborator

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

@arielb1
arielb1force-pushed the ambiguous-project branch from 5cc5121 to 2a12e51CompareMay 7, 2015 19:22
@arielb1

Copy link
Copy Markdown
ContributorAuthor

Rebased and updated comment to be more correct.

@nikomatsakis

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented May 11, 2015

Copy link
Copy Markdown
Collaborator

📌 Commit 2a12e51 has been approved by nikomatsakis

@bors

bors commented May 11, 2015

Copy link
Copy Markdown
Collaborator

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

@tamird

Copy link
Copy Markdown
Contributor

does this close #20297?

@alexcrichton

Copy link
Copy Markdown
Member

@bors: retry force

@bors

bors commented May 12, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 2a12e51 with merge f2e1a1b...

@bors

bors commented May 12, 2015

Copy link
Copy Markdown
Collaborator

@bors
bors merged commit 2a12e51 into rust-lang:masterMay 12, 2015
@arielb1

Copy link
Copy Markdown
ContributorAuthor

@tamird

No it doesn't

Sign up for freeto 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.

5 participants

@arielb1@nikomatsakis@bors@tamird@alexcrichton