Remove the "leak check" in favor of "universes" by sgrif · Pull Request #48407 · rust-lang/rust

sgrif · 2018-02-21T20:36:57Z

See #48049 and https://gist.github.com/nikomatsakis/87822133b2d85ccac801e08bcb9702de for context. This branch is not yet expected to pass compile-fail or UI tests, nor does it work with NLL. However, it should be ready for a crater run. This PR requires #47861.

r? @nikomatsakis

nikomatsakis · 2018-02-21T23:35:09Z

@bors try

As @sgrif said, we'd like to do a crater run first, and then fix the build failures etc.

bors · 2018-02-21T23:35:15Z

🔒 Merge conflict

sgrif · 2018-02-22T03:23:01Z

I'll fix the merge conflict in the morning

bors · 2018-02-22T14:27:05Z

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

shepmaster · 2018-03-02T19:18:19Z

Ping from triage, @sgrif! We haven't heard from you in a week; perhaps you have moved to a very polar location and "morning" takes a few weeks to occur 😇?

nikomatsakis · 2018-03-03T11:48:12Z

I think @sgrif was waiting to #47861 to land... which it has now.

nikomatsakis · 2018-03-03T11:49:04Z

@sgrif

As noted on gitter, we need to remove the universe from ParamEnv, now that we it is added into InferCtxt.

sgrif · 2018-03-04T22:26:17Z

Yup, was waiting on that (and just had a busy week at work which kept me from having time to work on this). Still on the radar, planning on just deleting all the compile-fail and ui tests that are failing in order to get a crater run going.

sgrif · 2018-03-06T16:45:16Z

@rust-lang/release needs crater

emilyalbini · 2018-03-06T22:13:51Z

Added to the queue (there are 3 other PRs waiting before this one).

Edit: a try run is also needed

sgrif · 2018-03-06T22:38:16Z

@nikomatsakis Can you ask bors for me please :)

nikomatsakis · 2018-03-07T18:53:34Z

@sgrif I would but I see travis is sad

bors · 2018-03-08T01:02:38Z

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

This reverts commit 755bdaa.

This reverts commit 17df455.

This reverts commit a985634.

This reverts commit 35e78b5.

This reverts commit d4df52c.

This reverts commit 13efaf0.

Always using root environment for now.

This gives each type inference variable a notion of universe but doesn't do anything with it. We can always get the "current universe" from infer_ctxt. This relies on the property of type variables that they can never interact with siblings.

aidanhs · 2018-03-15T11:21:23Z

Just as a passing note - this has no try run so can't be crater run. I've marked it back as waiting on author (merge conflicts will need resolving, tests don't need to pass but it's usually a good idea).

bors · 2018-03-20T12:52:45Z

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

sgrif · 2018-03-23T21:58:37Z

This is essentially blocked on #48696. I'm working on a fix

@nikomatsakis

Remove universes from `ty::ParamEnv` This change was never meant to land. #48407 takes an alternate approach. However, that PR is now blocked on some issues with canonicalization, and rebasing these reverts gets harder each time, so let's just get this bit out of the way now. r? @nikomatsakis

Since `ReSkolemized` has the flag `KEEP_IN_LOCAL_TCX`, and canonicalization is meant to ensure that flag is no longer present, it implicitly is depending on the existence of the leak check. However, since we want to remove that in rust-lang#48407, we can no longer make that assumption. This is related to rust-lang#48696, but does not resolve it. This does unblock that PR, however. It could have been tacked on there, but I wanted to make sure this is a reasonable short term approach separately from that.

@nikomatsakis

…matsakis Refactorings in preparation for the removal of the leak check This contains all of the commits from #48407 that I was able to pull out on their own. This has most of the refactoring/ground work to unblock other work, but without the behavior changes that still need a crater run and NLL changes. r? @nikomatsakis

shepmaster · 2018-05-06T22:52:44Z

This has been blocked for a long time and seemingly on a chain of dependencies. There's quite a lot of merge conflicts. Does this PR have any value in its current state?

nikomatsakis · 2018-05-07T18:07:30Z

