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

introduce type-op for user-type ascription in NLL #55323

Merged
merged 2 commits into from Oct 25, 2018

Conversation

Projects
None yet
6 participants
@nikomatsakis
Contributor

nikomatsakis commented Oct 24, 2018

Handle user-type ascription in a type operator, which gives us a lot more flexibility around the order in which we resolve things.

r? @pnkfelix

Fixes #55219
Fixes #55241

@pnkfelix

This comment has been minimized.

Member

pnkfelix commented Oct 24, 2018

@bors r+ p=1

I’ve gotta rebase stuff (namely #55274) atop this so I’m giving it high priority so I can be more confident such rebasing will go through cleanly

@bors

This comment has been minimized.

Contributor

bors commented Oct 24, 2018

📌 Commit 05a9b11 has been approved by pnkfelix

@rust-highfive

This comment has been minimized.

Collaborator

rust-highfive commented Oct 24, 2018

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.
travis_time:end:01ae2bf7:start=1540406309533525138,finish=1540406310565516447,duration=1031991309
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
---

[00:03:52] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:03:52] tidy error: /checkout/src/librustc/dep_graph/dep_node.rs:75: line longer than 100 chars
[00:03:52] tidy error: /checkout/src/librustc/ty/query/config.rs:17: line longer than 100 chars
[00:03:52] tidy error: /checkout/src/librustc/ty/query/config.rs:119: line longer than 100 chars
[00:03:52] tidy error: /checkout/src/librustc/ty/query/mod.rs:38: line longer than 100 chars
[00:03:54] some tidy checks failed
[00:03:54] 
[00:03:54] 
[00:03:54] 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:03:54] 
[00:03:54] 
[00:03:54] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:03:54] Build completed unsuccessfully in 0:00:47
[00:03:54] Build completed unsuccessfully in 0:00:47
[00:03:54] make: *** [tidy] Error 1
[00:03:54] Makefile:79: recipe for target 'tidy' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:089c81f8
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:0cfce460:start=1540406556926874937,finish=1540406556931185348,duration=4310411
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:13d2b9f1
$ 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:02274316
travis_time:start:02274316
$ 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:101c0f40
$ 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)

@TimNN

This comment has been minimized.

Contributor

TimNN commented Oct 24, 2018

@bors r-

Fails tidy.

port the relate-types code from NLL type-check into a type-op
Add regression tests for #55219 and #55241

Also another test where a duplicate-like error appears to have been
suppressed; I'm not 100% sure why this output changes, though I could
imagine that some duplicate suppression is enabled by this PR.
@nikomatsakis

This comment has been minimized.

Contributor

nikomatsakis commented Oct 24, 2018

@bors r=pnkfelix

Passes x.py test locally (at least up until the gdb tests, which are broken for me for unrelated reasons)

@bors

This comment has been minimized.

Contributor

bors commented Oct 24, 2018

📌 Commit 62f0fc5 has been approved by pnkfelix

@nikomatsakis nikomatsakis changed the title from introduce user-type ascription type operator to introduce type-op for user-type ascription in NLL Oct 24, 2018

@bors

This comment has been minimized.

Contributor

bors commented Oct 24, 2018

💡 This pull request was already approved, no need to approve it again.

  • There's another pull request that is currently being tested, blocking this pull request: #55315
@bors

This comment has been minimized.

Contributor

bors commented Oct 24, 2018

📌 Commit 62f0fc5 has been approved by pnkfelix

@bors

This comment has been minimized.

Contributor

bors commented Oct 25, 2018

⌛️ Testing commit 62f0fc5 with merge 39a47b8...

bors added a commit that referenced this pull request Oct 25, 2018

Auto merge of #55323 - nikomatsakis:nll-ICE-55219-and-55241, r=pnkfelix
introduce type-op for user-type ascription in NLL

Handle user-type ascription in a type operator, which gives us a lot more flexibility around the order in which we resolve things.

r? @pnkfelix

Fixes #55219
Fixes #55241
@bors

This comment has been minimized.

Contributor

bors commented Oct 25, 2018

💥 Test timed out

@kennytm

This comment has been minimized.

Member

kennytm commented Oct 25, 2018

@bors retry

AppVeyor got stuck and not responding.

@bors

This comment has been minimized.

Contributor

bors commented Oct 25, 2018

⌛️ Testing commit 62f0fc5 with merge 3476ac0...

bors added a commit that referenced this pull request Oct 25, 2018

Auto merge of #55323 - nikomatsakis:nll-ICE-55219-and-55241, r=pnkfelix
introduce type-op for user-type ascription in NLL

Handle user-type ascription in a type operator, which gives us a lot more flexibility around the order in which we resolve things.

r? @pnkfelix

Fixes #55219
Fixes #55241
@bors

This comment has been minimized.

Contributor

bors commented Oct 25, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: pnkfelix
Pushing 3476ac0 to master...

@bors bors merged commit 62f0fc5 into rust-lang:master Oct 25, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment