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.

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

Rollup of 9 pull requests #66917

Merged
merged 29 commits into from
Dec 1, 2019
Merged

Rollup of 9 pull requests #66917

merged 29 commits into from
Dec 1, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Dec 1, 2019

Successful merges:

Failed merges:

r? @ghost

Thomas Etter and others added 29 commits November 18, 2019 00:51
…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
@Centril Centril added the rollup A PR which is a rollup label Dec 1, 2019
@Centril
Copy link
Contributor Author

Centril commented Dec 1, 2019

@bors r+ p=9 rollup=never

@bors
Copy link
Contributor

bors commented Dec 1, 2019

📌 Commit bed4c09 has been approved by Centril

@bors
Copy link
Contributor

bors commented Dec 1, 2019

🌲 The tree is currently closed for pull requests below priority 1000, 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 1, 2019
@Centril
Copy link
Contributor Author

Centril commented Dec 1, 2019

@bors p=2000

@bors
Copy link
Contributor

bors commented Dec 1, 2019

⌛ Testing commit bed4c09 with merge 8398ce625ef260401b272dac0f9913b8fdbe99a4...

@rust-highfive
Copy link
Collaborator

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-01T03:54:33.7621519Z do so (now or later) by using -b with the checkout command again. Example:
2019-12-01T03:54:33.7622016Z 
2019-12-01T03:54:33.7622334Z   git checkout -b <new-branch-name>
2019-12-01T03:54:33.7622504Z 
2019-12-01T03:54:33.7622696Z HEAD is now at 8398ce625 Auto merge of #66917 - Centril:rollup-xj2enik, r=Centril
2019-12-01T03:54:33.8018751Z ##[section]Starting: Setup environment
2019-12-01T03:54:33.8127680Z ==============================================================================
2019-12-01T03:54:33.8127789Z Task         : Bash
2019-12-01T03:54:33.8127892Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-12-01T03:54:35.6156744Z 
2019-12-01T03:54:35.6156785Z 
2019-12-01T03:54:35.6156823Z 
2019-12-01T03:54:35.6156875Z 
2019-12-01T03:54:35.6157001Z  - #66503 (More useful test error messages on should_panic(expected=...) mismatch)
2019-12-01T03:54:35.6157159Z  - #66662 (Miri: run panic-catching tests in liballoc)
2019-12-01T03:54:35.6157267Z  - #66679 (Improve lifetime errors with implicit trait object lifetimes)
2019-12-01T03:54:35.6157389Z  - #66726 (Use recursion_limit for const eval stack limit)
2019-12-01T03:54:35.6157495Z  - #66790 (Do `min_const_fn` checks for `SetDiscriminant`s target)
2019-12-01T03:54:35.6157639Z  - #66832 (const_prop: detect and avoid catching Miri errors that require allocation)
2019-12-01T03:54:35.6157862Z  - #66890 (Format liballoc with rustfmt)
2019-12-01T03:54:35.6157970Z  - #66896 (pass Queries to compiler callbacks)
2019-12-01T03:54:35.6158054Z AGENT_BUILDDIRECTORY=D:\a\1
2019-12-01T03:54:35.6158166Z AGENT_DISABLELOGPLUGIN_TESTFILEPUBLISHERPLUGIN=true
---
2019-12-01T03:54:35.6167319Z BUILD_SOURCEBRANCHNAME=auto
2019-12-01T03:54:35.6167413Z BUILD_SOURCESDIRECTORY=D:\a\1\s
2019-12-01T03:54:35.6167508Z BUILD_SOURCEVERSION=8398ce625ef260401b272dac0f9913b8fdbe99a4
2019-12-01T03:54:35.6167611Z BUILD_SOURCEVERSIONAUTHOR=bors
2019-12-01T03:54:35.6167714Z BUILD_SOURCEVERSIONMESSAGE=Auto merge of #66917 - Centril:rollup-xj2enik, r=Centril
2019-12-01T03:54:35.6167930Z CI_JOB_NAME=dist-i686-mingw
2019-12-01T03:54:35.6168010Z COBERTURA_HOME=C:\cobertura-2.1.1
2019-12-01T03:54:35.6168179Z COMMONPROGRAMFILES=C:\Program Files\Common Files
2019-12-01T03:54:35.6168298Z COMMON_TESTRESULTSDIRECTORY=D:\a\1\TestResults
---
2019-12-01T03:54:51.7310010Z Chocolatey v0.10.15
2019-12-01T03:55:34.6651638Z Installing the following packages:
2019-12-01T03:55:34.6658246Z msys2
2019-12-01T03:55:34.6664344Z By installing you accept licenses for the packages.
2019-12-01T03:57:15.5118382Z Error retrieving packages from source 'https://chocolatey.org/api/v2/':
2019-12-01T03:57:15.5119307Z  Could not connect to the feed specified at 'https://chocolatey.org/api/v2/'. Please verify that the package source (located in the Package Manager Settings) is valid and ensure your network connectivity.
2019-12-01T03:57:15.5127204Z msys2 not installed. The package was not found with the source(s) listed.
2019-12-01T03:57:15.5127832Z  Source(s): 'https://chocolatey.org/api/v2/'
2019-12-01T03:57:15.5128303Z  NOTE: When you specify explicit sources, it overrides default sources.
2019-12-01T03:57:15.5128535Z If the package version is a prerelease and you didn't specify `--pre`,
2019-12-01T03:57:15.5129194Z Please see https://chocolatey.org/docs/troubleshooting for more 
2019-12-01T03:57:15.5129388Z  assistance.
2019-12-01T03:57:15.5276738Z 
2019-12-01T03:57:15.5277395Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-12-01T03:57:15.5277395Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-12-01T03:57:15.5278360Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-12-01T03:57:15.5282739Z 
2019-12-01T03:57:15.5288069Z Failures
2019-12-01T03:57:15.5295160Z  - msys2 - msys2 not installed. The package was not found with the source(s) listed.
2019-12-01T03:57:15.5295781Z  Source(s): 'https://chocolatey.org/api/v2/'
2019-12-01T03:57:15.5296285Z  NOTE: When you specify explicit sources, it overrides default sources.
2019-12-01T03:57:15.5296770Z If the package version is a prerelease and you didn't specify `--pre`,
2019-12-01T03:57:15.5297684Z Please see https://chocolatey.org/docs/troubleshooting for more 
2019-12-01T03:57:15.5298156Z  assistance.
2019-12-01T03:57:15.8880869Z 
2019-12-01T03:57:15.8880869Z 
2019-12-01T03:57:15.8965207Z ##[error]Bash exited with code '1'.
2019-12-01T03:57:15.9111033Z ##[section]Starting: Checkout
2019-12-01T03:57:15.9235414Z ==============================================================================
2019-12-01T03:57:15.9235535Z Task         : Get sources
2019-12-01T03:57:15.9235624Z 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)

