summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-05-24 09:53:17 -0700
committerPaul Phillips <paulp@improving.org>2013-05-24 09:53:17 -0700
commit369f1f27ac6a27918e767e393dc6e22f7424aa38 (patch)
treea6dbbff4868334e6de8af6a9b37ed7834f404189 /test/files
parenta2577f528b0fc4393949e784ed7e29250d07d8c9 (diff)
parentd64de5bd1ec6a58e7f7395dc3c9e96613b523d23 (diff)
downloadscala-369f1f27ac6a27918e767e393dc6e22f7424aa38.tar.gz
scala-369f1f27ac6a27918e767e393dc6e22f7424aa38.tar.bz2
scala-369f1f27ac6a27918e767e393dc6e22f7424aa38.zip
Merge pull request #2573 from retronym/ticket/7499
SI-7499 Additional test case for SI-7319
Diffstat (limited to 'test/files')
-rw-r--r--test/files/run/t7319.check9
-rw-r--r--test/files/run/t7319.scala1
2 files changed, 9 insertions, 1 deletions
diff --git a/test/files/run/t7319.check b/test/files/run/t7319.check
index 966736915e..b5081f2d00 100644
--- a/test/files/run/t7319.check
+++ b/test/files/run/t7319.check
@@ -32,7 +32,14 @@ argument expression's type is not compatible with formal parameter type;
convert(Some[Int](0))
^
+scala> Range(1,2).toArray: Seq[_]
+<console>:11: error: polymorphic expression cannot be instantiated to expected type;
+ found : [B >: Int]Array[B]
+ required: Seq[_]
+ Range(1,2).toArray: Seq[_]
+ ^
+
scala> 0
-res1: Int = 0
+res2: Int = 0
scala>
diff --git a/test/files/run/t7319.scala b/test/files/run/t7319.scala
index 23ffeb977d..65a3ed922d 100644
--- a/test/files/run/t7319.scala
+++ b/test/files/run/t7319.scala
@@ -9,5 +9,6 @@ implicit def ma0[A](a: A): M[A] = null
implicit def ma1[A](a: A): M[A] = null
def convert[F[X <: F[X]]](builder: F[_ <: F[_]]) = 0
convert(Some[Int](0))
+Range(1,2).toArray: Seq[_]
0""" // before the fix, this line, and all that followed, re-issued the implicit ambiguity error.
}