summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2003-07-04 14:06:34 +0000
committerMartin Odersky <odersky@gmail.com>2003-07-04 14:06:34 +0000
commit00abd39f96ee40da727ccc735d25ca3d96ce01ce (patch)
tree6d7314cd14761335c0dd99d149d8934ef45d4115 /test
parentbf8fd4c5b3e1df5b249f7fa2d765913cf662fd51 (diff)
downloadscala-00abd39f96ee40da727ccc735d25ca3d96ce01ce.tar.gz
scala-00abd39f96ee40da727ccc735d25ca3d96ce01ce.tar.bz2
scala-00abd39f96ee40da727ccc735d25ca3d96ce01ce.zip
*** empty log message ***
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/S6.check2
-rw-r--r--test/files/neg/seqtest.check3
-rw-r--r--test/files/pos/imports.scala2
-rw-r--r--test/neg/S6.check2
-rw-r--r--test/neg/seqtest.check3
-rw-r--r--test/pos/imports.scala2
6 files changed, 6 insertions, 8 deletions
diff --git a/test/files/neg/S6.check b/test/files/neg/S6.check
index 6303e4c8e2..0647138103 100644
--- a/test/files/neg/S6.check
+++ b/test/files/neg/S6.check
@@ -1,4 +1,4 @@
-S6.scala:11: illegal cyclic reference involving type S
+S6.scala:11: cyclic aliasing or subtyping involving type S
type S <: T;
^
one error found
diff --git a/test/files/neg/seqtest.check b/test/files/neg/seqtest.check
index d3a04e8e51..42d3a71a9c 100644
--- a/test/files/neg/seqtest.check
+++ b/test/files/neg/seqtest.check
@@ -1,6 +1,7 @@
seqtest.scala:11: ambiguous reference to overloaded definition,
both method L: [a](scala.Seq[a])scala.Seq[a]
-and method L: [a](a*)scala.Seq[a] match.
+and method L: [a](a*)scala.Seq[a]
+match argument types (scala.Seq[scala.Int])
val c = L(a);
^
one error found
diff --git a/test/files/pos/imports.scala b/test/files/pos/imports.scala
index 32b7aace62..65ea090436 100644
--- a/test/files/pos/imports.scala
+++ b/test/files/pos/imports.scala
@@ -1,7 +1,5 @@
package test;
-
-
import java.lang.{System => S}
object test {
diff --git a/test/neg/S6.check b/test/neg/S6.check
index 6303e4c8e2..0647138103 100644
--- a/test/neg/S6.check
+++ b/test/neg/S6.check
@@ -1,4 +1,4 @@
-S6.scala:11: illegal cyclic reference involving type S
+S6.scala:11: cyclic aliasing or subtyping involving type S
type S <: T;
^
one error found
diff --git a/test/neg/seqtest.check b/test/neg/seqtest.check
index d3a04e8e51..42d3a71a9c 100644
--- a/test/neg/seqtest.check
+++ b/test/neg/seqtest.check
@@ -1,6 +1,7 @@
seqtest.scala:11: ambiguous reference to overloaded definition,
both method L: [a](scala.Seq[a])scala.Seq[a]
-and method L: [a](a*)scala.Seq[a] match.
+and method L: [a](a*)scala.Seq[a]
+match argument types (scala.Seq[scala.Int])
val c = L(a);
^
one error found
diff --git a/test/pos/imports.scala b/test/pos/imports.scala
index 32b7aace62..65ea090436 100644
--- a/test/pos/imports.scala
+++ b/test/pos/imports.scala
@@ -1,7 +1,5 @@
package test;
-
-
import java.lang.{System => S}
object test {