@bors
Copy link
Contributor

bors commented Dec 1, 2019

💔 Test failed - checks-azure

@bors 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 Dec 1, 2019
@Centril
Copy link
Contributor Author

Centril commented Dec 1, 2019

@bors retry

@bors 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 Dec 1, 2019
@bors
Copy link
Contributor

bors commented Dec 1, 2019

⌛ Testing commit bed4c09 with merge c50366f77373c8a41902f604025cb3b5c349fad2...

@rust-highfive
Copy link
Collaborator

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-01T04:44:20.8529849Z do so (now or later) by using -b with the checkout command again. Example:
2019-12-01T04:44:20.8530080Z 
2019-12-01T04:44:20.8530153Z   git checkout -b <new-branch-name>
2019-12-01T04:44:20.8530268Z 
2019-12-01T04:44:20.8530748Z HEAD is now at c50366f77 Auto merge of #66917 - Centril:rollup-xj2enik, r=Centril
2019-12-01T04:44:20.8864628Z ##[section]Starting: Setup environment
2019-12-01T04:44:20.8978288Z ==============================================================================
2019-12-01T04:44:20.8978401Z Task         : Bash
2019-12-01T04:44:20.8978479Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-12-01T04:44:22.6137451Z 
2019-12-01T04:44:22.6137604Z 
2019-12-01T04:44:22.6137734Z 
2019-12-01T04:44:22.6137896Z 
2019-12-01T04:44:22.6138112Z  - #66503 (More useful test error messages on should_panic(expected=...) mismatch)
2019-12-01T04:44:22.6138333Z  - #66662 (Miri: run panic-catching tests in liballoc)
2019-12-01T04:44:22.6138544Z  - #66679 (Improve lifetime errors with implicit trait object lifetimes)
2019-12-01T04:44:22.6138772Z  - #66726 (Use recursion_limit for const eval stack limit)
2019-12-01T04:44:22.6138974Z  - #66790 (Do `min_const_fn` checks for `SetDiscriminant`s target)
2019-12-01T04:44:22.6139188Z  - #66832 (const_prop: detect and avoid catching Miri errors that require allocation)
2019-12-01T04:44:22.6139600Z  - #66890 (Format liballoc with rustfmt)
2019-12-01T04:44:22.6139780Z  - #66896 (pass Queries to compiler callbacks)
2019-12-01T04:44:22.6139969Z AGENT_BUILDDIRECTORY=D:\a\1
2019-12-01T04:44:22.6140159Z AGENT_DISABLELOGPLUGIN_TESTFILEPUBLISHERPLUGIN=true
---
2019-12-01T04:44:22.6152305Z BUILD_SOURCEBRANCHNAME=auto
2019-12-01T04:44:22.6152483Z BUILD_SOURCESDIRECTORY=D:\a\1\s
2019-12-01T04:44:22.6152689Z BUILD_SOURCEVERSION=c50366f77373c8a41902f604025cb3b5c349fad2
2019-12-01T04:44:22.6152863Z BUILD_SOURCEVERSIONAUTHOR=bors
2019-12-01T04:44:22.6153067Z BUILD_SOURCEVERSIONMESSAGE=Auto merge of #66917 - Centril:rollup-xj2enik, r=Centril
2019-12-01T04:44:22.6153441Z CI_JOB_NAME=x86_64-mingw-1
2019-12-01T04:44:22.6153637Z COBERTURA_HOME=C:\cobertura-2.1.1
2019-12-01T04:44:22.6153810Z COMMONPROGRAMFILES=C:\Program Files\Common Files
2019-12-01T04:44:22.6154004Z COMMON_TESTRESULTSDIRECTORY=D:\a\1\TestResults
---
2019-12-01T04:44:38.1139765Z Chocolatey v0.10.15
2019-12-01T04:45:23.4800107Z Installing the following packages:
2019-12-01T04:45:23.4804452Z msys2
2019-12-01T04:45:23.4809076Z By installing you accept licenses for the packages.
2019-12-01T04:47:04.3291102Z Error retrieving packages from source 'https://chocolatey.org/api/v2/':
2019-12-01T04:47:04.3326289Z  Could not connect to the feed specified at 'https://chocolatey.org/api/v2/'. Please verify that the package source (located in the Package Manager Settings) is valid and ensure your network connectivity.
2019-12-01T04:47:04.3361872Z msys2 not installed. The package was not found with the source(s) listed.
2019-12-01T04:47:04.3416945Z  Source(s): 'https://chocolatey.org/api/v2/'
2019-12-01T04:47:04.3417378Z  NOTE: When you specify explicit sources, it overrides default sources.
2019-12-01T04:47:04.3417638Z If the package version is a prerelease and you didn't specify `--pre`,
2019-12-01T04:47:04.3418093Z Please see https://chocolatey.org/docs/troubleshooting for more 
2019-12-01T04:47:04.3418318Z  assistance.
2019-12-01T04:47:04.3418474Z 
2019-12-01T04:47:04.3418694Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-12-01T04:47:04.3418694Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-12-01T04:47:04.3418932Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-12-01T04:47:04.3419114Z 
2019-12-01T04:47:04.3419309Z Failures
2019-12-01T04:47:04.3419512Z  - msys2 - msys2 not installed. The package was not found with the source(s) listed.
2019-12-01T04:47:04.3419749Z  Source(s): 'https://chocolatey.org/api/v2/'
2019-12-01T04:47:04.3419956Z  NOTE: When you specify explicit sources, it overrides default sources.
2019-12-01T04:47:04.3420202Z If the package version is a prerelease and you didn't specify `--pre`,
2019-12-01T04:47:04.3420633Z Please see https://chocolatey.org/docs/troubleshooting for more 
2019-12-01T04:47:04.3420849Z  assistance.
2019-12-01T04:47:04.3420992Z 
2019-12-01T04:47:04.3421202Z Did you know the proceeds of Pro (and some proceeds from other
2019-12-01T04:47:04.3421202Z Did you know the proceeds of Pro (and some proceeds from other
2019-12-01T04:47:04.3421544Z  licensed editions) go into bettering the community infrastructure?
2019-12-01T04:47:04.3421807Z  Your support ensures an active community, keeps Chocolatey tip top,
2019-12-01T04:47:04.3422043Z  plus it nets you some awesome features!
2019-12-01T04:47:04.3422228Z  https://chocolatey.org/compare
2019-12-01T04:47:04.7014699Z 
2019-12-01T04:47:04.7082826Z ##[error]Bash exited with code '1'.
2019-12-01T04:47:04.7215155Z ##[section]Starting: Checkout
2019-12-01T04:47:04.7339627Z ==============================================================================
2019-12-01T04:47:04.7339757Z Task         : Get sources
2019-12-01T04:47:04.7339860Z 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)

@bors
Copy link
Contributor

bors commented Dec 1, 2019

💔 Test failed - checks-azure

@bors 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 Dec 1, 2019
@Centril
Copy link
Contributor Author

Centril commented Dec 1, 2019

@bors retry

@bors 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 Dec 1, 2019
@bors
Copy link
Contributor

bors commented Dec 1, 2019

⌛ Testing commit bed4c09 with merge 4007d4e...

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
@bors
Copy link
Contributor

bors commented Dec 1, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 4007d4e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 1, 2019
@bors bors merged commit bed4c09 into rust-lang:master Dec 1, 2019
@Centril Centril deleted the rollup-xj2enik branch December 1, 2019 09:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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
Development

Successfully merging this pull request may close these issues.

9 participants