Merge pull request #3704 from dotty-staging/fix-#3692

Fix #3692: Generalize implicit function subtyping.

Author: odersky

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

@@ -518,7 +518,7 @@ class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling {
         case tp1: MethodOrPoly =>
           (tp1.signature consistentParams tp2.signature) &&
             matchingParams(tp1, tp2) &&
-            tp1.isImplicitMethod == tp2.isImplicitMethod &&
+            (!tp2.isImplicitMethod || tp1.isImplicitMethod) &&
             isSubType(tp1.resultType, tp2.resultType.subst(tp2, tp1))
         case _ =>
           false

compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala

@@ -470,7 +470,7 @@ object ProtoTypes {
         normalize(et.resultType, pt)
       case wtp =>
         val iftp = defn.asImplicitFunctionType(wtp)
-        if (iftp.exists) normalize(iftp.argInfos.last, pt) else tp
+        if (iftp.exists) normalize(iftp.dropDependentRefinement.argInfos.last, pt) else tp
     }
   }
 

tests/neg/i2000.scala

@@ -1,6 +1,6 @@
 object test1 {
   class C[A] { def foo(a: A) = "c" }
-  class D extends C[String] { override def foo(implicit s: String) = "d" } // error
+  class D extends C[String] { override def foo(implicit s: String) = "d" } // used to be error, now ok
 }
 
 object test2 {

tests/pos/i3692.scala

@@ -0,0 +1,15 @@
+class C { type T }
+
+object Main {
+
+  //val a: implicit Int => Int = implicit (x: Int) => x
+  //val b: Int => Int = a
+
+  def main(args: Array[String]): Unit = {
+    val choose: implicit (c: C) => Set[Int] = Set.empty
+    val b0: (C) => Set[Int] = choose
+    val b1: (c: C) => Set[Int] = choose
+    def applyF(f: (c: C) => Set[Int]) = f(new C{type T=Int})
+    //applyF(choose)
+  }
+}