[DO NOT MERGE] Testing #70551 with de-abuse PRs #71939

mark-i-m · 2020-05-06T04:43:05Z

This is #70551 with #71930 and #71938 merged. I'm just using the CI to run tests because it's faster than my laptop...

Hopefully this confirms that those two PRs solve #70866...

rust-highfive · 2020-05-06T04:43:08Z

(rust_highfive has picked a reviewer for you, use r? to override)

Main reason is to simplify the code for what's to come, but also I don't know if that ever made a noticeable perf difference. The caching was introduced in 9c5e86d.

This is to clarify the API of VariantFields in preparation for filtering.

This was previously done by using tyerr as a fake type. That was hacky.

I had removed it a few commits ago to ease refactoring.

I introduced this mistake in 175976e and I can't quite remember what the reasoning was back then.

The idea is that `PatStack` is mostly used in the Matrix, and `Fields` is used whenever we're close to a relevant constructor. That way, we have a bunch of functions to go back and forth between a `Pat` and a `Constructor` along a `Fields`. That's a simpler mental model and better abstraction.

rust-highfive · 2020-05-06T06:38:46Z

The job x86_64-gnu-llvm-8 of your PR failed (pretty log, 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.

========================== Starting Command Output ===========================
[command]/bin/bash --noprofile --norc /home/vsts/work/_temp/1160c41f-f562-490d-bc77-0c3a6696d9d0.sh

##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/71939/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
---
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/71939/merge:refs/remotes/pull/71939/merge
---
 ---> cb2676f08729
Step 5/8 : ENV RUST_CONFIGURE_ARGS       --build=x86_64-unknown-linux-gnu       --llvm-root=/usr/lib/llvm-8       --enable-llvm-link-shared       --set rust.thin-lto-import-instr-limit=10
 ---> Using cache
 ---> df25ce111862
Step 6/8 : ENV SCRIPT python2.7 ../x.py test --exclude src/tools/tidy &&            python2.7 ../x.py test src/test/mir-opt --pass=build                                   --target=armv5te-unknown-linux-gnueabi &&            python2.7 ../x.py test src/tools/tidy
 ---> 599b9ac96b27
Step 7/8 : ENV NO_DEBUG_ASSERTIONS=1
 ---> Using cache
 ---> 091087e35a36
---
   Compiling rustc_feature v0.0.0 (/checkout/src/librustc_feature)
   Compiling fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
   Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
   Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir)
   Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
   Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
   Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse)
   Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
   Compiling rustc_ast_passes v0.0.0 (/checkout/src/librustc_ast_passes)
---
   Compiling rustc_feature v0.0.0 (/checkout/src/librustc_feature)
   Compiling fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
   Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
   Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir)
   Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
   Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
   Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse)
   Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
   Compiling rustc_ast_passes v0.0.0 (/checkout/src/librustc_ast_passes)
---
......................i............................................................................. 1800/9988
.................................................................................................... 1900/9988
.......................................i............................................................ 2000/9988
.................................................................................................... 2100/9988
.............................iiiii.................................................................. 2200/9988
.................................................................................................... 2400/9988
.................................................................................................... 2500/9988
.................................................................................................... 2600/9988
.................................................................................................... 2700/9988
---
................i...............i................................................................... 5100/9988
.................................................................................................... 5200/9988
..............................................................i..................................... 5300/9988
.....................................................i.............................................. 5400/9988
.........................................................ii.ii........i...i......................... 5500/9988
..................................................................................................i. 5600/9988
....i............................................................................................... 5800/9988
........................................ii.....................................i.................... 5900/9988
.................................................................................................... 6000/9988
.................................................................................................... 6100/9988
.................................................................................................... 6100/9988
............................................................................ii...i..ii...........i.. 6200/9988
.................................................................................................... 6400/9988
.................................................................................................... 6500/9988
.................................................................................................... 6600/9988
.................................................................................................... 6600/9988
........i..ii....................................................................................... 6700/9988
.................................................................................................... 6900/9988
.........i.......................................................................................... 7000/9988
.................................................................................................... 7100/9988
...................................................i................................................ 7200/9988
---
.................................................................................................... 7900/9988
.................................................................................................... 8000/9988
.................................................................................................... 8100/9988
...................i................................................................................ 8200/9988
.........................................................................iiiiii.iiiii.i............. 8300/9988
..........................i......................................................................... 8500/9988
.................................................................................................... 8600/9988
.................................................................................................... 8700/9988
.................................................................................................... 8800/9988
---
---- [run-fail] run-fail/match-disc-bot.rs stdout ----

error: compilation failed!
status: exit code: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/run-fail/match-disc-bot.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-fail/match-disc-bot/a" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-fail/match-disc-bot/auxiliary"
------------------------------------------

------------------------------------------
stderr:
---
thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:348:22
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace


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/run-fail" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-fail" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "run-fail" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-8/bin/FileCheck" "--nodejs" "/usr/bin/node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -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" "8.0.0" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --exclude src/tools/tidy
Build completed unsuccessfully in 1:04:57
Build completed unsuccessfully in 1:04:57
== clock drift check ==
  local time: Wed May  6 06:38:38 UTC 2020
  network time: Wed, 06 May 2020 06:38:39 GMT
