Fix #7060: Make single-parameter constrained more versatile
#7065
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
smarter
reviewed
Aug 19, 2019
| @@ -503,7 +503,8 @@ object ProtoTypes { | |||
| } | |||
|
|
|||
| /** Same as `constrained(tl, EmptyTree)`, but returns just the created type lambda */ | |||
There was a problem hiding this comment.
The documentation is now misleading, also is there a reason why alwaysAddTypeVars = ctx.typerState.isCommittable is not a good default for the other overload ?
There was a problem hiding this comment.
it would be a good default, except that the default value would refer to the ctx which follows.
Make single-parameter `constrained` more versatile by using a smarter default value for `alwaysAddTypeVars`.
smarter
reviewed
Aug 23, 2019
| val state = ctx.typerState | ||
| val addTypeVars = alwaysAddTypeVars || !owningTree.isEmpty | ||
| if (tl.isInstanceOf[PolyType]) | ||
| assert(!(ctx.typerState.isCommittable && !addTypeVars), | ||
| assert(!ctx.typerState.isCommittable || addTypeVars, | ||
| s"inconsistent: no typevars were added to committable constraint ${state.constraint}") |
There was a problem hiding this comment.
If we change the assertion then this message also needs to be updated I think:
Suggested change
| s"inconsistent: no typevars were added to committable constraint ${state.constraint}") | |
| s"inconsistent: typevars were added to non-committable constraint ${state.constraint}") |
There was a problem hiding this comment.
ah nevermind I got confused, the current message is correct.
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.
No description provided.