universes refactor 3 #55305

nikomatsakis · 2018-10-24T10:00:21Z

Some more refactorings from my universe branch. These are getting a bit more "invasive" -- they start to plumb the universe information through the canonicalization process. As of yet though I don't believe this branch changes our behavior in any notable way, though I'm marking the branch as WIP to give myself a chance to verify this.

r? @scalexm

nikomatsakis · 2018-10-24T10:00:34Z

r? @scalexm

scalexm · 2018-10-24T16:38:23Z

src/librustc/infer/canonical/mod.rs

-    Region,
+    Region(ty::UniverseIndex),
+
+    /// Region variable `'?R`.


I don't think you wanted the exact same comment as the one above?

nikomatsakis · 2018-10-24T19:56:55Z

I'm removing the WIP tag. =) Though I would still like to spend a bit of time looking carefully over the code. But I guess the test suite passing is a good sign I've not changed much behavior here ;)

nikomatsakis · 2018-10-24T19:57:16Z

There might be room though for an assert or two -- e.g., in the canonicalization code -- checking that we don't have any universes in places we don't expect them.

scalexm · 2018-10-25T14:18:01Z

Nothing strikes me regarding changes of behavior.

r=me if you ever want to add those asserts

nikomatsakis · 2018-10-26T13:08:46Z

@bors r=scalexm

bors · 2018-10-26T13:08:47Z

📌 Commit bcc2a7ffdb96b57b24638f76fee4033ebed65c8b has been approved by scalexm

bors · 2018-10-27T03:35:22Z

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

But.. we don't really use it for anything right now.

The idea here is that an incoming query may refer to some universes, and they query response may contain fresh universes that go beyond those. When we instantiate the query response in the caller's scope, therefore, we map those new universes into fresh universes for the caller.

In particular, we don't want to preserve the universes for the `'_` variables that appear in there. And we don't expect to find any placeholders, which justifies this as harmless. (In particular, if you have a query like `Foo(!1, !2, ?3)`, then you care about the universe of `?3`, since it may control whether `?3 = !1` and `?3 = !2` is a valid answer. But without any placeholders, we don't really care: any placeholders that would appear in the output must therefore come from some fresh universe anyway.)

Required for test expect-fn-supply-fn.rs to pass; otherwise we have unconstrained inference variables that get inferred to `'empty`.

src/test/ui/hrtb/hrtb-perfect-forwarding.rs

bors · 2018-10-31T12:26:20Z

⌛ Testing commit 36516e8ea82205a4f3b121518714353b15bb3c6f with merge f9c51413cb5661f89a6d12a3d05efdbb9d82c3bc...

pietroalbini · 2018-10-31T13:48:01Z

Bors was testing two PRs at once.

@bors retry

Account for incompatible universes and higher-ranked subtyping.

nikomatsakis · 2018-10-31T16:22:06Z

@bors r=scalexm

bors · 2018-10-31T16:22:11Z

📌 Commit c244fd7 has been approved by scalexm

nikomatsakis · 2018-11-01T18:29:47Z

@bors p=1

@scalexm requested that I give this p=1, as they have a number of things blocked on it

bors · 2018-11-01T19:11:03Z

⌛ Testing commit c244fd7 with merge 29f782cbf921d0478683873670eb68e1739fe96c...

bors · 2018-11-01T22:18:12Z

💔 Test failed - status-appveyor

scalexm · 2018-11-01T22:28:23Z

yet another timeout, not the same job as the first one, and the build times seem to be varying randomly, so I believe this is not due to a perf problem?

pietroalbini · 2018-11-01T22:45:52Z

@bors retry

bors · 2018-11-02T01:19:24Z

⌛ Testing commit c244fd7 with merge 5eda136...

@scalexm

universes refactor 3 Some more refactorings from my universe branch. These are getting a bit more "invasive" -- they start to plumb the universe information through the canonicalization process. As of yet though I don't **believe** this branch changes our behavior in any notable way, though I'm marking the branch as `WIP` to give myself a chance to verify this. r? @scalexm

bors · 2018-11-02T04:20:29Z

☀️ Test successful - status-appveyor, status-travis
Approved by: scalexm
Pushing 5eda136 to master...

notriddle · 2018-11-09T17:27:16Z

For the benefit of the viewing audience:

This is a part of #48049 (remove the leak check in favor of "universes")

rust-highfive assigned cramertj Oct 24, 2018

This comment has been minimized.

Sign in to view

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

rust-highfive assigned scalexm and unassigned cramertj Oct 24, 2018

