summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2009-11-20 21:02:23 +0000
committerMartin Odersky <odersky@gmail.com>2009-11-20 21:02:23 +0000
commitb408d0e98f694add637fc867433c627ca3191062 (patch)
treed13ca7c02e122ae53941c04523073a3ce7b1ea1e /test/files/neg
parent937872a48956c11c278839622d5514a3ed65e25d (diff)
downloadscala-b408d0e98f694add637fc867433c627ca3191062.tar.gz
scala-b408d0e98f694add637fc867433c627ca3191062.tar.bz2
scala-b408d0e98f694add637fc867433c627ca3191062.zip
Closed #2642
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/bug875.check4
-rw-r--r--test/files/neg/bug875.scala6
2 files changed, 5 insertions, 5 deletions
diff --git a/test/files/neg/bug875.check b/test/files/neg/bug875.check
index d547c8d69c..16a982241e 100644
--- a/test/files/neg/bug875.check
+++ b/test/files/neg/bug875.check
@@ -4,8 +4,8 @@ bug875.scala:3: error: no `: _*' annotation allowed here
^
bug875.scala:6: error: no `: _*' annotation allowed here
(such annotations are only allowed in arguments to *-parameters)
- mkList(xs: _*)
- ^
+ mkList1(xs: _*)
+ ^
bug875.scala:15: error: no `: _*' annotation allowed here
(such annotations are only allowed in arguments to *-parameters)
f(true, 1, xs: _*)
diff --git a/test/files/neg/bug875.scala b/test/files/neg/bug875.scala
index 9c579b0166..38affd5a43 100644
--- a/test/files/neg/bug875.scala
+++ b/test/files/neg/bug875.scala
@@ -1,9 +1,9 @@
object Test extends Application {
val xs = List(4, 5, 6)
val ys = List(1, 2, 3, xs: _*)
- def mkList(x: Int) = List(x)
- def mkList(x: Boolean) = List(x)
- mkList(xs: _*)
+ def mkList1(x: Int) = List(x)
+ def mkList2(x: Boolean) = List(x)
+ mkList1(xs: _*)
def f(x: Int*) = List(x: _*)