Rollup of 9 pull requests #66917
Merged
Rollup of 9 pull requests #66917
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
…triplett More useful test error messages on should_panic(expected=...) mismatch Fixes rust-lang#66304 r? @gilescope Shows both the actual as well as the expected panic value when a test with `should_panic(expected=...)` fails. This makes `should_panic` more consistent with `assert_eq`. I am not sure whether printing the `Any::type_id()` is useful, is there something better that we could print for non-string panic values?
Miri: run panic-catching tests in liballoc I also converted two tests from using `thread::spawn(...).join()` just for catching panics, to `catch_panic`, so that Miri can run them.
…r=matthewjasper Improve lifetime errors with implicit trait object lifetimes r? @matthewjasper cc @estebank I still think the ideal solution would be to construct a `BrAnon`, but that seems like a more invasive change, and can be done later. This at least gets rid of the hack in `OutliveSuggestion` and is slightly more principled.
Use recursion_limit for const eval stack limit cc rust-lang/miri#643 @orium @RalfJung I'm really not certain how exactly to handle this change, but it looks like it's that simple. Reuse `recursion_limit` ("The maximum recursion limit for potentially infinitely recursive operations such as auto-dereference and monomorphization") which is configurable by the user for the const evaluation stack frame limit. The other option is to make `const_eval_stack_frame_limit` configurable in the same way as `recursion_limit` (but I'm not sure how to do that and it'd be a bigger change). Fixes rust-lang/miri#643.
…ant, r=oli-obk Do `min_const_fn` checks for `SetDiscriminant`s target Fixes rust-lang#66556 r? @oli-obk @ecstatic-morse
…-obk const_prop: detect and avoid catching Miri errors that require allocation r? @wesleywiser @oli-obk
…llaumeGomez Add long error code explanation message for E0203 Addressed some of rust-lang#61137 r? @GuillaumeGomez
Format liballoc with rustfmt Same strategy as rust-lang#66691 -- as with my previous formatting PRs, I am avoiding causing merge conflicts in other PRs by only touches those files that are not involved in any currently open PR. Files that appear in new PRs between when this PR is opened and when it makes it to the top of the bors queue will be reverted from this PR. The list of files involved in open PRs is determined by querying GitHub's GraphQL API [with this script](https://gist.github.com/dtolnay/aa9c34993dc051a4f344d1b10e4487e8). With the list of files from the script in outstanding_files, the relevant commands were: ``` $ find src/liballoc -name '*.rs' \ | xargs rustfmt --edition=2018 --unstable-features --skip-children $ rg liballoc outstanding_files | xargs git checkout -- ``` To confirm no funny business: ``` $ git checkout $THIS_COMMIT^ $ git show --pretty= --name-only $THIS_COMMIT \ | xargs rustfmt --edition=2018 --unstable-features --skip-children $ git diff $THIS_COMMIT # there should be no difference ``` r? @Dylan-DPC
pass Queries to compiler callbacks rust-lang#66791 made it impossible to access the tcx in the callbacks; this should fix that. r? @Zoxc
| @bors r+ p=9 rollup=never |
| 📌 Commit bed4c09 has been approved by |
| 🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened |
bors added the S-waiting-on-bors | @bors p=2000 |
| ⌛ Testing commit bed4c09 with merge 8398ce625ef260401b272dac0f9913b8fdbe99a4... |
| 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.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 |
| 💔 Test failed - checks-azure |
bors added S-waiting-on-review | @bors retry |
bors added S-waiting-on-bors | ⌛ Testing commit bed4c09 with merge c50366f77373c8a41902f604025cb3b5c349fad2... |
| 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.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 |
| 💔 Test failed - checks-azure |
bors added S-waiting-on-review | @bors retry |
bors added S-waiting-on-bors bors added a commit that referenced this pull request Dec 1, 2019
Rollup of 9 pull requests Successful merges: - #66503 (More useful test error messages on should_panic(expected=...) mismatch) - #66662 (Miri: run panic-catching tests in liballoc) - #66679 (Improve lifetime errors with implicit trait object lifetimes) - #66726 (Use recursion_limit for const eval stack limit) - #66790 (Do `min_const_fn` checks for `SetDiscriminant`s target) - #66832 (const_prop: detect and avoid catching Miri errors that require allocation) - #66880 (Add long error code explanation message for E0203) - #66890 (Format liballoc with rustfmt) - #66896 (pass Queries to compiler callbacks) Failed merges: r? @ghost
| ☀️ Test successful - checks-azure |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Successful merges:
min_const_fnchecks forSetDiscriminants target #66790 (Domin_const_fnchecks forSetDiscriminants target)Failed merges:
r? @ghost