Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Rollup of 6 pull requests #67522

Closed
wants to merge 23 commits into from
Closed

Rollup of 6 pull requests #67522

wants to merge 23 commits into from

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Dec 22, 2019

Successful merges:

Failed merges:

r? @ghost

mark-i-m and others added 23 commits December 20, 2019 22:26
@mark-i-m
Refactor region error handling to be done by mirborrowckctx
43888e8
@mark-i-m
add unreported error variant
94a9c62
@mark-i-m
tidy
3902e56
@mark-i-m
fix outlives suggestions
e5a1f48
@mark-i-m
some more refactoring + maintain diagnostic status quo
5d9e74e
@mark-i-m
make regionerrors a typedef
e4379e6
@qnighy
Remove iter_private.rs
6903836 
The contents of this file have been moved in rust-lang#56932 (520e8b0) and the
file should have been removed as well.
@mark-i-m
is_reported flag
5b06025
@mark-i-m
add comments
bd0ea19
@mark-i-m
use vec instead of smallvec
a155a9b
@Centril
misc cleanup in match MIR building
4f0dc7b
@Centril
simplify MIR building with cfg.goto(...)
f5a8d1a
@mark-i-m
convert hrtb error
d855782
@mark-i-m
minor updates to comments
1d9c561
@skinnyBat
Add simpler entry points to const eval for common usages.
c010d84
@Mark-Simulacrum
Remove mem::uninitalized from tests
cb599cc 
This purges uses of uninitialized where possible from test cases. Some
are merely moved over to the equally bad pattern of
MaybeUninit::uninit().assume_init() but with an annotation that this is
"the best we can do".
@Mark-Simulacrum
Document why Any is not an unsafe trait
6878913
@Centril
Rollup merge of rust-lang#66877 - skinny121:const-eval-entry-points, …
76384e1 
…r=oli-obk

Add simpler entry points to const eval for common usages.

I found the `tcx.const_eval` API to be complex/awkward to work with, because of the inherent complexity from all of the different situations it is called from. Though it mainly used in one of the following ways:
- Evaluates the value of a constant without any substitutions, e.g. evaluating a static, discriminant, etc.
- Evaluates the value of a resolved instance of a constant. this happens when evaluating unevaluated constants or normalising trait constants.
- Evaluates a promoted constant.

This PR adds three new functions `const_eval_mono`, `const_eval_resolve`, and `const_eval_promoted` to `TyCtxt`, which each cater to one of the three ways `tcx.const_eval`
 is normally used.
@Centril
Rollup merge of rust-lang#67241 - mark-i-m:simplify-borrow_check-3, r…
8f17dcb 
…=matthewjasper

Refactorings to borrowck region diagnostic reporting

This PR is a followup to rust-lang#66886 and rust-lang#67404

EDIT: updated

