Merge master to release/dev16.8 #9737
Merged
Conversation
This file contains 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
* Fix #5768 Corrected wrong formatted print of a trait member constraint Signed-off-by: realvictorprm <[email protected]> * Adding regression test. Signed-off-by: realvictorprm <[email protected]> * Fix test to expect an error. Signed-off-by: realvictorprm <[email protected]> * Apply review, move and add new test to typecheck\sigs. Signed-off-by: realvictorprm <[email protected]> * Rename neg111 to neg112 to ease merging * Bring layoutReturnType into scope, and use instead of layoutTypeWithInfoAndPrec * Fix test neg112 to use proper directory * Fix tests that suggest overloads to use parens around returned functions * Mention correct file and col numbers in new neg112 test Co-authored-by: realvictorprm <[email protected]>
KevinRansom
approved these changes
Jul 22, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is an automatically generated pull request from master into release/dev16.8.
git fetch --all git checkout merges/master-to-release/dev16.8 git reset --hard upstream/release/dev16.8 git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-release/dev16.8 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.