This comment has been minimized.

Sign in to view

nikomatsakis force-pushed the universes-refactor-3 branch from 5484f6f to ff0fb20 Compare October 24, 2018 12:24

scalexm reviewed Oct 24, 2018

View reviewed changes

nikomatsakis force-pushed the universes-refactor-3 branch from b83b413 to 5a16d60 Compare October 24, 2018 18:12

nikomatsakis changed the title ~~[WIP] Universes refactor 3~~ universes refactor 3 Oct 24, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 26, 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 27, 2018

nikomatsakis added 9 commits October 27, 2018 08:41

move PlaceholderIndices into MirTypeckRegionConstraints struct

018c515

convert placeholder region vids in NLL mode as we see them

784746f

allow canonicalized regions to carry universe and track max-universe

3ef27d8

But.. we don't really use it for anything right now.

when canonicalizing query responses, preserve infer-var universes

80d9f8b

apply minimum bounds when checking closure signature

d4e4e37

Required for test expect-fn-supply-fn.rs to pass; otherwise we have unconstrained inference variables that get inferred to `'empty`.

select.rs: rustfmt

b24b887

error_reporting/mod.rs: rustfmt

a1be20c

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 29, 2018

This was referenced Oct 29, 2018

handle universes in canonicalization #48696

Closed

Universes #55517

Merged

tmandry reviewed Oct 31, 2018

View reviewed changes

src/test/ui/hrtb/hrtb-perfect-forwarding.rs Outdated Show resolved Hide resolved

nikomatsakis added 2 commits October 31, 2018 12:10

fix bug in NLL error reporting

740117f

Account for incompatible universes and higher-ranked subtyping.

kill old-style-lub warnings

c244fd7

nikomatsakis force-pushed the universes-refactor-3 branch from 192820a to c244fd7 Compare October 31, 2018 16:11

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 1, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 1, 2018

bors merged commit c244fd7 into rust-lang:master Nov 2, 2018

This was referenced Nov 2, 2018

Add support for bound types #55330

Merged

Add VariantIdx type and use instead of usize #55589

Merged

tmandry added the WG-traits Working group: Traits, https://internals.rust-lang.org/t/announcing-traits-working-group/6804 label May 24, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

universes refactor 3 #55305

universes refactor 3 #55305

nikomatsakis commented Oct 24, 2018 •

edited

Loading

This comment has been minimized.

nikomatsakis commented Oct 24, 2018

This comment has been minimized.

scalexm Oct 24, 2018

nikomatsakis Oct 24, 2018

nikomatsakis commented Oct 24, 2018

nikomatsakis commented Oct 24, 2018

scalexm commented Oct 25, 2018

nikomatsakis commented Oct 26, 2018

bors commented Oct 26, 2018

bors commented Oct 27, 2018

bors commented Oct 31, 2018

pietroalbini commented Oct 31, 2018 •

edited

Loading

nikomatsakis commented Oct 31, 2018

bors commented Oct 31, 2018

nikomatsakis commented Nov 1, 2018

bors commented Nov 1, 2018

bors commented Nov 1, 2018

scalexm commented Nov 1, 2018

pietroalbini commented Nov 1, 2018

bors commented Nov 2, 2018

bors commented Nov 2, 2018

notriddle commented Nov 9, 2018

universes refactor 3 #55305

universes refactor 3 #55305

Conversation

nikomatsakis commented Oct 24, 2018 • edited Loading

This comment has been minimized.

nikomatsakis commented Oct 24, 2018

This comment has been minimized.

scalexm Oct 24, 2018

Choose a reason for hiding this comment

nikomatsakis Oct 24, 2018

Choose a reason for hiding this comment

nikomatsakis commented Oct 24, 2018

nikomatsakis commented Oct 24, 2018

scalexm commented Oct 25, 2018

nikomatsakis commented Oct 26, 2018

bors commented Oct 26, 2018

bors commented Oct 27, 2018

bors commented Oct 31, 2018

pietroalbini commented Oct 31, 2018 • edited Loading

nikomatsakis commented Oct 31, 2018

bors commented Oct 31, 2018

nikomatsakis commented Nov 1, 2018

bors commented Nov 1, 2018

bors commented Nov 1, 2018

scalexm commented Nov 1, 2018

pietroalbini commented Nov 1, 2018

bors commented Nov 2, 2018

bors commented Nov 2, 2018

notriddle commented Nov 9, 2018

nikomatsakis commented Oct 24, 2018 •

edited

Loading

pietroalbini commented Oct 31, 2018 •

edited

Loading