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.

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

Remove unification despite ambiguity in projection #33555

Merged
merged 1 commit into from
May 14, 2016

Conversation

soltanmm
Copy link

Turns out that closures aren't explicitly considered in project.rs, so the ambiguity handling w.r.t. closures can just be removed as the change done in select.rs covers it.

r? @nikomatsakis

@bors
Copy link
Contributor

bors commented May 11, 2016

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

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented May 11, 2016

📌 Commit 4e5a2e0 has been approved by nikomatsakis

Manishearth added a commit to Manishearth/rust that referenced this pull request May 12, 2016
…sakis

Remove unification despite ambiguity in projection

Turns out that closures aren't explicitly considered in `project.rs`, so the ambiguity handling w.r.t. closures can just be removed as the change done in `select.rs` covers it.

r? @nikomatsakis
eddyb added a commit to eddyb/rust that referenced this pull request May 12, 2016
…sakis

Remove unification despite ambiguity in projection

Turns out that closures aren't explicitly considered in `project.rs`, so the ambiguity handling w.r.t. closures can just be removed as the change done in `select.rs` covers it.

r? @nikomatsakis
bors added a commit that referenced this pull request May 12, 2016
eddyb added a commit to eddyb/rust that referenced this pull request May 13, 2016
…sakis

Remove unification despite ambiguity in projection

Turns out that closures aren't explicitly considered in `project.rs`, so the ambiguity handling w.r.t. closures can just be removed as the change done in `select.rs` covers it.

r? @nikomatsakis
Manishearth added a commit to Manishearth/rust that referenced this pull request May 14, 2016
…sakis

Remove unification despite ambiguity in projection

Turns out that closures aren't explicitly considered in `project.rs`, so the ambiguity handling w.r.t. closures can just be removed as the change done in `select.rs` covers it.

r? @nikomatsakis
bors added a commit that referenced this pull request May 14, 2016
Rollup of 9 pull requests

- Successful merges: #33544, #33552, #33554, #33555, #33560, #33566, #33572, #33574, #33576
- Failed merges:
@bors bors merged commit 4e5a2e0 into rust-lang:master May 14, 2016
@soltanmm soltanmm deleted the ambiguous-nixon branch May 14, 2016 20:31
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.

4 participants