Skip to content

Commit 5e6160a

Browse files
committed
Drop usage of ensureLambdaSub
It doesn't seem to be needed anymore and as demonstrated in the commit message of a8641c5, it can lead to unnecessary checks.
1 parent 9585868 commit 5e6160a

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

compiler/src/dotty/tools/dotc/core/TypeComparer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
10081008
otherArgs.take(d) ++ tl.paramRefs))
10091009
else
10101010
otherTycon
1011-
(assumedTrue(tycon) || directionalIsSubType(tycon, adaptedTycon.ensureLambdaSub)) &&
1011+
(assumedTrue(tycon) || directionalIsSubType(tycon, adaptedTycon)) &&
10121012
directionalRecur(adaptedTycon.appliedTo(args), other)
10131013
}
10141014
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Functor[[A >: scala.Nothing <: scala.Any] => scala.collection.immutable.List[A]]
1+
Functor[scala.collection.immutable.List]
22
Unapply[[F >: scala.Nothing <: [_$9 >: scala.Nothing <: scala.Any] => scala.Any] => Functor[F], Wrap[scala.Int]]
33
Unapply[[F >: scala.Nothing <: [_$9 >: scala.Nothing <: scala.Any] => scala.Any] => Functor[F], Wrap[Dummy]]
4-
Functor[[A >: scala.Nothing <: scala.Any] => scala.Option[A]]
4+
Functor[scala.Option]

tests/run-staging/i5965.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
val y: [A >: scala.Nothing <: scala.Any] => scala.collection.immutable.List[A][scala.Int] = scala.List.apply[scala.Int](1, 2, 3)
2+
val y: scala.collection.immutable.List[scala.Int] = scala.List.apply[scala.Int](1, 2, 3)
33

44
(y: scala.collection.immutable.List[scala.Int])
55
}
66
List(1, 2, 3)
77
{
8-
val y: [A >: scala.Nothing <: scala.Any] => scala.Option[A][scala.Int] = scala.Option.apply[scala.Int](4)
8+
val y: scala.Option[scala.Int] = scala.Option.apply[scala.Int](4)
99

1010
(y: scala.Option[scala.Int])
1111
}

0 commit comments

Comments
 (0)