== end clock drift check ==

##[error]Bash exited with code '1'.
##[section]Finishing: Run build
##[section]Starting: Checkout rust-lang/rust@refs/pull/71939/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
Author       : Microsoft
Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
==============================================================================
Cleaning any cached credential from repository: rust-lang/rust (GitHub)
##[section]Finishing: Checkout rust-lang/rust@refs/pull/71939/merge to s
Cleaning up task key
Start cleaning up orphan processes.
Terminate orphan process: pid (3570) (python)
##[section]Finishing: Finalize Job

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 @rust-lang/infra. (Feature Requests)

Nadrieril · 2020-05-06T11:08:39Z

Try reverting "We don't use TyErr anymore", it should fix ci without changing anything else

This reverts commit 9d9d3c9.

mark-i-m · 2020-05-06T15:38:02Z

@Nadrieril Hmmm, that does seem to fix it.

Nadrieril · 2020-05-06T16:57:01Z

Yeah it does, but that's just a workaround. I could use that to get my own PR to build but the underlying bug might come back to bite us later

mark-i-m · 2020-05-06T17:08:47Z

Yes, and it also wouldn't resolve the abuse of tykind::err, which was the original point. At the same time, it would be nice to not have to fix this bug too before pushing in your changes...

mark-i-m · 2020-05-06T19:38:29Z

@Nadrieril I'm going to close this issue, but I can reopen and test other stuff if you want.

Nadrieril · 2020-05-06T23:12:08Z

It still solves the abuse of tyerr! The commit you reversed did something else that's not directly related to tyerr

mark-i-m · 2020-05-07T01:23:45Z

Oh, wow, I didn't even read the commit. Awesome!

make all uses of ty::Error or ConstKind::Error delay a span bug

03ceec5

rust-highfive assigned davidtwco May 6, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 6, 2020

mark-i-m force-pushed the ty-err-3-test branch 2 times, most recently from 608df70 to 927c45d Compare May 6, 2020 05:13

mark-i-m and others added 21 commits May 6, 2020 00:28

lazily construct errors

b9ec308

use trait_object_dummy_self instead of err

3633832

Factor the code that generates TyErrs

2218f59

We already handle arrays of unknown length correctly

7037bcc

Only need TyErr for uninhabited types

40553dc

Small tweaks

31acfb9

Factor out the condition for hiding fields

e73b84a

Remove caching of wildcard_subpatterns

76df2f4

Main reason is to simplify the code for what's to come, but also I don't know if that ever made a noticeable perf difference. The caching was introduced in 9c5e86d.

Factor out a struct holding the fields of a variant

72beeae

Swap responsibility for generating wildcard fields

710fc8a

wildcards_subpatterns returns PatStack

d49fda9

This is to clarify the API of VariantFields in preparation for filtering.

Prepare VariantsFields for filtering

05623fd

Filter out fields that should not be seen.

0c55f7f

This was previously done by using tyerr as a fake type. That was hacky.

Rename VariantFields to StructFields

f6a9045

Restore caching of wildcard subfields

b879567

I had removed it a few commits ago to ease refactoring.

Fix incorrect ordering

7ad17a5

I introduced this mistake in 175976e and I can't quite remember what the reasoning was back then.

We don't use TyErr anymore

9d9d3c9

Document Fields a bit

af175e0

Inline cx methods used only once

f95cbac

Inline StructFields into Fields

b12aab5

mark-i-m force-pushed the ty-err-3-test branch from 927c45d to b12aab5 Compare May 6, 2020 05:29

Revert "We don't use TyErr anymore"

c67da30

This reverts commit 9d9d3c9.

mark-i-m closed this May 6, 2020

mark-i-m mentioned this pull request May 7, 2020

De-abuse TyKind::Error in exhaustiveness checking #71930

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DO NOT MERGE] Testing #70551 with de-abuse PRs #71939

[DO NOT MERGE] Testing #70551 with de-abuse PRs #71939

mark-i-m commented May 6, 2020

rust-highfive commented May 6, 2020

rust-highfive commented May 6, 2020

Nadrieril commented May 6, 2020

mark-i-m commented May 6, 2020

Nadrieril commented May 6, 2020

mark-i-m commented May 6, 2020

mark-i-m commented May 6, 2020

Nadrieril commented May 6, 2020

mark-i-m commented May 7, 2020

[DO NOT MERGE] Testing #70551 with de-abuse PRs #71939

[DO NOT MERGE] Testing #70551 with de-abuse PRs #71939

Conversation

mark-i-m commented May 6, 2020

rust-highfive commented May 6, 2020

rust-highfive commented May 6, 2020

Nadrieril commented May 6, 2020

mark-i-m commented May 6, 2020

Nadrieril commented May 6, 2020

mark-i-m commented May 6, 2020

mark-i-m commented May 6, 2020

Nadrieril commented May 6, 2020

mark-i-m commented May 7, 2020