In this PR:  Clean up how errors are collected from NLL: introduce `borrow_check::diagnostics::RegionErrors` to collect errors. This is later passed to `MirBorrowckCtx::report_region_errors` after the `MirBorrowckCtx` is created. This will allow us to refactor away some of the extra context structs floating around (but we don't do it in this PR).  `borrow_check::region_infer` is now mostly free of diagnostic generating code. The signatures of most of the functions in `region_infer` lose somewhere between 4 and 7 arguments :)

Left for future (feedback appreciated):

- Merge `ErrorRegionCtx` with `MirBorrowckCtx`, as suggested by @matthewjasper in rust-lang#66886 (comment)
- Maybe move the contents of `borrow_check::nll` into `borrow_check` and remove the `nll` submodule altogether.
- Find a way to make `borrow_check::diagnostics::region_errors` less of a strange appendage to `RegionInferenceContext`. I'm not really sure how to do this yet. Ideas welcome.
@Centril
Rollup merge of rust-lang#67499 - Centril:mir-match-clean, r=matthewj…
c20b65c 
…asper

Misc MIR building cleanups

r? @matthewjasper
@Centril
Rollup merge of rust-lang#67506 - qnighy:remove-iter-private, r=Dylan…
66d6b5c 
…-DPC

Remove iter_private.rs

The contents of this file have been moved in rust-lang#56932 (520e8b0) and the file should have been removed as well.
@Centril
Rollup merge of rust-lang#67507 - Mark-Simulacrum:purge-uninit, r=Cen…
dd1f3ca 
…tril

Remove mem::uninitalized from tests

This purges uses of uninitialized where possible from test cases. Some
are merely moved over to the equally bad pattern of
MaybeUninit::uninit().assume_init() but with an annotation that this is
"the best we can do".

Fixes rust-lang#67507
@Centril
Rollup merge of rust-lang#67519 - Mark-Simulacrum:any-unsafe, r=Centril
ab93543 
Document why Any is not an unsafe trait

The added documentation is not public (i.e., not in a doc comment) but that seems appropriate for this sort of low-level detail.

Fixes rust-lang#62303
@Centril Centril added the rollup A PR which is a rollup label Dec 22, 2019
@Centril
Copy link
Contributor Author

Centril commented Dec 22, 2019

@bors r+ p=200 rollup=never

@bors
Copy link
Contributor

bors commented Dec 22, 2019

📌 Commit ab93543 has been approved by Centril

@bors
Copy link
Contributor

bors commented Dec 22, 2019

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 22, 2019
@Centril Centril closed this Dec 22, 2019
@Centril Centril deleted the rollup-c2ymsz4 branch December 22, 2019 14:16
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-7 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. 
2019-12-22T13:17:10.4525960Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-22T13:17:10.4734359Z ##[command]git config gc.auto 0
2019-12-22T13:17:10.4821952Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-22T13:17:10.4876451Z ##[command]git config --get-all http.proxy
2019-12-22T13:17:10.5043404Z ##[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/67522/merge:refs/remotes/pull/67522/merge
---
2019-12-22T14:17:17.6294482Z .................................................................................................... 1600/9427
2019-12-22T14:17:22.3490697Z .................................................................................................... 1700/9427
2019-12-22T14:17:32.8041271Z .....................................................................................i.............. 1800/9427
2019-12-22T14:17:40.3743626Z .................................................................................................... 1900/9427
2019-12-22T14:17:47.4651189Z ......................................................................iiiii......................... 2000/9427
2019-12-22T14:18:08.1511428Z .................................................................................................... 2200/9427
2019-12-22T14:18:10.6552686Z .................................................................................................... 2300/9427
2019-12-22T14:18:13.2458742Z .................................................................................................... 2400/9427
2019-12-22T14:18:26.8508419Z .................................................................................................... 2500/9427
---
2019-12-22T14:21:21.8757953Z .i...............i.................................................................................. 4900/9427
2019-12-22T14:21:32.4637698Z .................................................................................................... 5000/9427
2019-12-22T14:21:37.5550865Z .............................................i...................................................... 5100/9427
2019-12-22T14:21:47.8541478Z .................................................................................................... 5200/9427
2019-12-22T14:21:53.9215167Z ............ii.ii...........i....................................................................... 5300/9427
2019-12-22T14:22:03.2814909Z .................................................................................................... 5500/9427
2019-12-22T14:22:14.9221551Z ..............................................................................................i..... 5600/9427
2019-12-22T14:22:23.0020766Z .................................................................................................... 5700/9427
2019-12-22T14:22:28.2243656Z .................................................................................................... 5800/9427
2019-12-22T14:22:28.2243656Z .................................................................................................... 5800/9427
2019-12-22T14:22:37.9392398Z ..................................................................................ii...i..ii........ 5900/9427
2019-12-22T14:23:00.7767375Z .................................................................................................... 6100/9427
2019-12-22T14:23:08.9629385Z .................................................................................................... 6200/9427
2019-12-22T14:23:16.9552333Z .................................................................................................... 6300/9427
2019-12-22T14:23:16.9552333Z .................................................................................................... 6300/9427
2019-12-22T14:23:34.2164438Z .........i..ii...................................................................................... 6400/9427
2019-12-22T14:23:54.8993355Z .....................................................................................i.............. 6600/9427
2019-12-22T14:23:57.1305620Z .................................................................................................... 6700/9427
2019-12-22T14:23:59.3796005Z .....................................................................................i.............. 6800/9427
2019-12-22T14:24:02.1123886Z .................................................................................................... 6900/9427
---
2019-12-22T14:28:54.1880747Z diff of stderr:
2019-12-22T14:28:54.1880878Z 
2019-12-22T14:28:54.1881076Z 7    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
2019-12-22T14:28:54.1881238Z 8 
2019-12-22T14:28:54.1881662Z 9 error[E0004]: non-exhaustive patterns: type `&Void` is non-empty
2019-12-22T14:28:54.1882642Z +   --> $DIR/uninhabited-matches-feature-gated.rs:16:19
2019-12-22T14:28:54.1882836Z 11    |
2019-12-22T14:28:54.1883005Z 12 LL | enum Void {}
2019-12-22T14:28:54.1883005Z 12 LL | enum Void {}
2019-12-22T14:28:54.1883404Z 13    | ------------ `Void` defined here
2019-12-22T14:28:54.1883770Z 18    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
2019-12-22T14:28:54.1883923Z 19 
2019-12-22T14:28:54.1883923Z 19 
2019-12-22T14:28:54.1884345Z 20 error[E0004]: non-exhaustive patterns: type `(Void,)` is non-empty
2019-12-22T14:28:54.1885738Z +   --> $DIR/uninhabited-matches-feature-gated.rs:19:19
2019-12-22T14:28:54.1885948Z 22    |
2019-12-22T14:28:54.1886121Z 23 LL |     let _ = match x {};
2019-12-22T14:28:54.1886281Z 24    |                   ^
2019-12-22T14:28:54.1886281Z 24    |                   ^
2019-12-22T14:28:54.1886409Z 
2019-12-22T14:28:54.1886604Z 26    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
2019-12-22T14:28:54.1886753Z 27 
2019-12-22T14:28:54.1887184Z 28 error[E0004]: non-exhaustive patterns: type `[Void; 1]` is non-empty
2019-12-22T14:28:54.1888087Z +   --> $DIR/uninhabited-matches-feature-gated.rs:22:19
2019-12-22T14:28:54.1888294Z 30    |
2019-12-22T14:28:54.1888448Z 31 LL |     let _ = match x {};
2019-12-22T14:28:54.1888594Z 32    |                   ^
2019-12-22T14:28:54.1888594Z 32    |                   ^
2019-12-22T14:28:54.1888736Z 
2019-12-22T14:28:54.1888893Z 34    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
2019-12-22T14:28:54.1889278Z 35 
2019-12-22T14:28:54.1890188Z 36 error[E0004]: non-exhaustive patterns: `&[_, ..]` not covered
2019-12-22T14:28:54.1892094Z +   --> $DIR/uninhabited-matches-feature-gated.rs:25:19
2019-12-22T14:28:54.1892407Z 38    |
2019-12-22T14:28:54.1892555Z 39 LL |     let _ = match x {
2019-12-22T14:28:54.1892555Z 39 LL |     let _ = match x {
2019-12-22T14:28:54.1892739Z 40    |                   ^ pattern `&[_, ..]` not covered
2019-12-22T14:28:54.1893034Z 42    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
2019-12-22T14:28:54.1893176Z 43 
2019-12-22T14:28:54.1893651Z 44 error[E0004]: non-exhaustive patterns: `Err(_)` not covered
2019-12-22T14:28:54.1895932Z -   --> $DIR/uninhabited-matches-feature-gated.rs:32:19
---
2019-12-22T14:28:54.1901491Z 56    |         ^^^^^ pattern `Err(_)` not covered
2019-12-22T14:28:54.1901523Z 
2019-12-22T14:28:54.1901548Z 
2019-12-22T14:28:54.1901591Z The actual stderr differed from the expected stderr.
2019-12-22T14:28:54.1902055Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/uninhabited/uninhabited-matches-feature-gated/uninhabited-matches-feature-gated.stderr
2019-12-22T14:28:54.1902324Z To update references, rerun the tests and pass the `--bless` flag
2019-12-22T14:28:54.1902643Z To only update this specific test, also pass `--test-args uninhabited/uninhabited-matches-feature-gated.rs`
2019-12-22T14:28:54.1902723Z error: 1 errors occurred comparing output.
2019-12-22T14:28:54.1902766Z status: exit code: 1
2019-12-22T14:28:54.1902766Z status: exit code: 1
2019-12-22T14:28:54.1903690Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/uninhabited/uninhabited-matches-feature-gated.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/uninhabited/uninhabited-matches-feature-gated" "-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/ui/uninhabited/uninhabited-matches-feature-gated/auxiliary" "-A" "unused"
2019-12-22T14:28:54.1904043Z ------------------------------------------
2019-12-22T14:28:54.1904077Z 
2019-12-22T14:28:54.1904295Z ------------------------------------------
2019-12-22T14:28:54.1904356Z stderr:
---
2019-12-22T14:28:54.1905442Z    |                   ^ pattern `Err(_)` not covered
2019-12-22T14:28:54.1905484Z    |
2019-12-22T14:28:54.1905535Z    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
2019-12-22T14:28:54.1905587Z 
2019-12-22T14:28:54.1905837Z error[E0004]: non-exhaustive patterns: type `&Void` is non-empty
2019-12-22T14:28:54.1906206Z    |
2019-12-22T14:28:54.1906249Z LL | enum Void {}
2019-12-22T14:28:54.1906249Z LL | enum Void {}
2019-12-22T14:28:54.1906481Z    | ------------ `Void` defined here
2019-12-22T14:28:54.1906527Z ...
2019-12-22T14:28:54.1907082Z LL |     let _ = match x {}; //~ ERROR non-exhaustive
2019-12-22T14:28:54.1907186Z    |
2019-12-22T14:28:54.1907261Z    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
2019-12-22T14:28:54.1907298Z 
2019-12-22T14:28:54.1907298Z 
2019-12-22T14:28:54.1907622Z error[E0004]: non-exhaustive patterns: type `(Void,)` is non-empty
2019-12-22T14:28:54.1907975Z    |
2019-12-22T14:28:54.1907975Z    |
2019-12-22T14:28:54.1908222Z LL |     let _ = match x {}; //~ ERROR non-exhaustive
2019-12-22T14:28:54.1908553Z    |
2019-12-22T14:28:54.1908607Z    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
2019-12-22T14:28:54.1908642Z 
2019-12-22T14:28:54.1908642Z 
2019-12-22T14:28:54.1908972Z error[E0004]: non-exhaustive patterns: type `[Void; 1]` is non-empty
2019-12-22T14:28:54.1909615Z    |
2019-12-22T14:28:54.1909615Z    |
2019-12-22T14:28:54.1910498Z LL |     let _ = match x {}; //~ ERROR non-exhaustive
2019-12-22T14:28:54.1910987Z    |
2019-12-22T14:28:54.1911038Z    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
2019-12-22T14:28:54.1911092Z 
2019-12-22T14:28:54.1911092Z 
2019-12-22T14:28:54.1911407Z error[E0004]: non-exhaustive patterns: `&[_, ..]` not covered
2019-12-22T14:28:54.1911760Z    |
2019-12-22T14:28:54.1911989Z LL |     let _ = match x {   //~ ERROR non-exhaustive
2019-12-22T14:28:54.1911989Z LL |     let _ = match x {   //~ ERROR non-exhaustive
2019-12-22T14:28:54.1912039Z    |                   ^ pattern `&[_, ..]` not covered
2019-12-22T14:28:54.1912148Z    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
2019-12-22T14:28:54.1912183Z 
2019-12-22T14:28:54.1912416Z error[E0004]: non-exhaustive patterns: `Err(_)` not covered
2019-12-22T14:28:54.1912696Z   --> /checkout/src/test/ui/uninhabited/uninhabited-matches-feature-gated.rs:33:19
---
2019-12-22T14:28:54.1913543Z    |
2019-12-22T14:28:54.1913599Z LL |     let Ok(x) = x;
2019-12-22T14:28:54.1913643Z    |         ^^^^^ pattern `Err(_)` not covered
2019-12-22T14:28:54.1913684Z    |
2019-12-22T14:28:54.1913748Z    = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
2019-12-22T14:28:54.1915118Z help: you might want to use `if let` to ignore the variant that isn't matched
2019-12-22T14:28:54.1915197Z    |
2019-12-22T14:28:54.1915240Z LL |     if let Ok(x) = x { /* */ }
2019-12-22T14:28:54.1915281Z    |
---
2019-12-22T14:28:54.1918960Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:537:22
2019-12-22T14:28:54.1919380Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-12-22T14:28:54.1919424Z 
2019-12-22T14:28:54.1919449Z 
2019-12-22T14:28:54.1927566Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "/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/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-7/bin/FileCheck" "--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" "7.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"
2019-12-22T14:28:54.1928354Z 
2019-12-22T14:28:54.1928402Z 
2019-12-22T14:28:54.1976981Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-12-22T14:28:54.1977066Z Build completed unsuccessfully in 1:05:47
2019-12-22T14:28:54.1977066Z Build completed unsuccessfully in 1:05:47
2019-12-22T14:28:54.2028028Z == clock drift check ==
2019-12-22T14:28:54.2048071Z   local time: Sun Dec 22 14:28:54 UTC 2019
2019-12-22T14:28:54.7530183Z   network time: Sun, 22 Dec 2019 14:28:54 GMT
2019-12-22T14:28:54.7533610Z == end clock drift check ==
2019-12-22T14:28:55.5808340Z 
2019-12-22T14:28:55.5958854Z ##[error]Bash exited with code '1'.
2019-12-22T14:28:55.6002134Z ##[section]Starting: Checkout
2019-12-22T14:28:55.6003883Z ==============================================================================
2019-12-22T14:28:55.6003953Z Task         : Get sources
2019-12-22T14:28:55.6004000Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Centril @bors @rust-highfive @mark-i-m @qnighy @skinnyBat @Mark-Simulacrum