summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-02-26 08:25:38 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-02-26 08:25:38 -0800
commit0e08d4984a3cdf67e7532aafb205fd852f57a56e (patch)
tree111759c567dce6ca662918e032bf1f7c1af55df8
parentb4ff1e934f36af6792b29b3d850cee836aa7b050 (diff)
parent9d2d01ffb6412ec3f76dfec223c9c675ab058d88 (diff)
downloadscala-0e08d4984a3cdf67e7532aafb205fd852f57a56e.tar.gz
scala-0e08d4984a3cdf67e7532aafb205fd852f57a56e.tar.bz2
scala-0e08d4984a3cdf67e7532aafb205fd852f57a56e.zip
Merge pull request #3585 from lrytz/t4728
SI-4728 test case
-rw-r--r--test/files/neg/t4728.check7
-rw-r--r--test/files/neg/t4728.scala (renamed from test/pending/run/t4728.scala)0
-rw-r--r--test/pending/run/t4728.check2
3 files changed, 7 insertions, 2 deletions
diff --git a/test/files/neg/t4728.check b/test/files/neg/t4728.check
new file mode 100644
index 0000000000..c6ef182d34
--- /dev/null
+++ b/test/files/neg/t4728.check
@@ -0,0 +1,7 @@
+t4728.scala:10: error: ambiguous reference to overloaded definition,
+both method f in object Ambiguous of type (ys: Y*)Int
+and method f in object Ambiguous of type (x: X)Int
+match argument types (Y) and expected result type Any
+ println(Ambiguous.f(new Y))
+ ^
+one error found
diff --git a/test/pending/run/t4728.scala b/test/files/neg/t4728.scala
index 36f7860613..36f7860613 100644
--- a/test/pending/run/t4728.scala
+++ b/test/files/neg/t4728.scala
diff --git a/test/pending/run/t4728.check b/test/pending/run/t4728.check
deleted file mode 100644
index 7a754f414c..0000000000
--- a/test/pending/run/t4728.check
+++ /dev/null
@@ -1,2 +0,0 @@
-1
-2 \ No newline at end of file