Merge pull request #14148 from dotty-staging/fix-derivedPolyProto

Fix `derivedPolyProto` to use the correct result type
scala · Dec 21, 2021 · de42a98 · de42a98
2 parents 0b55c7d + 209b18e
commit de42a98
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
@@ -582,7 +582,7 @@ object ProtoTypes {
     override def isMatchedBy(tp: Type, keepConstraint: Boolean)(using Context): Boolean =
       canInstantiate(tp) || tp.member(nme.apply).hasAltWith(d => canInstantiate(d.info))
 
-    def derivedPolyProto(targs: List[Tree], resultType: Type): PolyProto =
+    def derivedPolyProto(targs: List[Tree], resType: Type): PolyProto =
       if ((targs eq this.targs) && (resType eq this.resType)) this
       else PolyProto(targs, resType)
 

diff --git a/tests/neg/i14145.scala b/tests/neg/i14145.scala
@@ -0,0 +1,4 @@
+val l: List[Option[Int]] = List(None, Some(1), None)
+
+@main def m15 =
+  l.collectFirst(Some.unapply.unlift[Option[Int], Int]) // error