Uh oh!
There was an error while loading. Please reload this page.
Rollup of 5 pull requests - #66033
Closed
tmandry wants to merge 17 commits into
Closed
Conversation
Those annotation are silently ignored rather than begin validated against compiler output. Update them before validation is enabled, to avoid test failures.
When both error patterns and error annotations are present in an ui test, only error patterns are validated against the output. Replace the error pattern with an error annotation to avoid silently ignoring the other error annotation.
Since 8ec9d72, in the case of a local macro expansion, the errors are now matched to macro definition location. Update test cases accordingly.
Previously, when compilation succeeded, neither error patterns nor error annotation would be validated. Additionally, when compilation failed, only error patterns would be validated if both error patterns and error annotation were present. Now both error patterns and error annotation are validated when present, regardless of compilation status. Furthermore, for test that should run, the error patterns are matched against executable output, which is what some of tests already expect to happen, and when rust-lang#65506 is merged even more ui tests will.
The concrete type that will be too big is target dependent. Avoid matching it in error annotation to make test work correctly across different targets.
This addresses rust-lang#65024, as it allows RISC-V target specification files to set "llvm-abiname": "lp64d". In general, it is useful for the programmer to be able to set this codegen parameter, which other languages usually expose under a compiler argument like "-mabi=<XYZ>".
When in a file with a non-terminated item, catch the error and consume the block instead of trying to recover it more granularly in order to reduce the amount of unrelated errors that would be fixed after adding the missing closing brace. Also point out the possible location of the missing closing brace.
It's sufficiently simple and fast that memoizing it is a slight pessimization.
Validate error patterns and error annotation in ui tests when present Previously, when compilation succeeded, neither error patterns nor error annotation would be validated. Additionally, when compilation failed, only error patterns would be validated if both error patterns and error annotation were present. Now both error patterns and error annotation are validated when present, regardless of compilation status. Furthermore, for test that should run, the error patterns are matched against executable output, which is what some of tests already expect to happen, and when rust-lang#65506 is merged even more ui tests will. Fixesrust-lang#56277
Reduce amount of errors given unclosed delimiter When in a file with a non-terminated item, catch the error and consume the block instead of trying to recover it on a more granular way in order to reduce the amount of unrelated errors that would be fixed after adding the missing closing brace. Also point out the possible location of the missing closing brace. Fixrust-lang#63690.
…lexcrichton Statically link libstdc++ on windows-gnu Fixesrust-lang#61561 by not shipping `libstdc++-6.dll` which can conflict with the GCC.
…excrichton Allow specifying LLVM's MCTargetOptions::ABIName in target specification files This addresses rust-lang#65024, as it allows RISC-V target specification files to set `"llvm-abiname": "lp64d"`. Other languages (read: C) usually expose this codegen parameter under a compiler argument like `-mabi=<XYZ>`.
…outlives, r=michaelwoerister De-querify `trivial_dropck_outlives`. It's sufficiently simple and fast that memoizing it is a slight pessimization. r? @michaelwoerister
tmandry
commented
Nov 1, 2019
MemberAuthor
@bors r+ p=5 rollup=never This is going to go after the beta backport PR (feel free to replace this with a bigger rollup in the meantime). |
bors
commented
Nov 1, 2019
Collaborator
📌 Commit 0d2d01f has been approved by |
bors
commented
Nov 1, 2019
Collaborator
⌛ Testing commit 0d2d01f with merge e3db49e8f530bf9e1a0ac3580683f854c52f40a1... |
bors
commented
Nov 2, 2019
Collaborator
💔 Test failed - checks-azure |
rust-highfive
commented
Nov 2, 2019
Contributor
The job 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 |
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
Sign up for freeto 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:
trivial_dropck_outlives. #66012 (De-querifytrivial_dropck_outlives.)Failed merges:
r? @ghost