File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed
compiler/src/dotty/tools/dotc/core Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -1623,13 +1623,13 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
1623
1623
val tparam = tparams2.head
1624
1624
val v = tparam.paramVarianceSign
1625
1625
1626
- /** An argument test is hard if it implies a comparison A <: B where
1626
+ /** An argument test is incomplete if it implies a comparison A <: B where
1627
1627
* A is an AndType or B is an OrType. In these cases we need to run an
1628
1628
* either, which can lose solutions if there are type variables involved.
1629
1629
* So we defer such tests to run last, on the chance that some other argument
1630
1630
* comparison will instantiate or constrain type variables first.
1631
1631
*/
1632
- def isHard (arg1 : Type , arg2 : Type ): Boolean =
1632
+ def isIncomplete (arg1 : Type , arg2 : Type ): Boolean =
1633
1633
val arg1d = arg1.stripped
1634
1634
val arg2d = arg2.stripped
1635
1635
(v >= 0 ) && (arg1d.isInstanceOf [AndType ] || arg2d.isInstanceOf [OrType ])
@@ -1727,7 +1727,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
1727
1727
if ! canDefer
1728
1728
|| rest1.isEmpty && deferred1.isEmpty
1729
1729
// skip the hardness test if this is the last argument and no previous arguments were hard
1730
- || ! isHard (arg1, arg2)
1730
+ || ! isIncomplete (arg1, arg2)
1731
1731
then
1732
1732
isSubArg(arg1, arg2)
1733
1733
&& recurArgs(
You can’t perform that action at this time.
0 commit comments