enforce user annotations in closure signatures #55229

nikomatsakis · 2018-10-20T17:19:21Z

Not quite ready yet but I'm opening anyway. Still have to finish running tests locally.

rust-highfive · 2018-10-20T17:41:01Z

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.

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)

nikomatsakis · 2018-10-20T18:24:19Z

Hmm I seem to be hitting some local errors that I didn't see at first :(

nikomatsakis · 2018-10-20T19:07:10Z

OK, should work now. We'll see what Travis thinks.

rust-highfive · 2018-10-20T20:11:03Z

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:50:23] .................................................................................................... 2200/4660
[00:50:27] ....................................i............................................................... 2300/4660
[00:50:31] .................................................................................................... 2400/4660
[00:50:34] .................................................................................................... 2500/4660
[00:50:38] ...................................................iiiiiiiii........................................ 2600/4660
[00:50:44] .................................................................................................... 2800/4660
[00:50:48] .................................................................................................... 2900/4660
[00:50:51] .................................................................................i.................. 3000/4660
[00:50:54] .................................................................................................... 3100/4660
---
travis_time:start:test_codegen
Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:03:50] 
[01:03:50] running 111 tests
[01:03:53] i..ii...iii.......i...i.........i..iii...........i.....i.....ii...i.i.ii..............i...ii..ii.i.. 100/111
[01:03:53] ..iiii.....
[01:03:53] 
[01:03:53]  finished in 3.492
[01:03:53] travis_fold:end:test_codegen

---
travis_time:start:test_incremental
Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:03:55] 
[01:03:55] running 92 tests
hes/closure_expressions/closure_expressions.inc" "-Z" "incremental-verify-ich" "-Z" "incremental-queries" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/incremental/hashes/closure_expressions/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-Z" "query-dep-graph" "-Zincremental-ignore-spans" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/incremental/hashes/closure_expressions/auxiliary"
[01:04:08] ------------------------------------------
[01:04:08] 
[01:04:08] ------------------------------------------
[01:04:08] stderr:
[01:04:08] stderr:
[01:04:08] ------------------------------------------
[01:04:08] {"message":"`TypeckTables(add_type_ascription_to_parameter)` should be clean but is not","code":null,"level":"error","spans":[{"file_name":"/checkout/src/test/incremental/hashes/closure_expressions.rs","byte_start":2588,"byte_end":2699,"line_start":100,"line_end":103,"column_start":1,"column_end":2,"is_primary":true,"text":[{"text":"pub fn add_type_ascription_to_parameter() {","highlight_start":1,"highlight_end":44},{"text":"    let closure = |x: u32| x + 1u32;","highlight_start":1,"highlight_end":37},{"text":"    let _: u32 = closure(1);","highlight_start":1,"highlight_end":29},{"text":"}","highlight_start":1,"highlight_end":2}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":"error: `TypeckTables(add_type_ascription_to_parameter)` should be clean but is not\n  --> /checkout/src/test/incremental/hashes/closure_expressions.rs:100:1\n   |\nLL | / pub fn add_type_ascription_to_parameter() {\nLL | |     let closure = |x: u32| x + 1u32;\nLL | |     let _: u32 = closure(1);\nLL | | }\n   | |_^\n\n"}
[01:04:08] {"message":"aborting due to previous error","code":null,"level":"error","spans":[],"children":[],"rendered":"error: aborting due to previous error\n\n"}
[01:04:08] ------------------------------------------
[01:04:08] 
[01:04:08] thread '[incremental] incremental/hashes/closure_expressions.rs' panicked at 'explicit panic', tools/compiletest/src/runtest.rs:3284:9
[01:04:08] note: Run with `RUST_BACKTRACE=1` for a backtrace.
---
[01:04:08] 
[01:04:08] thread 'main' panicked at 'Some tests failed', tools/compiletest/src/main.rs:503:22
[01:04:08] 
[01:04:08] 
[01:04:08] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/incremental" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/incremental" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "incremental" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-5.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options " "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "5.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:04:08] 
[01:04:08] 
[01:04:08] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:04:08] Build completed unsuccessfully in 0:18:29
[01:04:08] Build completed unsuccessfully in 0:18:29
[01:04:08] Makefile:58: recipe for target 'check' failed
[01:04:08] make: *** [check] Error 1
75788 ./obj/build/x86_64-unknown-linux-gnu/stage0-sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib
72532 ./src/llvm/lib
70532 ./obj/build/x86_64-unknown-linux-gnu/native
70300 ./obj/build/x86_64-unknown-linux-gnu/native/jemalloc
---
travis_time:end:0f82f73d:start=1540066258740294292,finish=1540066258747934118,duration=7639826
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:25dd73bc
$ 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:crashl

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)

matthewjasper

One thing that I'm not sure about. r=me with that addressed

src/test/incremental/hashes/closure_expressions.rs

src/test/ui/nll/user-annotations/closure-substs.stderr

src/test/ui/nll/user-annotations/closure-substs.rs

bors · 2018-10-21T17:35:51Z

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

Fixes rust-lang#54124

nikomatsakis · 2018-10-22T15:21:26Z

@bors r=MatthewJasper p=1

Giving p=1 because this is an RC2 blocker.

In particular, after the first for a given region variable. This suppresses a lot of duplicate errors.

nikomatsakis · 2018-10-22T15:53:21Z

@bors p=1

nikomatsakis · 2018-10-22T15:53:27Z

@bors r=MatthewJasper

matthewjasper · 2018-10-22T18:47:54Z

~~I think bors is back now.~~ maybe not @bors r=matthewjasper

bors · 2018-10-22T19:19:21Z

📌 Commit 64b5599 has been approved by MatthewJasper

bors · 2018-10-22T19:27:37Z

📌 Commit 64b5599 has been approved by MatthewJasper

bors · 2018-10-22T20:17:00Z

📌 Commit 64b5599 has been approved by matthewjasper

bors · 2018-10-22T20:17:25Z

📌 Commit 64b5599 has been approved by matthewjasper

bors · 2018-10-22T20:59:25Z

⌛ Testing commit 64b5599 with merge 5639651ab8552188c4bc360761a82c602cefc114...

bors · 2018-10-22T22:19:08Z

⌛ Testing commit 64b5599 with merge 7fa5c7fcf77cf759bb0114afeac5b47ba3397b7f...

bors · 2018-10-23T01:24:19Z

💔 Test failed - status-appveyor

matthewjasper · 2018-10-23T06:10:55Z

@bors retry

bors · 2018-10-23T06:40:41Z

⌛ Testing commit 64b5599 with merge 1344e6f8fd074c9856840b6e5c14b80292f11018...

bors · 2018-10-23T08:17:12Z

💔 Test failed - status-appveyor

nikomatsakis · 2018-10-23T12:40:42Z

Is this the reason the run failed?

The state of "rls" has changed from "test-pass" to "test-fail"
The state of "rls" has regressed from "test-pass" to "test-fail"

If so...interesting and unexpected. =)

This fixes `issue-28848.rs` -- it also handles another case that the AST region checker gets wrong (`wf-self-type.rs`). I don't actually think that this is the *right way* to be enforcing this constraint -- I think we should probably do it more generally, perhaps by editing `predicates_of` for the impl itself. The chalk-style implied bounds setup ought to fix this.

nikomatsakis · 2018-10-23T15:06:54Z

@bors r=MatthewJasper

Let's see if this is spurious or not.

bors · 2018-10-23T15:06:55Z

📌 Commit 4394c83 has been approved by MatthewJasper

nikomatsakis · 2018-10-23T15:07:00Z

I can't reproduce locally.

bors · 2018-10-23T17:44:27Z

⌛ Testing commit 4394c83 with merge f99911a...

@matthewjasper

…=MatthewJasper enforce user annotations in closure signatures Not *quite* ready yet but I'm opening anyway. Still have to finish running tests locally. Fixes #54692 Fixes #54124 r? @matthewjasper

bors · 2018-10-23T20:41:47Z

☀️ Test successful - status-appveyor, status-travis
Approved by: MatthewJasper
Pushing f99911a to master...

rust-highfive assigned matthewjasper Oct 20, 2018

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

nikomatsakis force-pushed the issue-54692-closure-signatures branch from 1cc3d84 to 8c89a70 Compare October 20, 2018 19:03

matthewjasper approved these changes Oct 21, 2018

View reviewed changes

src/test/incremental/hashes/closure_expressions.rs Show resolved Hide resolved

src/test/ui/nll/user-annotations/closure-substs.stderr Outdated Show resolved Hide resolved

src/test/ui/nll/user-annotations/closure-substs.rs Show resolved Hide resolved

nikomatsakis added 7 commits October 22, 2018 10:00

add a table to track user-provided signatures

167b460

convert user-provided signatures into def-id

a8f3d6d

record supplied sig of closure

e0871ed

start enforcing closure types

3a17880

add regression test for rust-lang#54124

dbbdce5

Fixes rust-lang#54124

fix incremental test

0afccbb

flesh out closure-substs test

2921fba

nikomatsakis force-pushed the issue-54692-closure-signatures branch from 979fa31 to 2921fba Compare October 22, 2018 14:11

stop reporting "unsatisfied lifetime bounds" errors after the first

64b5599

In particular, after the first for a given region variable. This suppresses a lot of duplicate errors.

nikomatsakis force-pushed the issue-54692-closure-signatures branch from 8bcb79b to 64b5599 Compare October 22, 2018 15:53

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 22, 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 23, 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 23, 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 23, 2018

This comment has been minimized.

Sign in to view

type_check/mod.rs: rustfmt

4394c83

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

nikomatsakis mentioned this pull request Oct 23, 2018

ICE: broken MIR in DefId #55241

Closed

bors merged commit 4394c83 into rust-lang:master Oct 23, 2018

bors mentioned this pull request Oct 23, 2018

Keep resolved defs in path prefixes and emit them in save-analysis #54145

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

enforce user annotations in closure signatures #55229

enforce user annotations in closure signatures #55229

nikomatsakis commented Oct 20, 2018 •

edited

Loading

rust-highfive commented Oct 20, 2018

nikomatsakis commented Oct 20, 2018

nikomatsakis commented Oct 20, 2018

rust-highfive commented Oct 20, 2018

matthewjasper left a comment

bors commented Oct 21, 2018

nikomatsakis commented Oct 22, 2018

nikomatsakis commented Oct 22, 2018

nikomatsakis commented Oct 22, 2018

matthewjasper commented Oct 22, 2018 •

edited

Loading

bors commented Oct 22, 2018

bors commented Oct 22, 2018

bors commented Oct 22, 2018

bors commented Oct 22, 2018

bors commented Oct 22, 2018

bors commented Oct 22, 2018

bors commented Oct 23, 2018

matthewjasper commented Oct 23, 2018

bors commented Oct 23, 2018

bors commented Oct 23, 2018

nikomatsakis commented Oct 23, 2018

This comment has been minimized.

nikomatsakis commented Oct 23, 2018

bors commented Oct 23, 2018

nikomatsakis commented Oct 23, 2018

bors commented Oct 23, 2018

bors commented Oct 23, 2018

enforce user annotations in closure signatures #55229

enforce user annotations in closure signatures #55229

Conversation

nikomatsakis commented Oct 20, 2018 • edited Loading

rust-highfive commented Oct 20, 2018

nikomatsakis commented Oct 20, 2018

nikomatsakis commented Oct 20, 2018

rust-highfive commented Oct 20, 2018

matthewjasper left a comment

Choose a reason for hiding this comment

bors commented Oct 21, 2018

nikomatsakis commented Oct 22, 2018

nikomatsakis commented Oct 22, 2018

nikomatsakis commented Oct 22, 2018

matthewjasper commented Oct 22, 2018 • edited Loading

bors commented Oct 22, 2018

bors commented Oct 22, 2018

bors commented Oct 22, 2018

bors commented Oct 22, 2018

bors commented Oct 22, 2018

bors commented Oct 22, 2018

bors commented Oct 23, 2018

matthewjasper commented Oct 23, 2018

bors commented Oct 23, 2018

bors commented Oct 23, 2018

nikomatsakis commented Oct 23, 2018

This comment has been minimized.

nikomatsakis commented Oct 23, 2018

bors commented Oct 23, 2018

nikomatsakis commented Oct 23, 2018

bors commented Oct 23, 2018

bors commented Oct 23, 2018

nikomatsakis commented Oct 20, 2018 •

edited

Loading

matthewjasper commented Oct 22, 2018 •

edited

Loading