@shepmaster in its current state no but I think we are more or less at the point where @sgrif can rebase

sgrif · 2018-05-07T22:59:40Z

Yeah, I'm hoping to spend some time on it this week now that #50397 has been pulled out as a subset.

sgrif · 2018-05-13T11:37:17Z

I'm on vacation for a while, so I'm going to close this until I can get it rebased

rust-highfive assigned nikomatsakis Feb 21, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 21, 2018

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 21, 2018

nikomatsakis mentioned this pull request Feb 25, 2018
🔬 move to universe-based lifetimes #48536
Closed

nikomatsakis mentioned this pull request Mar 3, 2018
tracking issue for "chalkification" #48049
Closed
5 tasks

sgrif force-pushed the sg-universe-refactorings branch from 0d0ca02 to 123ff00Compare March 6, 2018 16:45

emilyalbini added S-waiting-on-crater Status: Waiting on a crater run to be completed. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 6, 2018

sgrif added 8 commits March 14, 2018 13:51

Revert "change skolemizations to use universe index"
48df576
This reverts commit 755bdaa.

Revert "fix tests in librustc_driver"
50bd71c
This reverts commit 17df455.

Revert "fix tidy error"
5dad682
This reverts commit a985634.

Revert "change skolemizations to use universe index"
2a94f30
This reverts commit 35e78b5.

Revert "introduce UniverseIndex into ParamEnv"
f6e6d23
This reverts commit d4df52c.

Revert "add universes to type inference variables"
26d1fc7
This reverts commit 13efaf0.

introduce UniverseIndex into InferCtxt
3d4791b
Always using root environment for now.

add universes to type inference variables
ff17bd7
This gives each type inference variable a notion of universe but doesn't do anything with it. We can always get the "current universe" from infer_ctxt. This relies on the property of type variables that they can never interact with siblings.

Fix rebase issues
3f599ad

sgrif force-pushed the sg-universe-refactorings branch from c6b875d to 3f599adCompare March 19, 2018 17:04

sgrif mentioned this pull request Mar 23, 2018
Remove universes from ty::ParamEnv#49313
Merged

shepmaster added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 23, 2018

shepmaster added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Mar 30, 2018

sgrif mentioned this pull request Apr 2, 2018
Always canonicalize skolemized regions #49598
Closed

shepmaster added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Apr 7, 2018

TimNN added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Apr 17, 2018

sgrif mentioned this pull request Apr 23, 2018
handle universes in canonicalization #48696
Closed

TimNN added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Apr 24, 2018

sgrif mentioned this pull request May 2, 2018
Refactorings in preparation for the removal of the leak check #50397
Merged

shepmaster added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels May 6, 2018

sgrif closed this May 13, 2018

Uh oh!

Uh oh!

Conversation

sgrif commented Feb 21, 2018

Uh oh!

nikomatsakis commented Feb 21, 2018

Uh oh!

bors commented Feb 21, 2018

Uh oh!

sgrif commented Feb 22, 2018

Uh oh!

bors commented Feb 22, 2018

Uh oh!

shepmaster commented Mar 2, 2018

Uh oh!

nikomatsakis commented Mar 3, 2018

Uh oh!

nikomatsakis commented Mar 3, 2018

Uh oh!

sgrif commented Mar 4, 2018

Uh oh!

sgrif commented Mar 6, 2018

Uh oh!

emilyalbini commented Mar 6, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sgrif commented Mar 6, 2018

Uh oh!

nikomatsakis commented Mar 7, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Mar 8, 2018

Uh oh!

aidanhs commented Mar 15, 2018

Uh oh!

bors commented Mar 20, 2018

Uh oh!

sgrif commented Mar 23, 2018

Uh oh!

shepmaster commented May 6, 2018

Uh oh!

nikomatsakis commented May 7, 2018

Uh oh!

sgrif commented May 7, 2018

Uh oh!

sgrif commented May 13, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

emilyalbini commented Mar 6, 2018•
edited
Loading

nikomatsakis commented Mar 7, 2018•
edited
Loading