Lift TypeFoldable over Result and remove the Relate hack in combine/nll #58333

arielb1 · 2019-02-09T21:38:40Z

No functional changes intended - just a cleanup.

rust-highfive · 2019-02-09T23:03:11Z

The job x86_64-gnu-llvm-6.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:11f30564:start=1549751305892799430,finish=1549751306856293444,duration=963494014
$ 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 IMAGE=x86_64-gnu-llvm-6.0
---

[00:03:51] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:03:51] tidy error: /checkout/src/librustc/traits/query/normalize.rs:194: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/traits/project.rs:398: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/traits/structural_impls.rs:751: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/traits/structural_impls.rs:761: TODO is deprecated; use FIXME
[00:03:51] tidy error: /checkout/src/librustc/traits/structural_impls.rs:885: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/traits/structural_impls.rs:901: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/traits/structural_impls.rs:942: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/traits/structural_impls.rs:963: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/infer/combine.rs:359: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/ty/subst.rs:132: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/ty/subst.rs:435: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/ty/fold.rs:46: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/ty/fold.rs:47: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/ty/fold.rs:203: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/ty/fold.rs:433: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/ty/fold.rs:495: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/ty/fold.rs:758: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/ty/structural_impls.rs:599: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/ty/structural_impls.rs:824: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/ty/structural_impls.rs:971: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/ty/structural_impls.rs:1176: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/mir/mod.rs:2627: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/mir/mod.rs:3118: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/mir/mod.rs:3285: TODO is deprecated; use FIXME
[00:03:51] tidy error: /checkout/src/librustc/mir/mod.rs:3286: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/mir/mod.rs:3303: line longer than 100 chars
[00:03:51] tidy error: /checkout/src/librustc/mir/mod.rs:3392: line longer than 100 chars
[00:03:52] some tidy checks failed
[00:03:52] 
[00:03:52] 
[00:03:52] 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:52] 
[00:03:52] 
[00:03:52] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:03:52] Build completed unsuccessfully in 0:00:44
[00:03:52] Build completed unsuccessfully in 0:00:44
[00:03:52] make: *** [tidy] Error 1
[00:03:52] Makefile:68: recipe for target 'tidy' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0ea87945
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sat Feb  9 22:32:30 UTC 2019
---
travis_time:end:07946775:start=1549751551610346988,finish=1549751551614784069,duration=4437081
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:06031398
$ 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:0006d81b
travis_time:start:0006d81b
$ 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:248c4f54
$ 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)

bors · 2019-02-12T08:33:34Z

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

arielb1 · 2019-02-13T20:42:20Z

I'll check that this doesn't hurt perf

@bors try

bors · 2019-02-13T20:42:32Z

⌛ Trying commit 7abc7ed7193d23d2be7898a6d94d282a83687b77 with merge 258c318bc56c15d4c0ac14f669a6b81f097bf17e...

nikomatsakis

r=me

nikomatsakis · 2019-02-13T21:42:27Z

src/librustc/ty/fold.rs

+ #[inline]
+ /// If `false` - the default - then `ty::Invariant` might be used instead of the
+ /// correct variance when folding an item with a variance.
+


Nit: blank line in the middle of a /// comment? Seems unusual

nikomatsakis · 2019-02-13T21:44:09Z

src/librustc/ty/fold.rs

