second round of refactorings for universes#54858

nikomatsakis · 2018-10-05T18:30:41Z

A second round of (what I believe to be) "no functional change" refactorings, taken from my universes branch.

rust-highfive · 2018-10-05T18:47:31Z

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.


[00:04:11] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:11] tidy error: /checkout/src/librustc_traits/dropck_outlives.rs:37: line longer than 100 chars
[00:04:11] tidy error: /checkout/src/librustc_traits/evaluate_obligation.rs:29: line longer than 100 chars
[00:04:11] tidy error: /checkout/src/librustc/infer/mod.rs:515: line longer than 100 chars
[00:04:12] some tidy checks failed
[00:04:12] 
[00:04:12] 
[00:04:12] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:12] 
[00:04:12] 
[00:04:12] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:12] Build completed unsuccessfully in 0:00:46
[00:04:12] Build completed unsuccessfully in 0:00:46
[00:04:12] make: *** [tidy] Error 1
[00:04:12] Makefile:79: recipe for target 'tidy' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:036ba66c
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:05b627e0:start=1538764766927338529,finish=1538764766932375446,duration=5036917
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1304fcf0
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0d1bd67c
travis_time:start:0d1bd67c
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:1d28ea21
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

arielb1 · 2018-10-06T19:17:06Z

src/librustc/infer/higher_ranked/mod.rs

I'm not sure I prefer "superuniverse" to "subuniverse". Universes naturally form a tree, and the "subelement" relationship goes from a universe to its sub/superuniverse.

nikomatsakis · 2018-10-08T11:02:45Z

@arielb1

I'm not sure I prefer "superuniverse" to "subuniverse". Universes naturally form a tree, and the "subelement" relationship goes from a universe to its sub/superuniverse.

It seems like the use of "subuniverse" conflicts with methods like is_subset_of -- i.e., U0 is a "subset" of U1. Perhaps we can find some other terminology. I've found it pretty important when writing this code to have something that gives the right intuition.

Maybe "extension" and "extended" is a better terminology?

e.g.,

create_subuniverse => create_extended_universe
is_subset_of => is_extended_by

and so forth?

(For that matter, create_superuniverse should perhaps just be called create_universe or create_fresh_universe, with the "extension" aspect of it left to doc comments -- i.e., "creates a fresh universe that extends all previous universes")

nikomatsakis · 2018-10-08T11:19:50Z

Rebased and tidied. Went and tried the renaming I proposed. I wound up at a slightly different place, as you can see in the comment from the final commit:

remove the sub/super terminology for universes

Instead, we talk about:

creating the "next" universe
universes "extending" one another
and u1.can_name(u2), meaning that u1 contains all names from u2

nikomatsakis · 2018-10-08T11:23:42Z

Now I am thinking create_child_universe might be better than "next" universe, to help build on the tree intuition. Unclear how much that matters though.

scalexm · 2018-10-08T20:00:30Z

@bors r+

bors · 2018-10-08T20:00:33Z

📌 Commit bae8a5ac3e5cbe85bade7f1313712fb8bc114a6d has been approved by scalexm

Manishearth · 2018-10-10T22:52:16Z

seems to be broken?

error: internal compiler error: librustc\infer\canonical\canonicalizer.rs:175: unexpected region in query response: `ReEarlyBound(0, 'i)`

in the rollup

https://ci.appveyor.com/project/rust-lang/rust/builds/19415197/job/kex1uawo1pxeg0ml

@ghost

Rollup of 9 pull requests Successful merges: - #54747 (codegen_llvm: verify that inline assembly operands are scalars) - #54848 (Better Diagnostic for Trait Object Capture) - #54850 (Fix #54707 - parse_trait_item_ now handles interpolated blocks as function body decls) - #54858 (second round of refactorings for universes) - #54862 (Implement RFC 2539: cfg_attr with multiple attributes) - #54869 (Fix mobile docs) - #54870 (Stabilize tool lints) - #54893 (Fix internal compiler error on malformed match arm pattern.) - #54904 (Stabilize the `Option::replace` method) Failed merges: - #54909 ( Add chalk rules related to associated type defs) r? @ghost

@ghost

Rollup of 9 pull requests Successful merges: - #54747 (codegen_llvm: verify that inline assembly operands are scalars) - #54848 (Better Diagnostic for Trait Object Capture) - #54850 (Fix #54707 - parse_trait_item_ now handles interpolated blocks as function body decls) - #54858 (second round of refactorings for universes) - #54862 (Implement RFC 2539: cfg_attr with multiple attributes) - #54869 (Fix mobile docs) - #54870 (Stabilize tool lints) - #54893 (Fix internal compiler error on malformed match arm pattern.) - #54904 (Stabilize the `Option::replace` method) Failed merges: - #54909 ( Add chalk rules related to associated type defs) r? @ghost

bors · 2018-10-11T09:23:29Z

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

nikomatsakis · 2018-10-15T12:57:54Z

@bors r=scalexm

