Keep correct kind when preparing constraint in stripParams #14761
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
requested changes
Mar 23, 2022
| @@ -248,7 +248,7 @@ class OrderingConstraint(private val boundsMap: ParamBounds, | |||
| NoType | |||
| case tp: TypeBounds => | |||
| val lo1 = stripParams(tp.lo, todos, !isUpper).orElse(defn.NothingType) | |||
| val hi1 = stripParams(tp.hi, todos, isUpper).orElse(defn.AnyKindType) | |||
| val hi1 = stripParams(tp.hi, todos, isUpper).orElse(tp.kind) | |||
There was a problem hiding this comment.
You should be able to use TypeApplications#topType instead which I needed for the same reason :).
Suggested change
| val hi1 = stripParams(tp.hi, todos, isUpper).orElse(tp.kind) | |
| val hi1 = stripParams(tp.hi, todos, isUpper).orElse(tp.topType) |
There was a problem hiding this comment.
Ah, thanks! I had not remembered that.
topType already does what we need here, and it is also correct for classes.
Linyxus
approved these changes
Mar 23, 2022
smarter
reviewed
Mar 23, 2022
| @@ -229,7 +229,11 @@ class TypeApplications(val self: Type) extends AnyVal { | |||
| (alias ne self) && alias.hasSimpleKind | |||
| } | |||
|
|
|||
| /** The top type with the same kind as `self`. */ | |||
| /** The top type with the same kind as `self`. This is largest type capturing | |||
| * the parameter shape of a type without looking at precise bounds. | |||
There was a problem hiding this comment.
In fact, topType does keep around precise bounds (e.g., [X <: Int] =>> Any), though it could be tweaked to map the bounds themselves to topType if needed.
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.
Fixes #14760