+
+ /// Otherwise, the correct variance is looked up from the tcx, which can
+ /// be a performance and cycle hazard.
+ fn use_variances(&self) -> bool {


This seems ok, but also error-prone. i.e., if somebody forgets to make use_variances be true, we'll have a problem. It might be worth thinking if we can turn that into a dynamic assertion or something. But I don't obviously see how to do that with this setup as in this PR -- I was imagining that if the variance was tracked in a field, then accessing it could assert that use_variances is true or something...

I could make variances an Option, but t hen the users would need to handle that. I think that forgetting to use use_variances would cause fairly visible errors, however, so I don't think this is a large risk.

nikomatsakis · 2019-02-13T21:52:27Z

src/librustc/infer/nll_relate/mod.rs

- fn a_is_expected(&self) -> bool {
- true
+ fn use_variances(&self) -> bool {
+ if self.ambient_variance == ty::Variance::Invariant {


So, in the branches that I was working on, I made the folder track the ambient variance iirc. I don't however remember exactly how I did this =)

It's not a thing that Rust handles particularly well

bors · 2019-02-13T22:45:28Z

☀️ Test successful - checks-travis
State: approved= try=True

arielb1 · 2019-02-16T20:26:32Z

@rust-timer build 258c318

rust-timer · 2019-02-16T20:26:33Z

Insufficient permissions to issue commands to rust-timer.

arielb1 · 2019-02-16T20:28:08Z

Could someone with perfbot permissions give me a rust-timer build?

oli-obk · 2019-02-16T20:31:59Z

@rust-timer build 258c318bc56c15d4c0ac14f669a6b81f097bf17e

rust-timer · 2019-02-16T20:32:00Z

Success: Queued 258c318bc56c15d4c0ac14f669a6b81f097bf17e with parent e544947, comparison URL.

arielb1 · 2019-02-16T20:36:53Z

I'm poking with the fairly hot TypeFoldable, so I want to see whether I have any weird perf impacts.

arielb1 · 2019-02-16T20:37:53Z

@bors try

bors · 2019-02-16T20:38:04Z

⌛ Trying commit 090f21e with merge c5e0b61...

@nikomatsakis

Lift TypeFoldable over Result and remove the Relate hack in combine/nll No functional changes intended - just a cleanup. r? @nikomatsakis

arielb1 · 2019-02-16T20:38:22Z

Bad github, deleting my test results like that, now I need another try

rust-timer · 2019-02-16T22:14:27Z

Finished benchmarking try commit 258c318bc56c15d4c0ac14f669a6b81f097bf17e

arielb1 · 2019-02-16T22:18:31Z

Serde is very red in this PR (24%!). Need to investigate why.

bors · 2019-02-16T22:38:52Z

☀️ Test successful - checks-travis
State: approved= try=True

Mark-Simulacrum · 2019-02-17T04:38:50Z

@rust-timer build c5e0b61

rust-timer · 2019-02-17T04:38:51Z

Success: Queued c5e0b61 with parent eac0908, comparison URL.

rust-timer · 2019-02-17T06:21:41Z

Finished benchmarking try commit c5e0b61

Centril · 2019-02-23T05:39:47Z

Ping from triage, @arielb1 seems like the benchmark results are in?

arielb1 · 2019-02-24T18:08:05Z

Yea, seems like a big perf problem. I think I know what causes it, but I should try to figure it out the moment I have a bit more time.

bors · 2019-03-02T23:20:56Z

⌛ Trying commit e2e437e99bedd41bddc9d9e9fd3d8be2e1310f2f with merge e651546711e886f53b1d0380fbda11449dcc269a...

rust-highfive · 2019-03-02T23:30:16Z

The job x86_64-gnu-llvm-6.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:0994a356:start=1551568900230894653,finish=1551568974936165779,duration=74705271126
$ 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 IMAGE=x86_64-gnu-llvm-6.0
---
[00:06:35]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:06:49] error[E0599]: no variant named `Promoted` found for type `mir::Place<'_>` in the current scope
[00:06:49]     --> src/librustc/mir/mod.rs:3315:17
[00:06:49]      |
[00:06:49] 1898 | pub enum Place<'tcx> {
[00:06:49]      | -------------------- variant `Promoted` not found here
[00:06:49] ...
[00:06:49] 3315 |         (Place::Promoted)(promoted),
[00:06:49]      | 
[00:06:49]     ::: src/librustc/macros.rs:425:21
[00:06:49]      |
[00:06:49]      |
[00:06:49] 425  |                     $variant ( $($variant_arg),* ) => {
[00:06:49] 
[00:06:49] error[E0599]: no variant named `Static` found for type `mir::Place<'_>` in the current scope
[00:06:49]     --> src/librustc/mir/mod.rs:3314:17
[00:06:49]      |
[00:06:49]      |
[00:06:49] 1898 | pub enum Place<'tcx> {
[00:06:49]      | -------------------- variant `Static` not found here
[00:06:49] ...
[00:06:49] 3314 |         (Place::Static)(statik),
[00:06:49]      | 
[00:06:49]     ::: src/librustc/macros.rs:425:21
[00:06:49]      |
[00:06:49]      |
[00:06:49] 425  |                     $variant ( $($variant_arg),* ) => {
[00:06:49] 
[00:06:49] error[E0599]: no variant named `Local` found for type `mir::Place<'_>` in the current scope
[00:06:49]     --> src/librustc/mir/mod.rs:3313:17
[00:06:49]      |
[00:06:49]      |
[00:06:49] 1898 | pub enum Place<'tcx> {
[00:06:49]      | -------------------- variant `Local` not found here
[00:06:49] ...
[00:06:49] 3313 |         (Place::Local)(local),
[00:06:49]      | 
[00:06:49]     ::: src/librustc/macros.rs:425:21
[00:06:49]      |
[00:06:49]      |
[00:06:49] 425  |                     $variant ( $($variant_arg),* ) => {
[00:06:49]      |
[00:06:49]      = help: did you mean `local`?
[00:06:49] 
[00:06:49] error[E0599]: no variant named `Promoted` found for type `mir::Place<'_>` in the current scope
[00:06:49] error[E0599]: no variant named `Promoted` found for type `mir::Place<'_>` in the current scope
[00:06:49]     --> src/librustc/mir/mod.rs:3315:17
[00:06:49]      |
[00:06:49] 1898 | pub enum Place<'tcx> {
[00:06:49]      | -------------------- variant `Promoted` not found here
[00:06:49] ...
[00:06:49] 3315 |         (Place::Promoted)(promoted),
[00:06:49]      | 
[00:06:49]     ::: src/librustc/macros.rs:426:37
[00:06:49]      |
[00:06:49]      |
[00:06:49] 426  |                         Ok($variant (
[00:06:49]      |                                     - variant not found in `mir::Place<'_>`
[00:06:49] error[E0599]: no variant named `Static` found for type `mir::Place<'_>` in the current scope
[00:06:49]     --> src/librustc/mir/mod.rs:3314:17
[00:06:49]      |
[00:06:49] 1898 | pub enum Place<'tcx> {
[00:06:49] 1898 | pub enum Place<'tcx> {
[00:06:49]      | -------------------- variant `Static` not found here
[00:06:49] ...
[00:06:49] 3314 |         (Place::Static)(statik),
[00:06:49]      | 
[00:06:49]     ::: src/librustc/macros.rs:426:37
[00:06:49]      |
[00:06:49]      |
[00:06:49] 426  |                         Ok($variant (
[00:06:49]      |                                     - variant not found in `mir::Place<'_>`
[00:06:49] error[E0599]: no variant named `Local` found for type `mir::Place<'_>` in the current scope
[00:06:49]     --> src/librustc/mir/mod.rs:3313:17
[00:06:49]      |
[00:06:49] 1898 | pub enum Place<'tcx> {
[00:06:49] 1898 | pub enum Place<'tcx> {
[00:06:49]      | -------------------- variant `Local` not found here
[00:06:49] ...
[00:06:49] 3313 |         (Place::Local)(local),
[00:06:49]      | 
[00:06:49]     ::: src/librustc/macros.rs:426:37
[00:06:49]      |
[00:06:49]      |
[00:06:49] 426  |                         Ok($variant (
[00:06:49]      |                                     - variant not found in `mir::Place<'_>`
[00:06:49]      = help: did you mean `local`?
[00:06:49] 
[00:06:49] error[E0599]: no variant named `Promoted` found for type `mir::Place<'_>` in the current scope
[00:06:49]     --> src/librustc/mir/mod.rs:3315:17
[00:06:49]     --> src/librustc/mir/mod.rs:3315:17
[00:06:49]      |
[00:06:49] 1898 | pub enum Place<'tcx> {
[00:06:49]      | -------------------- variant `Promoted` not found here
[00:06:49] ...
[00:06:49] 3315 |         (Place::Promoted)(promoted),
[00:06:49]      | 
[00:06:49]     ::: src/librustc/macros.rs:481:21
[00:06:49]      |
[00:06:49]      |
[00:06:49] 481  |                     $variant ( $($variant_arg),* ) => {
[00:06:49] 
[00:06:49] error[E0599]: no variant named `Static` found for type `mir::Place<'_>` in the current scope
[00:06:49]     --> src/librustc/mir/mod.rs:3314:17
[00:06:49]      |
[00:06:49]      |
[00:06:49] 1898 | pub enum Place<'tcx> {
[00:06:49]      | -------------------- variant `Static` not found here
[00:06:49] ...
[00:06:49] 3314 |         (Place::Static)(statik),
[00:06:49]      | 
[00:06:49]     ::: src/librustc/macros.rs:481:21
[00:06:49]      |
[00:06:49]      |
[00:06:49] 481  |                     $variant ( $($variant_arg),* ) => {
[00:06:49] 
[00:06:49] error[E0599]: no variant named `Local` found for type `mir::Place<'_>` in the current scope
[00:06:49]     --> src/librustc/mir/mod.rs:3313:17
[00:06:49]      |
[00:06:49]      |
[00:06:49] 1898 | pub enum Place<'tcx> {
[00:06:49]      | -------------------- variant `Local` not found here
[00:06:49] ...
[00:06:49] 3313 |         (Place::Local)(local),
[00:06:49]      | 
[00:06:49]     ::: src/librustc/macros.rs:481:21
[00:06:49]      |
[00:06:49]      |
[00:06:49] 481  |                     $variant ( $($variant_arg),* ) => {
[00:06:49]      |
[00:06:49]      = help: did you mean `local`?
[00:06:49] 
[00:07:08] error: aborting due to 9 previous errors
---
30764 ./src/llvm-project/llgo
29516 ./src/llvm-project/llgo/third_party
27124 ./src/llvm-project/llgo/third_party/gofrontend
26652 ./src/llvm-emscripten/test/Transforms
26168 ./obj/agnosticReports/': No such file or directory
travis_fold:end:after_failure.2
travis_fold:start:after_failure.3
travis_time:start:193d5800
$ find $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
$ find $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
find: ‘/home/travis/Library/Logs/DiagnosticReports’: No such file or directory
travis_time:end:193d5800:start=1551569413069362973,finish=1551569413074075558,duration=4712585
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:00c6dbea
$ 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:2116fab8
travis_time:start:2116fab8
$ 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 s

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)

bors · 2019-03-02T23:33:03Z

💔 Test failed - checks-travis

rust-highfive · 2019-03-02T23:33:03Z

The job dist-x86_64-linux 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_fold:end:services

travis_fold:start:git.checkout
travis_time:start:0bc724a0
$ git clone --depth=2 --branch=try https://github.com/rust-lang/rust.git rust-lang/rust
---
[00:09:33]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:09:48] error[E0599]: no variant named `Promoted` found for type `mir::Place<'_>` in the current scope
[00:09:48]     --> src/librustc/mir/mod.rs:3315:17
[00:09:48]      |
[00:09:48] 1898 | pub enum Place<'tcx> {
[00:09:48]      | -------------------- variant `Promoted` not found here
[00:09:48] ...
[00:09:48] 3315 |         (Place::Promoted)(promoted),
[00:09:48]      | 
[00:09:48]     ::: src/librustc/macros.rs:425:21
[00:09:48]      |
[00:09:48]      |
[00:09:48] 425  |                     $variant ( $($variant_arg),* ) => {
[00:09:48] 
[00:09:49] error[E0599]: no variant named `Static` found for type `mir::Place<'_>` in the current scope
[00:09:49]     --> src/librustc/mir/mod.rs:3314:17
[00:09:49]      |
[00:09:49]      |
[00:09:49] 1898 | pub enum Place<'tcx> {
[00:09:49]      | -------------------- variant `Static` not found here
[00:09:49] ...
[00:09:49] 3314 |         (Place::Static)(statik),
[00:09:49]      | 
[00:09:49]     ::: src/librustc/macros.rs:425:21
[00:09:49]      |
[00:09:49]      |
[00:09:49] 425  |                     $variant ( $($variant_arg),* ) => {
[00:09:49] 
[00:09:49] error[E0599]: no variant named `Local` found for type `mir::Place<'_>` in the current scope
[00:09:49]     --> src/librustc/mir/mod.rs:3313:17
[00:09:49]      |
[00:09:49]      |
[00:09:49] 1898 | pub enum Place<'tcx> {
[00:09:49]      | -------------------- variant `Local` not found here
[00:09:49] ...
[00:09:49] 3313 |         (Place::Local)(local),
[00:09:49]      | 
[00:09:49]     ::: src/librustc/macros.rs:425:21
[00:09:49]      |
[00:09:49]      |
[00:09:49] 425  |                     $variant ( $($variant_arg),* ) => {
[00:09:49]      |
[00:09:49]      = help: did you mean `local`?
[00:09:49] 
[00:09:49] error[E0599]: no variant named `Promoted` found for type `mir::Place<'_>` in the current scope
[00:09:49] error[E0599]: no variant named `Promoted` found for type `mir::Place<'_>` in the current scope
[00:09:49]     --> src/librustc/mir/mod.rs:3315:17
[00:09:49]      |
[00:09:49] 1898 | pub enum Place<'tcx> {
[00:09:49]      | -------------------- variant `Promoted` not found here
[00:09:49] ...
[00:09:49] 3315 |         (Place::Promoted)(promoted),
[00:09:49]      | 
[00:09:49]     ::: src/librustc/macros.rs:426:37
[00:09:49]      |
[00:09:49]      |
[00:09:49] 426  |                         Ok($variant (
[00:09:49]      |                                     - variant not found in `mir::Place<'_>`
[00:09:49] error[E0599]: no variant named `Static` found for type `mir::Place<'_>` in the current scope
[00:09:49]     --> src/librustc/mir/mod.rs:3314:17
[00:09:49]      |
[00:09:49] 1898 | pub enum Place<'tcx> {
[00:09:49] 1898 | pub enum Place<'tcx> {
[00:09:49]      | -------------------- variant `Static` not found here
[00:09:49] ...
[00:09:49] 3314 |         (Place::Static)(statik),
[00:09:49]      | 
[00:09:49]     ::: src/librustc/macros.rs:426:37
[00:09:49]      |
[00:09:49]      |
[00:09:49] 426  |                         Ok($variant (
[00:09:49]      |                                     - variant not found in `mir::Place<'_>`
[00:09:49] error[E0599]: no variant named `Local` found for type `mir::Place<'_>` in the current scope
[00:09:49]     --> src/librustc/mir/mod.rs:3313:17
[00:09:49]      |
[00:09:49] 1898 | pub enum Place<'tcx> {
[00:09:49] 1898 | pub enum Place<'tcx> {
[00:09:49]      | -------------------- variant `Local` not found here
[00:09:49] ...
[00:09:49] 3313 |         (Place::Local)(local),
[00:09:49]      | 
[00:09:49]     ::: src/librustc/macros.rs:426:37
[00:09:49]      |
[00:09:49]      |
[00:09:49] 426  |                         Ok($variant (
[00:09:49]      |                                     - variant not found in `mir::Place<'_>`
[00:09:49]      = help: did you mean `local`?
[00:09:49] 
[00:09:49] error[E0599]: no variant named `Promoted` found for type `mir::Place<'_>` in the current scope
[00:09:49]     --> src/librustc/mir/mod.rs:3315:17
[00:09:49]     --> src/librustc/mir/mod.rs:3315:17
[00:09:49]      |
[00:09:49] 1898 | pub enum Place<'tcx> {
[00:09:49]      | -------------------- variant `Promoted` not found here
[00:09:49] ...
[00:09:49] 3315 |         (Place::Promoted)(promoted),
[00:09:49]      | 
[00:09:49]     ::: src/librustc/macros.rs:481:21
[00:09:49]      |
[00:09:49]      |
[00:09:49] 481  |                     $variant ( $($variant_arg),* ) => {
[00:09:49] 
[00:09:49] error[E0599]: no variant named `Static` found for type `mir::Place<'_>` in the current scope
[00:09:49]     --> src/librustc/mir/mod.rs:3314:17
[00:09:49]      |
[00:09:49]      |
[00:09:49] 1898 | pub enum Place<'tcx> {
[00:09:49]      | -------------------- variant `Static` not found here
[00:09:49] ...
[00:09:49] 3314 |         (Place::Static)(statik),
[00:09:49]      | 
[00:09:49]     ::: src/librustc/macros.rs:481:21
[00:09:49]      |
[00:09:49]      |
[00:09:49] 481  |                     $variant ( $($variant_arg),* ) => {
[00:09:49] 
[00:09:49] error[E0599]: no variant named `Local` found for type `mir::Place<'_>` in the current scope
[00:09:49]     --> src/librustc/mir/mod.rs:3313:17
[00:09:49]      |
[00:09:49]      |
[00:09:49] 1898 | pub enum Place<'tcx> {
[00:09:49]      | -------------------- variant `Local` not found here
[00:09:49] ...
[00:09:49] 3313 |         (Place::Local)(local),
[00:09:49]      | 
[00:09:49]     ::: src/librustc/macros.rs:481:21
[00:09:49]      |
[00:09:49]      |
[00:09:49] 481  |                     $variant ( $($variant_arg),* ) => {
[00:09:49]      |
[00:09:49]      = help: did you mean `local`?
[00:09:49] 
[00:10:08] error: aborting due to 9 previous errors
---
travis_time:end:2089da00:start=1551569553792249873,finish=1551569553797928516,duration=5678643
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:04f77494
$ 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:13b42cb6
travis_time:start:13b42cb6
$ 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:094e26d6
$ 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)

This kills the annoying `relate(a, a)` hack

arielb1 · 2019-03-03T18:35:39Z

@bors try

@nikomatsakis

Lift TypeFoldable over Result and remove the Relate hack in combine/nll No functional changes intended - just a cleanup. r? @nikomatsakis

bors · 2019-03-03T18:40:53Z

⌛ Trying commit ab85743 with merge 413f247...

bors · 2019-03-03T20:52:09Z

☀️ Try build successful - checks-travis
Build commit: 413f247

arielb1 · 2019-03-03T22:44:55Z

Could someone do a new perf run?

Mark-Simulacrum · 2019-03-03T23:24:57Z

@rust-timer build 413f247

You should also have the permissions to queue perf builds as well.

rust-timer · 2019-03-03T23:24:59Z

Success: Queued 413f247 with parent c0086b9, comparison URL.

rust-timer · 2019-03-04T04:16:07Z

Finished benchmarking try commit 413f247

arielb1 · 2019-03-04T21:11:08Z

Perf is now somehow green?

nikomatsakis · 2019-03-13T17:40:25Z

@arielb1 seems good? :) maybe rebase and repeat if you are nervous?

Dylan-DPC-zz · 2019-03-25T12:39:16Z

ping from triage @arielb1 you need to rebase

Centril · 2019-03-30T12:44:46Z

Ping from triage, @arielb1 still need to rebase ;)

Dylan-DPC-zz · 2019-04-29T17:28:00Z

ping from triage @arielb1
Unfortunately we haven't heard from you on this in a while, so I'm closing the PR to keep things tidy. Don't worry though, if you'll have time again in the future please reopen this PR, we'll be happy to review it again!

rust-highfive assigned nikomatsakis Feb 9, 2019

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

arielb1 force-pushed the fold-result branch from 883e93b to 410b54c Compare February 9, 2019 22:27

arielb1 force-pushed the fold-result branch from 23f4f47 to 7abc7ed Compare February 12, 2019 21:50

nikomatsakis approved these changes Feb 13, 2019

View reviewed changes

arielb1 force-pushed the fold-result branch from 7abc7ed to 090f21e Compare February 16, 2019 20:33

bors added a commit that referenced this pull request Feb 16, 2019

Auto merge of #58333 - arielb1:fold-result, r=<try>

c5e0b61

Lift TypeFoldable over Result and remove the Relate hack in combine/nll No functional changes intended - just a cleanup. r? @nikomatsakis

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 Mar 2, 2019

arielb1 added 6 commits March 3, 2019 19:40

lift TypeFoldable over Result

7b91b20

add variance support to TypeFoldable

8c5940a

use TypeFolder in generalization instead of Relate

f8c9478

This kills the annoying `relate(a, a)` hack

shorten long lines

bf0e4cb

fix some suspicious TypeFolder patterns

3d95cd8

fix performance problem

ab85743

arielb1 force-pushed the fold-result branch from e2e437e to ab85743 Compare March 3, 2019 18:35

bors added a commit that referenced this pull request Mar 3, 2019

Auto merge of #58333 - arielb1:fold-result, r=<try>

413f247

Lift TypeFoldable over Result and remove the Relate hack in combine/nll No functional changes intended - just a cleanup. r? @nikomatsakis

Dylan-DPC-zz closed this Apr 29, 2019

Dylan-DPC-zz added S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 29, 2019

Lift TypeFoldable over Result and remove the Relate hack in combine/nll #58333

Lift TypeFoldable over Result and remove the Relate hack in combine/nll #58333

Conversation

arielb1 commented Feb 9, 2019

rust-highfive commented Feb 9, 2019

bors commented Feb 12, 2019

arielb1 commented Feb 13, 2019

bors commented Feb 13, 2019

nikomatsakis left a comment

Choose a reason for hiding this comment

nikomatsakis Feb 13, 2019

Choose a reason for hiding this comment

nikomatsakis Feb 13, 2019

Choose a reason for hiding this comment

arielb1 Feb 16, 2019 • edited Loading

Choose a reason for hiding this comment

nikomatsakis Feb 13, 2019

Choose a reason for hiding this comment

nikomatsakis Feb 13, 2019

Choose a reason for hiding this comment

bors commented Feb 13, 2019

arielb1 commented Feb 16, 2019

rust-timer commented Feb 16, 2019

arielb1 commented Feb 16, 2019

oli-obk commented Feb 16, 2019

rust-timer commented Feb 16, 2019

arielb1 commented Feb 16, 2019

arielb1 commented Feb 16, 2019

bors commented Feb 16, 2019

arielb1 commented Feb 16, 2019

rust-timer commented Feb 16, 2019

arielb1 commented Feb 16, 2019 • edited Loading

bors commented Feb 16, 2019

Mark-Simulacrum commented Feb 17, 2019

rust-timer commented Feb 17, 2019

rust-timer commented Feb 17, 2019

Centril commented Feb 23, 2019

arielb1 commented Feb 24, 2019 • edited Loading

bors commented Mar 2, 2019

rust-highfive commented Mar 2, 2019

bors commented Mar 2, 2019

rust-highfive commented Mar 2, 2019

arielb1 commented Mar 3, 2019

bors commented Mar 3, 2019

bors commented Mar 3, 2019

arielb1 commented Mar 3, 2019

Mark-Simulacrum commented Mar 3, 2019

rust-timer commented Mar 3, 2019

rust-timer commented Mar 4, 2019

arielb1 commented Mar 4, 2019

nikomatsakis commented Mar 13, 2019

Dylan-DPC-zz commented Mar 25, 2019

Centril commented Mar 30, 2019

Dylan-DPC-zz commented Apr 29, 2019

arielb1 Feb 16, 2019 •

edited

Loading

arielb1 commented Feb 16, 2019 •

edited

Loading

arielb1 commented Feb 24, 2019 •

edited

Loading