bors · 2018-10-15T12:57:55Z

📌 Commit 5be9513ce4a6e593f5c50eab972de94ee8f60dd1 has been approved by scalexm

bors · 2018-10-15T13:18:28Z

⌛ Testing commit 5be9513ce4a6e593f5c50eab972de94ee8f60dd1 with merge 0e86b363814cfd66862f6df73bec3e5f63115b7c...

bors · 2018-10-15T14:16:40Z

💔 Test failed - status-appveyor

The only name was silly. U1 can contain everything from U0 *plus* more things.

Instead, we talk about: - creating the "next" universe - universes "extending" one another - and `u1.can_name(u2)`, meaning that `u1` contains all names from `u2`

nikomatsakis · 2018-10-15T15:42:20Z

Whoops, I thought I had patched that problem.

nikomatsakis · 2018-10-15T15:42:39Z

@bors r=scalexm

bors · 2018-10-15T15:42:41Z

📌 Commit 05f67ca has been approved by scalexm

bors · 2018-10-15T16:47:02Z

⌛ Testing commit 05f67ca with merge 5a52983...

@scalexm

second round of refactorings for universes A second round of (what I believe to be) "no functional change" refactorings, taken from my universes branch. r? @scalexm

bors · 2018-10-15T19:50:44Z

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

rust-highfive assigned scalexm Oct 5, 2018

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

arielb1 reviewed Oct 6, 2018

View reviewed changes

nikomatsakis force-pushed the universes-refactor-2 branch from 2c8c2d9 to e3d783e Compare October 8, 2018 11:19

This comment has been minimized.

Sign in to view

nikomatsakis force-pushed the universes-refactor-2 branch from e3d783e to 19c7e55 Compare October 8, 2018 12:33

This comment has been minimized.

Sign in to view

nikomatsakis force-pushed the universes-refactor-2 branch from 19c7e55 to bae8a5a Compare October 8, 2018 13:57

scalexm approved these changes Oct 8, 2018

View reviewed changes

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 8, 2018

Manishearth mentioned this pull request Oct 10, 2018

Rollup of 8 pull requests #54968

Closed

Manishearth mentioned this pull request Oct 10, 2018

Rollup of 9 pull requests #54969

Merged

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 11, 2018

nikomatsakis force-pushed the universes-refactor-2 branch from bae8a5a to 560d954 Compare October 15, 2018 11:36

canonicalizer.rs: rustfmt

110b3b9

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 15, 2018

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 Oct 15, 2018

nikomatsakis added 7 commits October 15, 2018 11:42

control canonicalization with a trait vs bools

28df2bf

make UniverseIndex hashable, rename "sub-" to "superuniverse"

460915b

The only name was silly. U1 can contain everything from U0 *plus* more things.

convert UniverseIndex into a newtype_index!

da76b4d

hide SmallCanonicalVarValues in OriginalQueryValues struct

6ace43c

remove dead iterator code

be02f74

pacify the mercilous tidy with rustfmt

f419077

remove the sub/super terminology for universes

05f67ca

Instead, we talk about: - creating the "next" universe - universes "extending" one another - and `u1.can_name(u2)`, meaning that `u1` contains all names from `u2`

nikomatsakis force-pushed the universes-refactor-2 branch from 5be9513 to 05f67ca Compare October 15, 2018 15:42

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 15, 2018

nikomatsakis mentioned this pull request Oct 15, 2018

implement "instantiation" methods in chalk integration impl #55098

Closed

bors merged commit 05f67ca into rust-lang:master Oct 15, 2018

This was referenced Oct 15, 2018

Replace ParamEnv with a new type in chalk context. #55040

Merged

nll type annotations in multisegment path #55093

Merged

Replace CanonicalVar with DebruijnIndex #52984

Merged

Uh oh!

Conversation

nikomatsakis commented Oct 5, 2018

Uh oh!

rust-highfive commented Oct 5, 2018

Uh oh!

arielb1 Oct 6, 2018

Choose a reason for hiding this comment

Uh oh!

nikomatsakis commented Oct 8, 2018

Uh oh!

nikomatsakis commented Oct 8, 2018

Uh oh!

nikomatsakis commented Oct 8, 2018

Uh oh!

This comment has been minimized.

This comment has been minimized.

scalexm commented Oct 8, 2018

Uh oh!

bors commented Oct 8, 2018

Uh oh!

Manishearth commented Oct 10, 2018

Uh oh!

bors commented Oct 11, 2018

Uh oh!

nikomatsakis commented Oct 15, 2018

Uh oh!

bors commented Oct 15, 2018

Uh oh!

bors commented Oct 15, 2018

Uh oh!

bors commented Oct 15, 2018

Uh oh!

nikomatsakis commented Oct 15, 2018

Uh oh!

nikomatsakis commented Oct 15, 2018

Uh oh!

bors commented Oct 15, 2018

Uh oh!

bors commented Oct 15, 2018

Uh oh!

bors commented Oct 15, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants