Merge pull request #799 from dotty-staging/change-inference

Change inference

3 files changed, 25 insertions, 2 deletions

diff --git a/tests/neg/i739.scala b/tests/neg/i739.scala
new file mode 100644
index 000000000..5385fa42c
--- /dev/null
+++ b/tests/neg/i739.scala
@@ -0,0 +1,7 @@
+class Foo[A, B]
+class Test {
+  implicit val f: Foo[Int, String] = ???
+  def t[A, B >: A](a: A)(implicit f: Foo[A, B]) = ???
+  t(1) // error
+}
+
diff --git a/tests/pos/i739.scala b/tests/pos/i739.scala
new file mode 100644
index 000000000..61fed4e5d
--- /dev/null
+++ b/tests/pos/i739.scala
@@ -0,0 +1,17 @@
+class Foo
+
+object Test {
+  def foo[T](x: T)(implicit ev: T): T = ???
+
+  class Fn[T] {
+    def invoke(implicit ev: T): T = ???
+  }
+
+  def bar[T](x: T): Fn[T] = ???
+
+  def test: Unit = {
+    implicit val evidence: Foo = new Foo
+    foo(new Foo)
+    bar(new Foo).invoke
+  }
+}
diff --git a/tests/run/liftedTry.scala b/tests/run/liftedTry.scala
index 5ff4add6d..ff9af98ec 100644
--- a/tests/run/liftedTry.scala
+++ b/tests/run/liftedTry.scala
@@ -12,7 +12,7 @@ object Test {
 
   foo(try 3 catch handle)
 
-  def main(args: Array[String]): Unit = {
+  def main(args: Array[String]) = {
     assert(x == 1)
     assert(foo(2) == 2)
     assert(foo(try raise(3) catch handle) == 3)
@@ -20,7 +20,6 @@ object Test {
   }
 }
 
-
 object Tr {
   def fun(a: Int => Unit) = a(2)
   def foo: Int = {