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

Revert #39485, fixing type-inference regressions #40636

Merged
merged 2 commits into from
Mar 25, 2017

Conversation

nikomatsakis
Copy link
Contributor

This reverts PR #39485, which should fix the immediate regressions. Eventually I'd like to land #40224 -- or some variant of it -- which revisits the question fo dead-code and inference.

r? @eddyb
cc @canndrew

@nikomatsakis nikomatsakis added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 18, 2017
@nikomatsakis
Copy link
Contributor Author

Note: I haven't had time to fully test this. =) Gotta run, but I've got a build going and will check back in.

@nikomatsakis
Copy link
Contributor Author

OK, did some testing. As expected, this will fix #39984, but it will not help with #39808 (which is a stable-to-stable regression). That needs #40224.

@eddyb
Copy link
Member

eddyb commented Mar 21, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Mar 21, 2017

📌 Commit f2150ae has been approved by eddyb

@bors
Copy link
Contributor

bors commented Mar 21, 2017

🔒 Merge conflict

@bors
Copy link
Contributor

bors commented Mar 21, 2017

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

… r=nikomatsakis"

This reverts commit dc0bb3f, reversing
changes made to e879aa4.

This is a temporary step intended to fix regressions. A more
comprehensive fix for type inference and dead-code is in the works.
@arielb1
Copy link
Contributor

arielb1 commented Mar 23, 2017

@bors r=eddyb

@bors
Copy link
Contributor

bors commented Mar 23, 2017

📌 Commit 0f1eb8a has been approved by eddyb

@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Mar 23, 2017
@nikomatsakis
Copy link
Contributor Author

Marking as beta-accepted. Small patch, minimal risk, regression.

cc @rust-lang/compiler

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 24, 2017
Revert rust-lang#39485, fixing type-inference regressions

This reverts PR rust-lang#39485, which should fix the immediate regressions. Eventually I'd like to land rust-lang#40224 -- or some variant of it -- which revisits the question fo dead-code and inference.

r? @eddyb
cc @canndrew
bors added a commit that referenced this pull request Mar 24, 2017
Rollup of 5 pull requests

- Successful merges: #40501, #40524, #40636, #40739, #40756
- Failed merges:
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 24, 2017
Revert rust-lang#39485, fixing type-inference regressions

This reverts PR rust-lang#39485, which should fix the immediate regressions. Eventually I'd like to land rust-lang#40224 -- or some variant of it -- which revisits the question fo dead-code and inference.

r? @eddyb
cc @canndrew
bors added a commit that referenced this pull request Mar 24, 2017
Rollup of 8 pull requests

- Successful merges: #40567, #40602, #40636, #40739, #40756, #40790, #40794, #40803
- Failed merges:
@bors bors merged commit 0f1eb8a into rust-lang:master Mar 25, 2017
bors added a commit that referenced this pull request Apr 1, 2017
…chton

Backport #40636 to beta

I suspect that this will help with #40953 but have not been able to verify for...reasons.

r? @alexcrichton
cc @brson
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 1, 2017
@nikomatsakis nikomatsakis deleted the revert-39485 branch April 14, 2017 10:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants